Index: firmware/App/Drivers/GPIO.c =================================================================== diff -u -r5d682ef4b973ca85e67ac00cc2610e2f6c378b0c -r051e0c243c0e6faa7a53287b16252d93044d87e0 --- firmware/App/Drivers/GPIO.c (.../GPIO.c) (revision 5d682ef4b973ca85e67ac00cc2610e2f6c378b0c) +++ firmware/App/Drivers/GPIO.c (.../GPIO.c) (revision 051e0c243c0e6faa7a53287b16252d93044d87e0) @@ -78,9 +78,9 @@ /*********************************************************************//** * @brief * The getWatchdogExpired function determines the current signal level - * on the watchdog expired pin from the CPLD. - * @details Inputs: Signal from CPLD on watchdog expired pin. - * @details Outputs: none + * on the watchdog expired pin. + * @details \b Inputs: Signal on watchdog expired pin. + * @details \b Outputs: none * @return level (LOW or HIGH) *************************************************************************/ PIN_SIGNAL_STATE_T getWatchdogExpired( void ) Index: firmware/App/Modes/ModeFault.c =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -r051e0c243c0e6faa7a53287b16252d93044d87e0 --- firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision 051e0c243c0e6faa7a53287b16252d93044d87e0) @@ -19,6 +19,7 @@ #include "ModeFault.h" #include "Messaging.h" #include "Utilities.h" +#include "Valves.h" /** * @addtogroup DDFaultMode @@ -61,7 +62,7 @@ *************************************************************************/ U32 transitionToFaultMode( void ) { -// deenergizeActuators( PARK_CONC_PUMPS ); + //deenergizeActuators( PARK_CONC_PUMPS ); initFaultMode(); setCurrentSubState( NO_SUB_STATE ); @@ -72,18 +73,6 @@ //sendPOSTFinalResult( FALSE ); } - //setCPLDCleanLEDColor( CPLD_CLEAN_LED_OFF ); - - // Release RTC in case the RTC semaphore was not released prior to transitioning to fault mode. - // In fault mode, the non-volatile data mgmt POST might be run again so the RTC has to be available. Also, - // the RTC time is read every second which requires the semaphore. - releaseSemaphore( SEMAPHORE_RTC ); - -//#ifndef _RELEASE_ -// setHeatNelsonSupportMode( NELSON_NONE ); -// setChemNelsonSupportMode( NELSON_NONE ); -//#endif - return faultState; } @@ -150,28 +139,38 @@ *************************************************************************/ void deenergizeActuators( BOOL parkPumps ) { -// // Turn off the UV reactors -// turnOffUVReactor( INLET_UV_REACTOR ); -// turnOffUVReactor( OUTLET_UV_REACTOR ); -// -// // De-energize all the valves -// setValveStateDelayed( VPI, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); -// setValveStateDelayed( VBF, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); -// setValveStateDelayed( VSP, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); -// setValveStateDelayed( VPD, VALVE_STATE_DRAIN_C_TO_NO, DELAY_VALVE_MS ); -// setValveStateDelayed( VPO, VALVE_STATE_NOFILL_C_TO_NO, DELAY_VALVE_MS ); -// setValveStateDelayed( VDR, VALVE_STATE_DRAIN_C_TO_NO, DELAY_VALVE_MS ); -// setValveStateDelayed( VRC, VALVE_STATE_DRAIN_C_TO_NO, DELAY_VALVE_MS ); -// setValveStateDelayed( VRO, VALVE_STATE_R1_C_TO_NO, DELAY_VALVE_MS ); -// setValveStateDelayed( VRD1, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); -// setValveStateDelayed( VRD2, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); -// setValveStateDelayed( VRI, VALVE_STATE_R1_C_TO_NO, DELAY_VALVE_MS ); -// setValveStateDelayed( VRF, VALVE_STATE_R2_C_TO_NO, DELAY_VALVE_MS ); -// + U32 i; + + // De-energize all the hydraulics valves + // TODO : valve state name needs to be updated + setValveStateDelayed( VDR, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( VTD, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( VHB, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( VRP, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( VHO, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( VDB1, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( VP1, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( VPT, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( VDB2, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( VDI, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( VDO, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( VP2, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( VHI, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + + // De-energize Balancing chamber and Ultrafiltration valves + for ( i = FIRST_BC_VALVE; i <= LAST_BC_VALVE; i++ ) + { + setValveStateDelayed( (VALVES_T)i, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + } + + for ( i = FIRST_UF_VALVE; i <= FIRST_UF_VALVE; i++ ) + { + setValveStateDelayed( (VALVES_T)i, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + } + // requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, parkPumps ); // requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, parkPumps ); // signalROPumpHardStop(); -// signalDrainPumpHardStop(); // stopHeater( DD_PRIMARY_HEATER ); // stopHeater( DD_TRIMMER_HEATER ); } Index: firmware/App/Modes/ModeFault.h =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -r051e0c243c0e6faa7a53287b16252d93044d87e0 --- firmware/App/Modes/ModeFault.h (.../ModeFault.h) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Modes/ModeFault.h (.../ModeFault.h) (revision 051e0c243c0e6faa7a53287b16252d93044d87e0) @@ -22,10 +22,10 @@ #include "DDDefs.h" /** - * @defgroup DGFaultMode DGFaultMode - * @brief Fault mode module. Manages fault mode functions via a state machine. + * @defgroup DDFaultMode DDFaultMode + * @brief Fault mode unit. Manages fault mode functions via a state machine. * - * @addtogroup DGFaultMode + * @addtogroup DDFaultMode * @{ */ Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -r051e0c243c0e6faa7a53287b16252d93044d87e0 --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 051e0c243c0e6faa7a53287b16252d93044d87e0) @@ -20,25 +20,17 @@ //#include "ConcentratePumps.h" //#include "ConductivitySensors.h" -//#include "CPLD.h" -//#include "DrainPump.h" -//#include "Fans.h" -//#include "FlowSensors.h" -#include "FPGA.h" +#include "FpgaDD.h" //#include "Integrity.h" -//#include "LoadCell.h" +#include "Messaging.h" #include "ModeInitPOST.h" //#include "NVDataMgmt.h" #include "OperationModes.h" //#include "Pressures.h" -//#include "Reservoirs.h" -//#include "RTC.h" #include "SafetyShutdown.h" -#include "Messaging.h" #include "TaskGeneral.h" //#include "TemperatureSensors.h" //#include "Thermistors.h" -//#include "UVReactors.h" #include "WatchdogMgmt.h" /** @@ -69,8 +61,7 @@ * The initInitAndPOSTMode function initializes the Initialization and POST * mode module. * @details \b Inputs: none - * @details \b Outputs: postState, postCompleted, tempPOSTPassed, - * startPOSTDelayCounter + * @details \b Outputs: unit variables are initialized. * @return none *************************************************************************/ void initInitAndPOSTMode( void ) @@ -93,13 +84,9 @@ U32 transitionToInitAndPOSTMode( void ) { initInitAndPOSTMode(); -// setCPLDCleanLEDColor( CPLD_CLEAN_LED_OFF ); // setCurrentSubState( NO_SUB_STATE ); -// resetRTCPOSTState(); // resetNVDataMgmtPOSTState(); -// resetAccelPOSTState(); // resetPressuresPOSTState(); -// resetUVReactorsPOSTState(); // resetWatchdogPOSTState(); // resetSafetyShutdownPOSTState(); @@ -113,6 +100,9 @@ * @details \b Inputs: postState * @details \b Outputs: Initialization and POST mode state machine executed * @details \b Alarm: ALARM_ID_DD_SOFTWARE_FAULT when any of the post step fails. + * @Warning All the actuators and sensors must execute their POST after NVDataMgmt + * NVDataMgmt must load all the calibration data into RAM so the actuators + * can query their corresponding calibration values successfully * @return current state. *************************************************************************/ U32 execInitAndPOSTMode( void ) @@ -124,9 +114,6 @@ { case DD_POST_STATE_START: postState = handlePOSTStateStart(); -#ifdef BOARD_WITH_NO_HARDWARE - postState = DD_POST_STATE_RTC; -#endif break; case DD_POST_STATE_FW_COMPATIBILITY: @@ -144,11 +131,6 @@ postState = handlePOSTStatus( testStatus ); break; - case DD_POST_STATE_RTC: - //testStatus = execRTCSelfTest(); - postState = handlePOSTStatus( testStatus ); - break; - case DD_POST_STATE_NVDATAMGMT: //testStatus = execNVDataMgmtSelfTest(); postState = handlePOSTStatus( testStatus ); @@ -158,40 +140,15 @@ // NVDataMgmt must load all the calibration data into RAM so the actuators // can query their corresponding calibration values successfully case DD_POST_STATE_TEMPERATURE_SENSORS: -#ifndef BOARD_WITH_NO_HARDWARE //testStatus = execTemperatureSensorsSelfTest(); postState = handlePOSTStatus( testStatus ); -#else - postState = DD_POST_STATE_COMPLETED; -#endif break; - case DD_POST_STATE_ACCELEROMETER: -#ifndef _RELEASE_ - //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ACCELS ) != SW_CONFIG_ENABLE_VALUE ) -#endif - { - //testStatus = execAccelTest(); - } -#ifndef _RELEASE_ -// else -// { -// testStatus = SELF_TEST_STATUS_PASSED; -// } -#endif - postState = handlePOSTStatus( testStatus ); - break; - case DD_POST_STATE_PRESSURES: //testStatus = execPressureSelfTest(); postState = handlePOSTStatus( testStatus ); break; - case DD_POST_STATE_DRAIN_PUMP: - //testStatus = execDrainPumpSelfTest(); - postState = handlePOSTStatus( testStatus ); - break; - case DD_POST_STATE_CONCENTRATE_PUMPS: //testStatus = execConcenratePumpsSelfTest(); postState = handlePOSTStatus( testStatus ); @@ -202,55 +159,19 @@ postState = handlePOSTStatus( testStatus ); break; - case DD_POST_STATE_RESERVOIRS: - //testStatus = execReservoirsSelfTest(); - postState = handlePOSTStatus( testStatus ); - break; - - case DD_POST_STATE_UV_REACTORS: -#ifndef _RELEASE_ - //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UV_REACTORS ) != SW_CONFIG_ENABLE_VALUE ) -#endif - { - //testStatus = execUVReactorsSelfTest(); - } -#ifndef _RELEASE_ -// else -// { -// testStatus = SELF_TEST_STATUS_PASSED; -// } -#endif - postState = handlePOSTStatus( testStatus ); - break; - case DD_POST_STATE_THERMISTORS: //testStatus = execThermistorsSelfTest(); postState = handlePOSTStatus( testStatus ); break; - case DD_POST_STATE_FANS: - //testStatus = execFansSelfTest(); - postState = handlePOSTStatus( testStatus ); - break; - - case DD_POST_STATE_FLOW_SENSORS: - //testStatus = execFlowSensorsSelfTest(); - postState = handlePOSTStatus( testStatus ); - break; - case DD_POST_STATE_WATCHDOG: //testStatus = execWatchdogTest(); postState = handlePOSTStatus( testStatus ); break; + // Should be last POST (and last POST test must be a test that completes in a single call) case DD_POST_STATE_SAFETY_SHUTDOWN: //testStatus = execSafetyShutdownTest(); - postState = handlePOSTStatus( testStatus ); - break; - - // Should be last POST (and last POST test must be a test that completes in a single call) - case DD_POST_STATE_LOAD_CELL: - //testStatus = execLoadCellsSelfTest(); handlePOSTStatus( testStatus ); // Ignoring return value because last test if ( TRUE == tempPOSTPassed ) @@ -277,7 +198,7 @@ break; case DD_POST_STATE_FAILED: - // Should not get here - any failed post test should have already triggered a fault and taken us to fault m + // Should not get here - any failed post test should have already triggered a fault and taken us to fault mode default: SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_INIT_POST_INVALID_POST_STATE, postState ) postState = DD_POST_STATE_FAILED; @@ -293,7 +214,7 @@ * and completed. If true, call the isPOSTPassed() to see final result (pass/fail). * @details \b Inputs: postCompleted * @details \b Outputs: none - * @return true if all HD POST tests have completed, false if not + * @return true if all DD POST tests have completed, false if not *************************************************************************/ BOOL isPOSTCompleted( void ) { @@ -302,11 +223,11 @@ /*********************************************************************//** * @brief - * The isPOSTPassed function determines whether all HD POST have passed. + * The isPOSTPassed function determines whether all DD POST have passed. * Call this function after POST is complete (call isPOSTCompleted function). * @details \b Inputs: postPassed * @details \b Outputs: none - * @return true if all HD POST tests have passed, false if not + * @return true if all DD POST tests have passed, false if not *************************************************************************/ BOOL isPOSTPassed( void ) { @@ -329,7 +250,7 @@ { BOOL passed = ( SELF_TEST_STATUS_PASSED == testStatus ? TRUE : FALSE ); - // Broadcast passed POST result + // Broadcast POST result //sendPOSTTestResult( (DD_POST_STATE_T)((int)postState), passed ); // Move on to next POST test result = (DD_POST_STATE_T)((int)postState + 1); @@ -347,6 +268,8 @@ * The handlePOSTStateStart function handles the POST start state. * @details \b Inputs: startPOSTDelayCounter, systemREG1 * @details \b Outputs: startPOSTDelayCounter, systemREG1 + * @details \b Events : DD_EVENT_STARTUP with system register details and + * DD_EVENT_OP_MODE_CHANGE listing previous to new mode change details. * @return next POST state *************************************************************************/ static DD_POST_STATE_T handlePOSTStateStart( void ) Index: firmware/App/Modes/ModeService.c =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -r051e0c243c0e6faa7a53287b16252d93044d87e0 --- firmware/App/Modes/ModeService.c (.../ModeService.c) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Modes/ModeService.c (.../ModeService.c) (revision 051e0c243c0e6faa7a53287b16252d93044d87e0) @@ -16,7 +16,7 @@ ***************************************************************************/ //#include "ConcentratePumps.h" -//#include "CPLD.h" +#include "FpgaDD.h" #include "ModeService.h" #include "OperationModes.h" @@ -55,14 +55,9 @@ U32 transitionToServiceMode( void ) { // Deenergize all the actuators -// setCPLDCleanLEDColor( CPLD_CLEAN_LED_OFF ); // deenergizeActuators( NO_PARK_CONC_PUMPS ); initServiceMode(); setCurrentSubState( NO_SUB_STATE ); -// resetLoadCellOffset( LOAD_CELL_RESERVOIR_1_PRIMARY ); -// resetLoadCellOffset( LOAD_CELL_RESERVOIR_1_BACKUP ); -// resetLoadCellOffset( LOAD_CELL_RESERVOIR_2_PRIMARY ); -// resetLoadCellOffset( LOAD_CELL_RESERVOIR_2_BACKUP ); return serviceState; } Index: firmware/App/Modes/ModeService.h =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -r051e0c243c0e6faa7a53287b16252d93044d87e0 --- firmware/App/Modes/ModeService.h (.../ModeService.h) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Modes/ModeService.h (.../ModeService.h) (revision 051e0c243c0e6faa7a53287b16252d93044d87e0) @@ -20,7 +20,6 @@ #include "DDCommon.h" #include "DDDefs.h" -#include "ModeFault.h" /** * @defgroup DDServiceMode DDServiceMode Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -r051e0c243c0e6faa7a53287b16252d93044d87e0 --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 051e0c243c0e6faa7a53287b16252d93044d87e0) @@ -17,20 +17,18 @@ //#include "ConcentratePumps.h" //#include "ConductivitySensors.h" -//#include "DrainPump.h" //#include "Heaters.h" #include "ModeFault.h" //#include "ModeHeatDisinfect.h" #include "ModeStandby.h" +#include "MessageSupport.h" +#include "Messaging.h" //#include "NVDataMgmt.h" #include "OperationModes.h" //#include "Pressures.h" //#include "ROPump.h" -//#include "RTC.h" #include "SystemCommDD.h" -#include "Messaging.h" #include "TaskGeneral.h" -#include "MessageSupport.h" //#include "Timers.h" #include "Valves.h" @@ -48,25 +46,23 @@ // ********** private data ********** -static DD_STANDBY_MODE_STATE_T standbyState; ///< Currently active standby state. -//static BOOL stopSampleWaterRequest; ///< Flag indicating HD has requested to stop sample water -//static BOOL startSampleWaterRequest; ///< Flag indicating HD has requested to start sample water -//static BOOL flushFilterRequest; ///< Flag indicating HD has requested to flush filters -//static BOOL endSampleWaterRequest; ///< Flag indicating HD has requested to end sample water -// -//static BOOL pendingStartDGRequest; ///< Flag indicating HD has requested DD start (go to generation idle mode). +static DD_STANDBY_MODE_STATE_T standbyState; ///< Currently active standby state. +//static BOOL stopSampleWaterRequest; ///< Flag indicating TD has requested to stop sample water +//static BOOL startSampleWaterRequest; ///< Flag indicating TD has requested to start sample water +//static BOOL flushFilterRequest; ///< Flag indicating TD has requested to flush filters +//static BOOL endSampleWaterRequest; ///< Flag indicating TD has requested to end sample water + +//static BOOL pendingStartDDRequest; ///< Flag indicating TD has requested DD start (go to generation idle mode). //static U32 waterSampleStartTime; ///< Time stamp for start of water sample state. //static U32 filterFlushStartTime; ///< Time stamp for start of filter flush state. //static U32 filterFlushPublishTimerCounter; ///< Filter flush data publish timer counter. -//static BOOL pendingStartDGFlushRequest; ///< Flag indicating HD has requested DD start flush. -//static BOOL pendingStartDGHeatDisinfectRequest; ///< Flag indicating HD has requested DD start heat disinfect. -//static BOOL pendingStartDGChemicalDisinfectRequest; ///< Flag indicating HD has requested DD start chemical disinfect. -//static BOOL pendingStartDGHeatDisinfectActiveCoolRequest; ///< Flag indicating HD has requested DD start heat disinfect active cool. -//static BOOL pendingStartDGChemicalDisinfectFlushRequest; ///< Flag indicating HD has requested DD start chemical disinfect flush. -//static BOOL pendingStartDGROPermeateSampleRequest; ///< Flag indicating HD has requested DD start RO permeate sample. +//static BOOL pendingStartDDFlushRequest; ///< Flag indicating TD has requested DD start flush. +//static BOOL pendingStartDDHeatDisinfectRequest; ///< Flag indicating TD has requested DD start heat disinfect. +//static BOOL pendingStartDDHeatDisinfectActiveCoolRequest; ///< Flag indicating TD has requested DD start heat disinfect active cool. +//static BOOL pendingStartDDROPermeateSampleRequest; ///< Flag indicating TD has requested DD start RO permeate sample. static OVERRIDE_U32_T filterFlushTimePeriod = { FILTER_FLUSH_TIME_MS, - FILTER_FLUSH_TIME_MS, 0, 0 }; ///< Filter flush time period in ms. + FILTER_FLUSH_TIME_MS, 0, 0 }; ///< Filter flush time period in ms. // ********** private function prototypes ********** @@ -82,11 +78,7 @@ * @brief * The initStandbyMode function initializes the standby mode module. * @details \b Inputs: none - * @details \b Outputs: standbyState, stopSampleWaterRequest, startSampleWaterRequest, - * flushFilterRequest, endSampleWaterRequest, waterSampleStartTime, - * filterFlushStartTime, filterFlushPublishTimerCounter, pendingStartDGRequest, - * pendingStartDGHeatDisinfectActiveCoolRequest, - * pendingStartDGROPermeateSampleRequest + * @details \b Outputs:unit variables initialized. * @return none *************************************************************************/ void initStandbyMode( void ) @@ -99,12 +91,11 @@ // waterSampleStartTime = 0; // filterFlushStartTime = 0; // filterFlushPublishTimerCounter = 0; -// pendingStartDGRequest = FALSE; -// pendingStartDGFlushRequest = FALSE; -// pendingStartDGHeatDisinfectRequest = FALSE; -// pendingStartDGChemicalDisinfectRequest = FALSE; -// pendingStartDGHeatDisinfectActiveCoolRequest = FALSE; -// pendingStartDGROPermeateSampleRequest = FALSE; +// pendingStartDDRequest = FALSE; +// pendingStartDDFlushRequest = FALSE; +// pendingStartDDHeatDisinfectRequest = FALSE; +// pendingStartDDHeatDisinfectActiveCoolRequest = FALSE; +// pendingStartDDROPermeateSampleRequest = FALSE; // Reset the heaters efficiency for another treatment //resetHeatersEstimationGain(); @@ -127,7 +118,6 @@ // deenergizeActuators( PARK_CONC_PUMPS ); // -// setCPLDCleanLEDColor( CPLD_CLEAN_LED_OFF ); // // // Upon transition to mode standby set CD1 and CD2 calibration records to be picked to the normal // // table. If the chemical disinfect fails, the mode transitions back to mode standby. @@ -139,16 +129,12 @@ // setChemNelsonSupportMode( NELSON_NONE ); //#endif // -// // Initialize the reservoirs parameters for another treatment. -// // This is to make sure the boolean flag for the first fill is set to TRUE. -// initReservoirs(); - - // Send DG usage data to HD + // Send DD usage data to TD // The message ID will not be put here because the messages list script will pick this up for another send command // The only important item is the payload length that must be 0 for the handler // usageMsg.hdr.msgID = 0; // usageMsg.hdr.payloadLen = 0; - //handleHDRequestDGUsageInfo( &usageMsg ); + //handleTDRequestDDUsageInfo( &usageMsg ); return standbyState; } @@ -217,82 +203,72 @@ // checkInletWaterConductivity(); // checkInletWaterTemperature(); // checkInletWaterPressure(); -// -// status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE ); -// status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE ); -// status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ); -// status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ); -// status |= isAlarmConditionActive( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE ); -// status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_HIGH_RANGE ); -// status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_LOW_RANGE ); +// status |= isAlarmConditionActive( ALARM_ID_DD_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE ); +// status |= isAlarmConditionActive( ALARM_ID_DD_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE ); +// status |= isAlarmConditionActive( ALARM_ID_DD_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ); +// status |= isAlarmConditionActive( ALARM_ID_DD_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ); +// status |= isAlarmConditionActive( ALARM_ID_DD_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE ); +// status |= isAlarmConditionActive( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_HIGH_RANGE ); +// status |= isAlarmConditionActive( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_LOW_RANGE ); + return status; } /*********************************************************************//** * @brief * The handleStandbyIdleState function executes the idle state of the * standby mode state machine. - * @details \b Inputs: pendingSampleWaterRequest, pendingStartDGRequest, - * pendingStartDGFlushRequest, pendingStartDGHeatDisinfectRequest, - * pendingStartDGChemicalDisinfectRequest + * @details \b Inputs: pendingSampleWaterRequest, pendingStartDDRequest, + * pendingStartDDFlushRequest, pendingStartDDHeatDisinfectRequest, + * pendingStartDDChemicalDisinfectRequest * @details \b Outputs: Idle state of the standby mode executed, - * pendingStartDGFlushRequest, pendingStartDGHeatDisinfectRequest, - * pendingStartDGChemicalDisinfectRequest + * pendingStartDDFlushRequest, pendingStartDDHeatDisinfectRequest, + * pendingStartDDChemicalDisinfectRequest * @return the next state *************************************************************************/ static DD_STANDBY_MODE_STATE_T handleStandbyIdleState( void ) { DD_STANDBY_MODE_STATE_T state = DD_STANDBY_MODE_STATE_IDLE; - // go to standby solo mode if HD is turned off or stops communicating. + // go to standby solo mode if TD is turned off or stops communicating. if ( FALSE == isTDCommunicating() ) - { // TODO if HD comm loss, should we wait an hour or so before going to solo standby? - //requestNewOperationMode( DG_MODE_SOLO ); + { // TODO if TD comm loss, should we wait an hour or so before going to solo standby? + //requestNewOperationMode( DD_MODE_SOLO ); } - // if HD requests water sample, go to water sample state + // if TD requests water sample, go to water sample state // else if ( TRUE == flushFilterRequest ) // { // setValveState( VPI, VALVE_STATE_OPEN ); // flushFilterRequest = FALSE; // filterFlushStartTime = getMSTimerCount(); // state = DD_STANDBY_MODE_STATE_FLUSH_FILTER; // } -// else if ( TRUE == pendingStartDGRequest ) +// else if ( TRUE == pendingStartDDRequest ) // { -// pendingStartDGRequest = FALSE; +// pendingStartDDRequest = FALSE; // signalSyncToHD(); // requestNewOperationMode( DD_MODE_GENE ); // } -// else if ( TRUE == pendingStartDGFlushRequest ) +// else if ( TRUE == pendingStartDDFlushRequest ) // { -// pendingStartDGFlushRequest = FALSE; -// requestNewOperationMode( DG_MODE_FLUS ); +// pendingStartDDFlushRequest = FALSE; +// requestNewOperationMode( DD_MODE_FLUS ); // } -// else if ( TRUE == pendingStartDGHeatDisinfectRequest ) +// else if ( TRUE == pendingStartDDHeatDisinfectRequest ) // { -// pendingStartDGHeatDisinfectRequest = FALSE; +// pendingStartDDHeatDisinfectRequest = FALSE; // requestNewOperationMode( DD_MODE_HEAT ); // } -// else if ( TRUE == pendingStartDGChemicalDisinfectRequest ) +// else if ( TRUE == pendingStartDDHeatDisinfectActiveCoolRequest ) // { -// pendingStartDGChemicalDisinfectRequest = FALSE; -// requestNewOperationMode( DD_MODE_CHEM ); -// } -// else if ( TRUE == pendingStartDGHeatDisinfectActiveCoolRequest ) -// { -// pendingStartDGHeatDisinfectActiveCoolRequest = FALSE; +// pendingStartDDHeatDisinfectActiveCoolRequest = FALSE; // // requestNewOperationMode( DD_MODE_HCOL ); // } -// else if ( TRUE == pendingStartDGChemicalDisinfectFlushRequest ) +// else if ( TRUE == pendingStartDDROPermeateSampleRequest ) // { -// pendingStartDGChemicalDisinfectFlushRequest = FALSE; -// requestNewOperationMode( DD_MODE_CHFL ); -// } -// else if ( TRUE == pendingStartDGROPermeateSampleRequest ) -// { -// pendingStartDGROPermeateSampleRequest = FALSE; +// pendingStartDDROPermeateSampleRequest = FALSE; // requestNewOperationMode( DD_MODE_ROPS ); // } @@ -384,7 +360,7 @@ { DD_STANDBY_MODE_STATE_T state = DD_STANDBY_MODE_STATE_SAMPLE_WATER; -// // After HD requests to stop or 10 seconds has elapsed, close and return to idle state +// // After TD requests to stop or 10 seconds has elapsed, close and return to idle state // if ( ( TRUE == stopSampleWaterRequest ) || ( TRUE == didTimeout( waterSampleStartTime, MAX_WATER_SAMPLE_TIME_MS ) ) ) // { // stopSampleWaterRequest = FALSE; @@ -418,7 +394,7 @@ /*********************************************************************//** * @brief - * The requestWaterSample function handles an HD request to sample water. + * The requestWaterSample function handles an TD request to sample water. * @details \b Inputs: standbyState * @details \b Outputs: pendingSampleWaterRequest * @return TRUE if request accepted, FALSE if not. @@ -479,7 +455,7 @@ /*********************************************************************//** * @brief - * The requestDDStart function handles an HD request to start (go to generation idle mode). + * The requestDDStart function handles an TD request to start (go to generation idle mode). * @details \b Inputs: standbyState * @details \b Outputs: pendingSampleWaterRequest * @return TRUE if request accepted, FALSE if not. @@ -491,7 +467,7 @@ if ( DD_STANDBY_MODE_STATE_IDLE == standbyState ) { result = TRUE; - //pendingStartDGRequest = TRUE; + //pendingStartDDRequest = TRUE; // Reset the volume accumulator for the next run // resetROGenerateVolumeL(); @@ -502,7 +478,7 @@ /*********************************************************************//** * @brief - * The signalAbortWaterSampling function handles an HD request to abort water + * The signalAbortWaterSampling function handles an TD request to abort water * sampling (return to standby idle state). * @details \b Inputs: none * @details \b Outputs: standby mode variable initialized @@ -706,107 +682,6 @@ /*********************************************************************//** * @brief - * The startDDChemicalDisinfect function starts chemical disinfect mode. - * @details \b Inputs: standbyState - * @details \b Outputs: none - * @return: TRUE if the switch was successful - *************************************************************************/ -BOOL startDDChemicalDisinfect( void ) -{ - BOOL status = FALSE; - -// // If DD is in standby mode and the standby mode is in Idle, request chemical disinfect -// // Chemical disinfect cannot be run in solo mode because the user has to confirm that the acid is inserted or removed -// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DD_STANDBY_MODE_STATE_IDLE == standbyState ) ) -// { -// DD_CMD_RESPONSE_T cmdResponse; -// -// cmdResponse.commandID = DD_CMD_START_CHEM_DISINFECT; -// cmdResponse.rejected = FALSE; -// cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE; -// OPN_CLS_STATE_T diaCap = getSwitchStatus( DIALYSATE_CAP ); -// -//#ifndef _RELEASE_ -// if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) ) -// { -// diaCap = STATE_CLOSED; -// } -//#endif -// -// // When chemical disinfect is about to be started, dialysate caps must be closed -// if ( STATE_OPEN == diaCap ) -// { -// cmdResponse.rejected = TRUE; -// cmdResponse.rejectCode = REQUEST_REJECT_REASON_DD_DIALYSATE_CAP_OPEN; -// } -// else -// { -// pendingStartDDChemicalDisinfectRequest = TRUE; -// status = TRUE; -// } -// -// sendCommandResponseMsg( &cmdResponse ); -// } - - return status; -} - -/*********************************************************************//** - * @brief - * The startDDChemicalDisinfectFlush function starts chemical disinfect flush mode. - * @details \b Inputs: standbyState - * @details \b Outputs: none - * @return: TRUE if the switch was successful - *************************************************************************/ -BOOL startDDChemicalDisinfectFlush( void ) -{ - BOOL status = FALSE; -// DD_CMD_RESPONSE_T cmdResponse; -// -// cmdResponse.commandID = DD_CMD_START_CHEM_DISINFECT_FLUSH; -// cmdResponse.rejected = FALSE; -// cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE; -// -// // If DD is in standby mode and the standby mode is in Idle, request chemical disinfect flush -// // Chemical disinfect flush cannot be run in solo mode because the user has to confirm that the acid is inserted or removed -// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DD_STANDBY_MODE_STATE_IDLE == standbyState ) ) -// { -// OPN_CLS_STATE_T concCap = getSwitchStatus( CONCENTRATE_CAP ); -// OPN_CLS_STATE_T diaCap = getSwitchStatus( DIALYSATE_CAP ); -// -//#ifndef _RELEASE_ -// if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) ) -// { -// concCap = STATE_CLOSED; -// diaCap = STATE_CLOSED; -// } -//#endif -// -// if ( ( STATE_OPEN == concCap ) || ( STATE_OPEN == diaCap ) ) -// { -// cmdResponse.rejected = TRUE; -// cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DD_DIALYSATE_CAP_OPEN : -// REQUEST_REJECT_REASON_DD_CONCENTRATE_CAP_OPEN ); -// } -// else -// { -// pendingStartDDChemicalDisinfectFlushRequest = TRUE; -// status = TRUE; -// } -// } -// else -// { -// cmdResponse.rejected = TRUE; -// cmdResponse.rejectCode = REQUEST_REJECT_REASON_DD_NOT_IN_STANDBY_IDLE_STATE; -// } -// -// sendCommandResponseMsg( &cmdResponse ); - - return status; -} - -/*********************************************************************//** - * @brief * The startDDROPermeateSample function starts RO permeate sample mode. * @details \b Inputs: standbyState * @details \b Outputs: pendingStartDDChemicalDisinfectFlushRequest Index: firmware/App/Modes/ModeStandby.h =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -r051e0c243c0e6faa7a53287b16252d93044d87e0 --- firmware/App/Modes/ModeStandby.h (.../ModeStandby.h) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Modes/ModeStandby.h (.../ModeStandby.h) (revision 051e0c243c0e6faa7a53287b16252d93044d87e0) @@ -45,19 +45,16 @@ U32 execStandbyMode( void ); // execute the standby mode state machine (call from OperationModes) void waterSampleCommandHandler( SAMPLE_WATER_CMD_T sampleWaterCmd ); // handle water sample command -BOOL requestDDStart( void ); // HD requests DD start (go to generation idle mode) +BOOL requestDDStart( void ); // TD requests DD start (go to generation idle mode) -BOOL signalAbortWaterSampling( void ); // HD signal to abort water sampling. -BOOL startDDFlush( void ); // HD start flush mode -BOOL startDDHeatDisinfect( void ); // HD start heat disinfect mode +BOOL signalAbortWaterSampling( void ); // TD signal to abort water sampling. +BOOL startDDFlush( void ); // TD start flush mode +BOOL startDDHeatDisinfect( void ); // TD start heat disinfect mode BOOL startDDHeatDisinfectActiveCool( void ); DD_STANDBY_MODE_STATE_T getCurrentStandbyState( void ); // get the current state of the standby mode. -BOOL startDDChemicalDisinfect( void ); // HD start chemical disinfect mode -BOOL startDDChemicalDisinfectFlush( void ); // HD start chemical disinfect flush mode +BOOL startDDROPermeateSample( void ); // TD start RO permeate sample -BOOL startDDROPermeateSample( void ); // HD start RO permeate sample - BOOL testSetFilterFlushTimePeriodOverride( U32 value ); // set filter flush time period override. BOOL testResetFilterFlushTimePeriodOverride( void ); // reset filter flush time period override. Index: firmware/App/Modes/OperationModes.c =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -r051e0c243c0e6faa7a53287b16252d93044d87e0 --- firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision 051e0c243c0e6faa7a53287b16252d93044d87e0) @@ -17,34 +17,25 @@ #include "gio.h" -//#include "ModeDrain.h" #include "ModeFault.h" -//#include "ModeFill.h" -//#include "ModeFlush.h" -//#include "ModeGenIdle.h" -//#include "ModeHeatDisinfect.h" -//#include "ModeHeatDisinfectActiveCool.h" #include "ModeInitPOST.h" -//#include "ModeROPermeateSample.h" #include "ModeService.h" -//#include "ModeSolo.h" #include "ModeStandby.h" -//#include "NVDataMgmt.h" -#include "OperationModes.h" -//#include "ROPump.h" +#include "MessageSupport.h" #include "Messaging.h" +#include "OperationModes.h" #include "TaskGeneral.h" -#include "MessageSupport.h" + /** * @addtogroup DDOperationModes * @{ */ // ********** private definitions ********** -#define BROADCAST_DG_OP_MODE_INTERVAL ( 250 / TASK_GENERAL_INTERVAL ) ///< interval (ms/task time) at which the operation mode is published on the CAN bus. -// The data publish counter offset is a lower number to make sure DG is sending its status to the HD from the beginning and alarm 140 is not raised +#define BROADCAST_DD_OP_MODE_INTERVAL ( 250 / TASK_GENERAL_INTERVAL ) ///< interval (ms/task time) at which the operation mode is published on the CAN bus. +// The data publish counter offset is a lower number to make sure DD is sending its status to the TD from the beginning and alarm 140 is not raised #define DATA_PUBLISH_COUNTER_START_COUNT 2 ///< Data publish counter start count. // ********** private data ********** @@ -55,8 +46,8 @@ static U32 currentSubMode; ///< The currently active state of the active mode. static TD_MODE_SUB_MODE_T tdModes; ///< TD operations mode. -/// DG operation mode data publish interval. -static OVERRIDE_U32_T dgOpModePublishInterval = { BROADCAST_DG_OP_MODE_INTERVAL, BROADCAST_DG_OP_MODE_INTERVAL, 0, 0 }; +/// DD operation mode data publish interval. +static OVERRIDE_U32_T ddOpModePublishInterval = { BROADCAST_DD_OP_MODE_INTERVAL, BROADCAST_DD_OP_MODE_INTERVAL, 0, 0 }; static U32 dataPublishCounter; ///< Interval counter used to determine when to broadcast operation mode. Initialize to 11 to stagger broadcast. static U32 currentSubState; ///< The currently active sub state. @@ -78,7 +69,7 @@ static DD_OP_MODE_T arbitrateModeRequest( void ); static void transitionToNewOperationMode( DD_OP_MODE_T newMode ); -static U32 getDGOpModePublishInterval( void ); +static U32 getDDOpModePublishInterval( void ); static void broadcastOperationMode( void ); static void sendOperationStatusEvent( void ); @@ -192,39 +183,39 @@ currentSubMode = execStandbyMode(); break; // -// case DG_MODE_SOLO: +// case DD_MODE_SOLO: // currentSubMode = execSoloMode(); // break; // -// case DG_MODE_GENE: +// case DD_MODE_GENE: // currentSubMode = execGenIdleMode(); // break; // -// case DG_MODE_FILL: +// case DD_MODE_FILL: // currentSubMode = execFillMode(); // break; // -// case DG_MODE_DRAI: +// case DD_MODE_DRAI: // currentSubMode = execDrainMode(); // break; // -// case DG_MODE_FLUS: +// case DD_MODE_FLUS: // currentSubMode = execFlushMode(); // break; // // case DD_MODE_HEAT: // currentSubMode = execHeatDisinfectMode(); // break; // -// case DG_MODE_CHEM: +// case DD_MODE_CHEM: // currentSubMode = execChemicalDisinfectMode(); // break; // // case DD_MODE_HCOL: // currentSubMode = execHeatDisinfectActiveCoolMode(); // break; // -// case DG_MODE_CHFL: +// case DD_MODE_CHFL: // currentSubMode = execChemicalDisinfectFlushMode(); // break; // @@ -380,31 +371,31 @@ case DD_MODE_STAN: currentSubMode = transitionToStandbyMode(); break; -// case DG_MODE_SOLO: +// case DD_MODE_SOLO: // currentSubMode = transitionToSoloMode(); // break; -// case DG_MODE_GENE: +// case DD_MODE_GENE: // currentSubMode = transitionToGenIdleMode(); // break; -// case DG_MODE_FILL: +// case DD_MODE_FILL: // currentSubMode = transitionToFillMode(); // break; -// case DG_MODE_DRAI: +// case DD_MODE_DRAI: // currentSubMode = transitionToDrainMode(); // break; -// case DG_MODE_FLUS: +// case DD_MODE_FLUS: // currentSubMode = transitionToFlushMode(); // break; // case DD_MODE_HEAT: // currentSubMode = transitionToHeatDisinfectMode(); // break; -// case DG_MODE_CHEM: +// case DD_MODE_CHEM: // currentSubMode = transitionToChemicalDisinfectMode(); // break; // case DD_MODE_HCOL: // currentSubMode = transitionToHeatDisinfectActiveCoolMode(); // break; -// case DG_MODE_CHFL: +// case DD_MODE_CHFL: // currentSubMode = transitionToChemicalDisinfectFlushMode(); // break; // case DD_MODE_ROPS: @@ -432,7 +423,7 @@ *************************************************************************/ static void broadcastOperationMode( void ) { - if ( ++dataPublishCounter >= getDGOpModePublishInterval() ) + if ( ++dataPublishCounter >= getDDOpModePublishInterval() ) { OP_MODES_DATA_T data; @@ -447,19 +438,19 @@ /*********************************************************************//** * @brief - * The getDGOpModePublishInterval function gets the current DG operation mode + * The getDDOpModePublishInterval function gets the current DD operation mode * data publish interval. - * @details \b Inputs: dgOpModePublishInterval - * @details \b Outputs: DG operation mode broadcast message sent + * @details \b Inputs: ddOpModePublishInterval + * @details \b Outputs: DD operation mode broadcast message sent * @return none *************************************************************************/ -static U32 getDGOpModePublishInterval( void ) +static U32 getDDOpModePublishInterval( void ) { - U32 result = dgOpModePublishInterval.data; + U32 result = ddOpModePublishInterval.data; - if ( OVERRIDE_KEY == dgOpModePublishInterval.override ) + if ( OVERRIDE_KEY == ddOpModePublishInterval.override ) { - result = dgOpModePublishInterval.ovData; + result = ddOpModePublishInterval.ovData; } return result; @@ -480,7 +471,7 @@ /*********************************************************************//** * @brief - * The sendOperationStatusEvent function constructs and sends an DG operation + * The sendOperationStatusEvent function constructs and sends an DD operation * status event. * @details \b Inputs: currentMode, currentSubMode, currentSubState * @details \b Outputs: dat1, dat2. @@ -572,14 +563,14 @@ /*********************************************************************//** * @brief - * The testSetDGOpModePublishIntervalOverride function overrides the - * DG operation mode publish interval. + * The testSetDDOpModePublishIntervalOverride function overrides the + * DD operation mode publish interval. * @details \b Inputs: none - * @details \b Outputs: dgOpModePublishInterval - * @param value override DG operation mode publish interval with (in ms) + * @details \b Outputs: ddOpModePublishInterval + * @param value override DD operation mode publish interval with (in ms) * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testSetDGOpModePublishIntervalOverride( U32 value ) +BOOL testSetDDOpModePublishIntervalOverride( U32 value ) { BOOL result = FALSE; @@ -588,30 +579,30 @@ U32 intvl = value / TASK_GENERAL_INTERVAL; result = TRUE; - dgOpModePublishInterval.ovData = intvl; - dgOpModePublishInterval.override = OVERRIDE_KEY; + ddOpModePublishInterval.ovData = intvl; + ddOpModePublishInterval.override = OVERRIDE_KEY; } return result; } /*********************************************************************//** * @brief - * The testResetDGOpModePublishIntervalOverride function resets the - * override of the DG operation mode publish interval. + * The testResetDDOpModePublishIntervalOverride function resets the + * override of the DD operation mode publish interval. * @details \b Inputs: none - * @details \b Outputs: dgOpModePublishInterval + * @details \b Outputs: ddOpModePublishInterval * @return TRUE if override reset successful, FALSE if not *************************************************************************/ -BOOL testResetDGOpModePublishIntervalOverride( void ) +BOOL testResetDDOpModePublishIntervalOverride( void ) { BOOL result = FALSE; if ( TRUE == isTestingActivated() ) { result = TRUE; - dgOpModePublishInterval.override = OVERRIDE_RESET; - dgOpModePublishInterval.ovData = dgOpModePublishInterval.ovInitData; + ddOpModePublishInterval.override = OVERRIDE_RESET; + ddOpModePublishInterval.ovData = ddOpModePublishInterval.ovInitData; } return result; Index: firmware/App/Modes/OperationModes.h =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -r051e0c243c0e6faa7a53287b16252d93044d87e0 --- firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision 051e0c243c0e6faa7a53287b16252d93044d87e0) @@ -23,7 +23,7 @@ #include "TDDefs.h" /** * @defgroup DDOperationModes DDOperationModes - * @brief Operation Modes module. Manages the top level operation modes of the DG via a state machine. + * @brief Operation Modes module. Manages the top level operation modes of the DD via a state machine. * * @addtogroup DDOperationModes * @{ @@ -60,8 +60,8 @@ void getTDOperationMode( TD_MODE_SUB_MODE_T* mode ); // get TD operation mode BOOL testSetOperationMode( DD_OP_MODE_T newMode ); // Force transition to a given mode (if allowed) -BOOL testSetDGOpModePublishIntervalOverride( U32 value ); -BOOL testResetDGOpModePublishIntervalOverride( void ); +BOOL testSetDDOpModePublishIntervalOverride( U32 value ); +BOOL testResetDDOpModePublishIntervalOverride( void ); /**@}*/