Index: firmware/App/Services/SystemCommDD.c =================================================================== diff -u -r4b09605126f35b80406e95d079f3822c51a3ba25 -re0102a0a08c0d83bcc8e959551079063e2e60d9f --- firmware/App/Services/SystemCommDD.c (.../SystemCommDD.c) (revision 4b09605126f35b80406e95d079f3822c51a3ba25) +++ firmware/App/Services/SystemCommDD.c (.../SystemCommDD.c) (revision e0102a0a08c0d83bcc8e959551079063e2e60d9f) @@ -74,7 +74,7 @@ static volatile BOOL ddIsOnlyCANNode = TRUE; ///< flag indicating whether DG is alone on CAN bus. static OVERRIDE_U32_T tdCommunicationStatus = {0, 0, 0, 0}; ///< has TD sent a message since last check static volatile U32 timeOfLastTDCheckIn = 0; ///< last time we received an TD broadcast -static OVERRIDE_U32_T roCommunicationStatus = {0, 0, 0, 0}; ///< has RO sent a message since last check +static OVERRIDE_U32_T fpCommunicationStatus = {0, 0, 0, 0}; ///< has RO sent a message since last check static volatile U32 timeOfLastROCheckIn = 0; ///< last time we received an RO broadcast // ********** private function prototypes ********** @@ -122,12 +122,12 @@ * The checkInFromRO function checks in the RO with the DD - indicating that * the RO is communicating. * @details \b Inputs: none - * @details \b Outputs: roCommunicationStatus, timeOfLastROCheckIn + * @details \b Outputs: fpCommunicationStatus, timeOfLastROCheckIn * @return none *************************************************************************/ void checkInFromRO( void ) { - roCommunicationStatus.data = TRUE; + fpCommunicationStatus.data = TRUE; timeOfLastROCheckIn = getMSTimerCount(); // if ( TRUE == isAlarmActive( ALARM_ID_DD_RO_COMM_TIMEOUT ) ) @@ -153,13 +153,13 @@ * @brief * The isFPCommunicating function determines whether the RO is communicating * with the DD. - * @details \b Inputs: roCommunicationStatus + * @details \b Inputs: fpCommunicationStatus * @details \b Outputs: none * @return TRUE if RO has broadcast since last call, FALSE if not *************************************************************************/ BOOL isFPCommunicating( void ) { - return getU32OverrideValue( &roCommunicationStatus ); + return getU32OverrideValue( &fpCommunicationStatus ); } /*********************************************************************//** @@ -223,7 +223,7 @@ if ( TRUE == didTimeout( timeOfLastROCheckIn, RO_COMM_TIMEOUT_IN_MS ) ) { - roCommunicationStatus.data = FALSE; + fpCommunicationStatus.data = FALSE; //setROOperationMode( 0, 0 ); // If RO off or not connected, consider RO mode is fault. } } @@ -344,14 +344,14 @@ * The testROCommunicationStatusOverride function sets the override * of the RO communication status. * @details \b Inputs: none - * @details \b Outputs: roCommunicationStatus + * @details \b Outputs: fpCommunicationStatus * @param message Override message from Dialin which includes the flag * value to override for the RO communication status. * @return TRUE if override successful, FALSE if not *************************************************************************/ BOOL testROCommunicationStatusOverride( MESSAGE_T *message ) { - BOOL result = u32Override( message, &roCommunicationStatus, FALSE, TRUE ); + BOOL result = u32Override( message, &fpCommunicationStatus, FALSE, TRUE ); return result; }