Index: firmware/App/DGCommon.h =================================================================== diff -u -ra504d6899e709d7432af9c055db1bd1fe340d032 -r3cc737c39b4440e18abab95ef2f8b6aef13acba9 --- firmware/App/DGCommon.h (.../DGCommon.h) (revision a504d6899e709d7432af9c055db1bd1fe340d032) +++ firmware/App/DGCommon.h (.../DGCommon.h) (revision 3cc737c39b4440e18abab95ef2f8b6aef13acba9) @@ -32,9 +32,8 @@ #ifndef _VECTORCAST_ // #define RM46_EVAL_BOARD_TARGET 1 // #define SIMULATE_UI 1 - // #define CAN_TEST 1 - #define ENABLE_DIP_SWITCHES 1 +// #define ENABLE_DIP_SWITCHES 1 #include #include #endif Index: firmware/App/Drivers/SafetyShutdown.c =================================================================== diff -u -ra504d6899e709d7432af9c055db1bd1fe340d032 -r3cc737c39b4440e18abab95ef2f8b6aef13acba9 --- firmware/App/Drivers/SafetyShutdown.c (.../SafetyShutdown.c) (revision a504d6899e709d7432af9c055db1bd1fe340d032) +++ firmware/App/Drivers/SafetyShutdown.c (.../SafetyShutdown.c) (revision 3cc737c39b4440e18abab95ef2f8b6aef13acba9) @@ -38,7 +38,7 @@ /************************************************************************* * @brief - * The initSafetyShutdown function initializes the Buttons module. + * The initSafetyShutdown function initializes the Safety Shutdown module. * @details * Inputs : none * Outputs : Safety Shutdown module signal output set to initial state. @@ -92,8 +92,6 @@ if ( TRUE == isTestingActivated() ) { - MOTOR_DIR_T dir; - // remember natural state before override so we can reset safetyShutdownOverrideResetState = safetyShutdownActivated; // override safety shutdown signal Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -ra504d6899e709d7432af9c055db1bd1fe340d032 -r3cc737c39b4440e18abab95ef2f8b6aef13acba9 --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision a504d6899e709d7432af9c055db1bd1fe340d032) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 3cc737c39b4440e18abab95ef2f8b6aef13acba9) @@ -27,10 +27,9 @@ * @{ */ - // ********** private data ********** -static DG_POST_STATE_T postState = DG_POST_STATE_START; ///< Currently active initialize & POST state. +static DG_POST_STATE_T postState = DG_POST_STATE_START; ///< Currently active initialize & POST state. static BOOL postCompleted = FALSE; ///< Flag indicating POST completed. static BOOL postPassed = FALSE; ///< Flag indicating all POST tests passed. static BOOL tempPOSTPassed = TRUE; ///< Temporary flag indicating all POST tests completed so far have passed. @@ -66,15 +65,15 @@ *************************************************************************/ void transitionToInitAndPOSTMode( void ) { - // TODO Will be filled up by Sean Nash + // TODO - anything needed here? } /*********************************************************************//** * @brief * The execInitAndPOSTMode function executes the Initialize & POST Mode state machine. * @details - * Inputs : none - * Outputs : + * Inputs : postState + * Outputs : POST state machine executed * @return current state. *************************************************************************/ U32 execInitAndPOSTMode( void ) Index: firmware/App/Services/PIControllers.c =================================================================== diff -u -ra504d6899e709d7432af9c055db1bd1fe340d032 -r3cc737c39b4440e18abab95ef2f8b6aef13acba9 --- firmware/App/Services/PIControllers.c (.../PIControllers.c) (revision a504d6899e709d7432af9c055db1bd1fe340d032) +++ firmware/App/Services/PIControllers.c (.../PIControllers.c) (revision 3cc737c39b4440e18abab95ef2f8b6aef13acba9) @@ -246,4 +246,3 @@ } /**@}*/ - Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -ra504d6899e709d7432af9c055db1bd1fe340d032 -r3cc737c39b4440e18abab95ef2f8b6aef13acba9 --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision a504d6899e709d7432af9c055db1bd1fe340d032) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 3cc737c39b4440e18abab95ef2f8b6aef13acba9) @@ -1017,7 +1017,7 @@ break; default: - // TODO - unrecognized message ID received - ignore + // unrecognized message ID received - ok, ignore - may be a test message handled below break; } Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -ra504d6899e709d7432af9c055db1bd1fe340d032 -r3cc737c39b4440e18abab95ef2f8b6aef13acba9 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision a504d6899e709d7432af9c055db1bd1fe340d032) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 3cc737c39b4440e18abab95ef2f8b6aef13acba9) @@ -479,25 +479,25 @@ BOOL broadcastHeatersData ( U32 mainPrimaryDC, U32 smallPrimaryDC, U32 trimmerDC ) { BOOL result; - MESSAGE_T msg; - U08 *payloadPtr = msg.payload; - HEATERS_DATA_T payload; + MESSAGE_T msg; + U08 *payloadPtr = msg.payload; + HEATERS_DATA_T payload; - // create a message record - blankMessage( &msg ); - msg.hdr.msgID = MSG_ID_DG_HEATERS_DATA; - msg.hdr.payloadLen = sizeof( HEATERS_DATA_T ); + // create a message record + blankMessage( &msg ); + msg.hdr.msgID = MSG_ID_DG_HEATERS_DATA; + msg.hdr.payloadLen = sizeof( HEATERS_DATA_T ); - payload.mainPrimayHeaterDC = mainPrimaryDC; - payload.smallPrimaryHeaterDC = smallPrimaryDC; - payload.trimmerHeaterDC = trimmerDC; + payload.mainPrimayHeaterDC = mainPrimaryDC; + payload.smallPrimaryHeaterDC = smallPrimaryDC; + payload.trimmerHeaterDC = trimmerDC; - memcpy( payloadPtr, &payload, sizeof( HEATERS_DATA_T ) ); + memcpy( payloadPtr, &payload, sizeof( HEATERS_DATA_T ) ); - // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer - result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED ); + // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer + result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED ); - return result; + return result; } /************************************************************************* @@ -910,6 +910,61 @@ } /************************************************************************* + * @brief handleSetRTCTimestamp + * The handleSetRTCTimestamp function handles a request to write time and + * date to RTC + * @details + * Inputs : none + * Outputs : message handled + * @param message : a pointer to the message to handle + * @return none + *************************************************************************/ +void handleSetRTCTimestamp( MESSAGE_T *message ) +{ + BOOL result; + U08 seconds = message->payload[0]; + U08 minutes = message->payload[1]; + U08 hours = message->payload[2]; + U08 days = message->payload[3]; + U08 months = message->payload[4]; + U32 years; + memcpy(&years, &message->payload[5], sizeof(U32)); + + result = setRTCTimestamp( seconds, minutes, hours, days, months, years ); + + // respond to request + sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); +} + +/************************************************************************* + * @brief + * The handleStartStopPrimaryHeater function handles a request start or + * stop the primary heater + * @details + * Inputs : none + * Outputs : message handled + * @param message : a pointer to the message to handle + * @return result + *************************************************************************/ +BOOL handleStartStopPrimaryHeater( MESSAGE_T * message ) +{ + BOOL result; + U32 heaterStatus = message->payload[0]; + + if ( heaterStatus == 1 ) + { + result = startPrimaryHeater(); + } + else + { + stopPrimaryHeater(); + result = TRUE; + } + + return result; +} + +/************************************************************************* * TEST SUPPORT FUNCTIONS *************************************************************************/ @@ -1031,8 +1086,6 @@ DATA_ARRAY_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestAlarmStateOverrideRequest, testSetAlarmStateOverride, testResetAlarmStateOverride ) /************************************************************************* -<<<<<<< HEAD -======= * @brief * The handleTestLoadCellOverrideRequest function handles a request to \n * override the value read from the given load cell. @@ -1084,33 +1137,6 @@ testSetHeatersPublishIntervalOverride, testResetHeatersPublishIntervalOverride ) /************************************************************************* - * @brief handleSetRTCTimestamp - * The handleSetRTCTimestamp function handles a request to write time and - * date to RTC - * @details - * Inputs : none - * Outputs : message handled - * @param message : a pointer to the message to handle - * @return none - *************************************************************************/ -void handleSetRTCTimestamp( MESSAGE_T *message ) -{ - BOOL result; - U08 seconds = message->payload[0]; - U08 minutes = message->payload[1]; - U08 hours = message->payload[2]; - U08 days = message->payload[3]; - U08 months = message->payload[4]; - U32 years; - memcpy(&years, &message->payload[5], sizeof(U32)); - - result = setRTCTimestamp( seconds, minutes, hours, days, months, years ); - - // respond to request - sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); -} - -/************************************************************************* * @brief * The handleTestLoadCellDataBroadcastIntervalOverrideRequest function handles \n * a request to override the broadcast interval for load cell data. @@ -1267,31 +1293,3 @@ } #endif - -/************************************************************************* - * @brief - * The handleStartStopPrimaryHeater function handles a request start or - * stop the primary heater - * @details - * Inputs : none - * Outputs : message handled - * @param message : a pointer to the message to handle - * @return result - *************************************************************************/ -BOOL handleStartStopPrimaryHeater( MESSAGE_T * message ) -{ - BOOL result; - U32 heaterStatus = message->payload[0]; - - if ( heaterStatus == 1 ) - { - result = startPrimaryHeater(); - } - else - { - stopPrimaryHeater(); - result = TRUE; - } - - return result; -} Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -ra504d6899e709d7432af9c055db1bd1fe340d032 -r3cc737c39b4440e18abab95ef2f8b6aef13acba9 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision a504d6899e709d7432af9c055db1bd1fe340d032) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 3cc737c39b4440e18abab95ef2f8b6aef13acba9) @@ -29,6 +29,7 @@ // MSG_ID_ALARM_TRIGGERED BOOL broadcastAlarmTriggered( U16 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 ); + // MSG_ID_ALARM_CLEARED BOOL broadcastAlarmCleared( U16 alarm ); @@ -151,12 +152,12 @@ // MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE: void handleTestDGSafetyShutdownOverrideRequest( MESSAGE_T *message ); +// MSG_ID_START_STOP_PRIMARY_HEATER +BOOL handleStartStopPrimaryHeater( MESSAGE_T * message ); + #ifdef CAN_TEST // MSG_ID_DG_CAN_TEST_1_LARGE_FREQ void broadcastCANTest1LargeFrequentMessage(); #endif -// MSG_ID_START_STOP_PRIMARY_HEATER -BOOL handleStartStopPrimaryHeater( MESSAGE_T * message ); - #endif Index: firmware/App/Tasks/TaskGeneral.c =================================================================== diff -u -ra504d6899e709d7432af9c055db1bd1fe340d032 -r3cc737c39b4440e18abab95ef2f8b6aef13acba9 --- firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision a504d6899e709d7432af9c055db1bd1fe340d032) +++ firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 3cc737c39b4440e18abab95ef2f8b6aef13acba9) @@ -53,11 +53,14 @@ // manage drain pump execDrainPumpController(); - // manage heaters - execPrimaryHeaters(); - // manage time-based reservoir tasks execReservoirs(); + + // Primary heaters state machine + execPrimaryHeaters(); + + // Trimmer heater state machine + execTrimmerHeater(); #endif // run operation mode state machine execOperationModes(); @@ -84,12 +87,6 @@ // manage data to be transmitted to other sub-systems execSystemCommTx(); - // Primary heaters state machine - execPrimaryHeaters(); - - // Trimmer heater state machine - execTrimmerHeater(); - // toggle GPIO to indicate general task has executed // gioToggleBit( gioPORTB, 1 ); } Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -ra504d6899e709d7432af9c055db1bd1fe340d032 -r3cc737c39b4440e18abab95ef2f8b6aef13acba9 --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision a504d6899e709d7432af9c055db1bd1fe340d032) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 3cc737c39b4440e18abab95ef2f8b6aef13acba9) @@ -52,6 +52,9 @@ // monitor load cells execLoadCell(); + // Temperature sensors read + execTemperatureSensors(); + // control valves execValves(); @@ -61,19 +64,13 @@ // monitor drain pump execDrainPumpMonitor(); - // Temperature sensors read - execTemperatureSensors(); + // Heaters monitor + execHeatersMonitor(); #endif // 2nd pass for FPGA execFPGAOut(); - // Temperature sensors read - execTemperatureSensors(); - - // Heaters monitor - execHeatersMonitor(); - // check in with watchdog manager checkInWithWatchdogMgmt( TASK_PRIORITY ); Index: firmware/source/sys_main.c =================================================================== diff -u -ra504d6899e709d7432af9c055db1bd1fe340d032 -r3cc737c39b4440e18abab95ef2f8b6aef13acba9 --- firmware/source/sys_main.c (.../sys_main.c) (revision a504d6899e709d7432af9c055db1bd1fe340d032) +++ firmware/source/sys_main.c (.../sys_main.c) (revision 3cc737c39b4440e18abab95ef2f8b6aef13acba9) @@ -82,7 +82,6 @@ #include "Timers.h" #include "Valves.h" #include "WatchdogMgmt.h" -#include "Heaters.h" static void initProcessor( void ); static void initSoftware( void ); @@ -180,8 +179,6 @@ initSystemComm(); initReservoirs(); initOperationModes(); - initTemperatureSensors(); - initHeaters(); } /*************************************************************************