Index: AlarmMgmt.c =================================================================== diff -u -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57 -r809103b805b84e80dda7e3dd1e77a52330610666 --- AlarmMgmt.c (.../AlarmMgmt.c) (revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57) +++ AlarmMgmt.c (.../AlarmMgmt.c) (revision 809103b805b84e80dda7e3dd1e77a52330610666) @@ -204,7 +204,7 @@ broadcastData( MSG_ID_ALARM_CONDITION_CLEARED, COMM_BUFFER_OUT_CAN_DD_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) ); #endif #ifdef _RO_ - broadcastData( MSG_ID_ALARM_CONDITION_CLEARED, COMM_BUFFER_OUT_CAN_RO_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) ); + broadcastData( MSG_ID_ALARM_CONDITION_CLEARED, COMM_BUFFER_OUT_CAN_FP_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) ); #endif } } @@ -257,7 +257,7 @@ broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_DD_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) ); #endif #ifdef _RO_ - broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_RO_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) ); + broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_FP_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) ); #endif } } @@ -455,7 +455,7 @@ clearAlarmDD( (ALARM_ID_T)alarmID ); #endif #ifdef _RO_ - clearAlarmRO( (ALARM_ID_T)alarmID ); + clearAlarmFP( (ALARM_ID_T)alarmID ); #endif } result = TRUE; Index: AlarmMgmt.h =================================================================== diff -u -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57 -r809103b805b84e80dda7e3dd1e77a52330610666 --- AlarmMgmt.h (.../AlarmMgmt.h) (revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57) +++ AlarmMgmt.h (.../AlarmMgmt.h) (revision 809103b805b84e80dda7e3dd1e77a52330610666) @@ -108,7 +108,7 @@ void initAlarmMgmt( void ); -#if defined (__ALARM_MGMT_C__) || defined(__ALARM_MGMT_DD_C__) || defined(__ALARM_MGMT_TD_C__) || defined(__ALARM_MGMT_RO_C__) +#if defined (__ALARM_MGMT_C__) || defined(__ALARM_MGMT_DD_C__) || defined(__ALARM_MGMT_TD_C__) || defined(__ALARM_MGMT_FP_C__) ALARM_T getAlarmProperties( ALARM_ID_T alarm ); ALARM_RANK_T getAlarmRank( U32 index ); #endif Index: CommBuffers.c =================================================================== diff -u -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57 -r809103b805b84e80dda7e3dd1e77a52330610666 --- CommBuffers.c (.../CommBuffers.c) (revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57) +++ CommBuffers.c (.../CommBuffers.c) (revision 809103b805b84e80dda7e3dd1e77a52330610666) @@ -26,7 +26,7 @@ #include "SystemCommDD.h" #endif #ifdef _RO_ -#include "SystemCommRO.h" +#include "SystemCommFP.h" #endif #include "Timers.h" Index: CommBuffers.h =================================================================== diff -u -rccb5b8e8c8f1517e91b7093ad3de0543c0a34e7f -r809103b805b84e80dda7e3dd1e77a52330610666 --- CommBuffers.h (.../CommBuffers.h) (revision ccb5b8e8c8f1517e91b7093ad3de0543c0a34e7f) +++ CommBuffers.h (.../CommBuffers.h) (revision 809103b805b84e80dda7e3dd1e77a52330610666) @@ -65,13 +65,13 @@ #ifdef _RO_ COMM_BUFFER_IN_CAN_TD_ALARM, ///< Buffer for incoming TD alarm messages (channel 1) COMM_BUFFER_IN_CAN_DD_ALARM, ///< Buffer for incoming DD alarm messages (channel 2) - COMM_BUFFER_OUT_CAN_RO_ALARM, ///< Buffer for outgoing RO alarm messages (channel 4) + COMM_BUFFER_OUT_CAN_FP_ALARM, ///< Buffer for outgoing RO alarm messages (channel 4) COMM_BUFFER_IN_CAN_UI_ALARM, ///< Buffer for incoming UI alarm messages (channel 8) - COMM_BUFFER_IN_CAN_DD_2_RO, ///< Buffer for incoming DD to RO messages (channel 20) - COMM_BUFFER_OUT_CAN_RO_2_DD, ///< Buffer for outgoing RO to DD messages (channel 21) + COMM_BUFFER_IN_CAN_DD_2_FP, ///< Buffer for incoming DD to RO messages (channel 20) + COMM_BUFFER_OUT_CAN_FP_2_DD, ///< Buffer for outgoing RO to DD messages (channel 21) COMM_BUFFER_IN_CAN_TD_BROADCAST, ///< Buffer for incoming TD broadcast messages (channel 100) COMM_BUFFER_IN_CAN_DD_BROADCAST, ///< Buffer for incoming DD broadcast messages (channel 101) - COMM_BUFFER_OUT_CAN_RO_BROADCAST, ///< Buffer for incoming RO broadcast messages (channel 102) + COMM_BUFFER_OUT_CAN_FP_BROADCAST, ///< Buffer for incoming RO broadcast messages (channel 102) COMM_BUFFER_IN_CAN_UI_BROADCAST, ///< Buffer for incoming UI broadcast messages (channel 103) #endif COMM_BUFFER_IN_CAN_PC, ///< Buffer for incoming PC messages (channel 400-TD, 402-DD, 404-RO) Index: Common.h =================================================================== diff -u -r0b980cfad231f44b9805699b91a1f70a373e2a17 -r809103b805b84e80dda7e3dd1e77a52330610666 --- Common.h (.../Common.h) (revision 0b980cfad231f44b9805699b91a1f70a373e2a17) +++ Common.h (.../Common.h) (revision 809103b805b84e80dda7e3dd1e77a52330610666) @@ -333,7 +333,7 @@ #include "AlarmMgmtDD.h" #endif #ifdef _RO_ -#include "AlarmMgmtRO.h" +#include "AlarmMgmtFP.h" #endif // include Message definitions header for access to system message IDs Index: FPGA.c =================================================================== diff -u -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57 -r809103b805b84e80dda7e3dd1e77a52330610666 --- FPGA.c (.../FPGA.c) (revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57) +++ FPGA.c (.../FPGA.c) (revision 809103b805b84e80dda7e3dd1e77a52330610666) @@ -30,7 +30,7 @@ #include "FpgaDD.h" #endif #ifdef _RO_ -#include "FpgaRO.h" +#include "FpgaFP.h" #endif #include "Messaging.h" #include "OperationModes.h" Index: SystemComm.c =================================================================== diff -u -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57 -r809103b805b84e80dda7e3dd1e77a52330610666 --- SystemComm.c (.../SystemComm.c) (revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57) +++ SystemComm.c (.../SystemComm.c) (revision 809103b805b84e80dda7e3dd1e77a52330610666) @@ -33,7 +33,7 @@ #include "SystemCommDD.h" #endif #ifdef _RO_ -#include "SystemCommRO.h" +#include "SystemCommFP.h" #endif #include "Timers.h" #include "Utilities.h" @@ -734,7 +734,7 @@ #ifdef _RO_ // TODO : clean up required // Remove message pending ACK from list - if ( ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_DD_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_RO_2_DD ) ) ) + if ( ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_DD_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_FP_2_DD ) ) ) #endif { pendingAckList[ i ].used = FALSE; @@ -796,7 +796,7 @@ } #endif #ifdef _RO_ - if ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_RO_2_DD ) + if ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_FP_2_DD ) { SET_ALARM_WITH_1_U32_DATA( ALARM_ID_FP_CAN_MESSAGE_NOT_ACKED_BY_DD, (U32)msgID ); } Index: WatchdogMgmt.c =================================================================== diff -u -r4e16a1c22b73b14cfd62cce4f07a1b9086c55dd7 -r809103b805b84e80dda7e3dd1e77a52330610666 --- WatchdogMgmt.c (.../WatchdogMgmt.c) (revision 4e16a1c22b73b14cfd62cce4f07a1b9086c55dd7) +++ WatchdogMgmt.c (.../WatchdogMgmt.c) (revision 809103b805b84e80dda7e3dd1e77a52330610666) @@ -24,7 +24,7 @@ #include "SafetyShutdown.h" #endif #ifdef _RO_ -#include "FpgaRO.h" +#include "FpgaFP.h" #include "SafetyShutdown.h" #endif //#include "InternalADC.h" @@ -153,7 +153,7 @@ #endif #ifdef _RO_ // Check to see if watchdog has expired or safety shutdown feedback does not match s/w command (only after POST completed) - if ( ( safetyShutdownSoftwareCmd != safetyShutdownFeedbackSignal ) && ( getCurrentOperationMode() != RO_MODE_INIT ) ) + if ( ( safetyShutdownSoftwareCmd != safetyShutdownFeedbackSignal ) && ( getCurrentOperationMode() != FP_MODE_INIT ) ) #endif { if ( ( PIN_SIGNAL_LOW == safetyShutdownFeedbackSignal ) || ( TRUE == didTimeout( safetyShutdownFeedbackMismatchTS, MAX_SAFETY_SHUTDOWN_MISMATCH_MS ) ) )