Index: AlarmMgmt.c =================================================================== diff -u -r2474fa0f2fb3f769fb0cfae7309fa039ec9a0185 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- AlarmMgmt.c (.../AlarmMgmt.c) (revision 2474fa0f2fb3f769fb0cfae7309fa039ec9a0185) +++ AlarmMgmt.c (.../AlarmMgmt.c) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -19,11 +19,8 @@ #define __ALARM_MGMT_C__ -#ifdef _RO_ #include "FPOperationModes.h" -#else #include "OperationModes.h" -#endif #include "Messaging.h" #include "TaskGeneral.h" #include "Timers.h" @@ -92,9 +89,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm ) -#endif } return result; @@ -125,9 +119,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_RANK, index ); #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_RANK, index ); -#endif } return result; @@ -171,9 +162,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE3, (U32)alarm ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE3, (U32)alarm ) -#endif } } @@ -217,9 +205,6 @@ 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_FP_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) ); -#endif } } else @@ -230,9 +215,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR_COND, (U32)alarm ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR_COND, (U32)alarm ) -#endif } } @@ -279,9 +261,6 @@ 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_FP_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) ); -#endif } } } @@ -293,9 +272,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR2, (U32)alarm ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR2, (U32)alarm ) -#endif } } @@ -355,9 +331,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED1, (U32)alarm ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED1, (U32)alarm ) -#endif } return result; @@ -392,9 +365,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED2, (U32)alarm ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED2, (U32)alarm ) -#endif } return result; @@ -426,9 +396,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED3, (U32)alarm ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED3, (U32)alarm ) -#endif } return result; @@ -477,9 +444,6 @@ #ifdef _DD_ clearAlarmDD( (ALARM_ID_T)alarmID ); #endif -#ifdef _RO_ - clearAlarmFP( (ALARM_ID_T)alarmID ); -#endif } result = TRUE; } Index: AlarmMgmt.h =================================================================== diff -u -r2223ae0cb2b668d78037b39ba0e082333be0f914 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- AlarmMgmt.h (.../AlarmMgmt.h) (revision 2223ae0cb2b668d78037b39ba0e082333be0f914) +++ AlarmMgmt.h (.../AlarmMgmt.h) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -23,8 +23,6 @@ #endif #ifdef _DD_ #include "DDCommon.h" -#endif -#ifdef _RO_ #include "FPCommon.h" #endif #include "AlarmDefs.h" Index: Comm.h =================================================================== diff -u -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- Comm.h (.../Comm.h) (revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57) +++ Comm.h (.../Comm.h) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -23,8 +23,6 @@ #endif #ifdef _DD_ #include "DDCommon.h" -#endif -#ifdef _RO_ #include "FPCommon.h" #endif Index: CommBuffers.c =================================================================== diff -u -r809103b805b84e80dda7e3dd1e77a52330610666 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- CommBuffers.c (.../CommBuffers.c) (revision 809103b805b84e80dda7e3dd1e77a52330610666) +++ CommBuffers.c (.../CommBuffers.c) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -25,9 +25,6 @@ #ifdef _DD_ #include "SystemCommDD.h" #endif -#ifdef _RO_ -#include "SystemCommFP.h" -#endif #include "Timers.h" /** @@ -194,9 +191,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_INVALID_BUFFER, buffer ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_INVALID_BUFFER, buffer ) -#endif } return result; @@ -263,9 +257,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_GET_INVALID_BUFFER, buffer ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_GET_INVALID_BUFFER, buffer ) -#endif } return result; @@ -330,9 +321,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_PEEK_INVALID_BUFFER, buffer ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_PEEK_INVALID_BUFFER, buffer ) -#endif } return numOfBytesPeeked; @@ -369,9 +357,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_COUNT_INVALID_BUFFER, buffer ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_COUNT_INVALID_BUFFER, buffer ) -#endif } return result; Index: CommBuffers.h =================================================================== diff -u -r6145aa3d5ad75342f087f36b1fcd41af213f95f8 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- CommBuffers.h (.../CommBuffers.h) (revision 6145aa3d5ad75342f087f36b1fcd41af213f95f8) +++ CommBuffers.h (.../CommBuffers.h) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -66,20 +66,6 @@ COMM_BUFFER_IN_FP_CAN_PC, ///< Buffer for incoming PC messages (channel 400-TD, 402-DD, 404-RO) COMM_BUFFER_OUT_FP_CAN_PC, ///< Buffer for outgoing messages to PC (channel 401-TD, 403-DD, 405-RO) #endif -#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_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_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_FP_BROADCAST, ///< Buffer for incoming RO broadcast messages (channel 102) - COMM_BUFFER_IN_CAN_UI_BROADCAST, ///< Buffer for incoming UI broadcast messages (channel 103) - COMM_BUFFER_IN_CAN_PC, ///< Buffer for incoming PC messages (channel 400-TD, 402-DD, 404-RO) - COMM_BUFFER_OUT_CAN_PC, ///< Buffer for outgoing messages to PC (channel 401-TD, 403-DD, 405-RO) -#endif NUM_OF_COMM_BUFFERS ///< Number of CAN communication buffers } COMM_BUFFER_T; @@ -90,8 +76,6 @@ #endif #ifdef _DD_ #include "DDCommon.h" -#endif -#ifdef _RO_ #include "FPCommon.h" #endif Index: Common.h =================================================================== diff -u -r809103b805b84e80dda7e3dd1e77a52330610666 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- Common.h (.../Common.h) (revision 809103b805b84e80dda7e3dd1e77a52330610666) +++ Common.h (.../Common.h) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -332,9 +332,6 @@ #ifdef _DD_ #include "AlarmMgmtDD.h" #endif -#ifdef _RO_ -#include "AlarmMgmtFP.h" -#endif // include Message definitions header for access to system message IDs #include "MsgDefs.h" Index: FPGA.c =================================================================== diff -u -r82f1fd2a4717d0cd63d512c3132f98ff51e4e63b -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- FPGA.c (.../FPGA.c) (revision 82f1fd2a4717d0cd63d512c3132f98ff51e4e63b) +++ FPGA.c (.../FPGA.c) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -30,9 +30,6 @@ #ifdef _DD_ #include "FpgaDD.h" #include "OperationModes.h" -#endif -#ifdef _RO_ -#include "FpgaFP.h" #include "FPOperationModes.h" #endif #include "Messaging.h" @@ -385,9 +382,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_INVALID_STATE, fpgaState ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_INVALID_STATE, fpgaState ) -#endif break; } @@ -685,9 +679,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_CMD_TOO_MUCH_DATA, bytes2Transmit ); #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_CMD_TOO_MUCH_DATA, bytes2Transmit ); -#endif } } @@ -731,9 +722,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_RSP_TOO_MUCH_DATA, bytes2Receive ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_WRITE_RSP_TOO_MUCH_DATA, bytes2Receive ) -#endif } } @@ -777,9 +765,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_CMD_TOO_MUCH_DATA, bytes2Transmit ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_CMD_TOO_MUCH_DATA, bytes2Transmit ) -#endif } } @@ -823,9 +808,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_RSP_TOO_MUCH_DATA, bytes2Receive ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_READ_RSP_TOO_MUCH_DATA, bytes2Receive ) -#endif } } Index: FPGA.h =================================================================== diff -u -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- FPGA.h (.../FPGA.h) (revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57) +++ FPGA.h (.../FPGA.h) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -23,8 +23,6 @@ #endif #ifdef _DD_ #include "DDCommon.h" -#endif -#ifdef _RO_ #include "FPCommon.h" #endif Index: MessagePayloads.h =================================================================== diff -u -r4e24d95c7efe04a5b6248bd1010858de5972a8e3 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- MessagePayloads.h (.../MessagePayloads.h) (revision 4e24d95c7efe04a5b6248bd1010858de5972a8e3) +++ MessagePayloads.h (.../MessagePayloads.h) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -23,8 +23,6 @@ #endif #ifdef _DD_ #include "DDCommon.h" -#endif -#ifdef _RO_ #include "FPCommon.h" #endif Index: PIControllers.c =================================================================== diff -u -r4ed3097b9e36e0f5112b47b684b887c19e7d1dc4 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- PIControllers.c (.../PIControllers.c) (revision 4ed3097b9e36e0f5112b47b684b887c19e7d1dc4) +++ PIControllers.c (.../PIControllers.c) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -77,12 +77,6 @@ { 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.5, CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 }, // PI_CONTROLLER_ID_BOOST_PUMP_FLOW { 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.1, CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 }, // PI_CONTROLLER_ID_BOOST_PUMP_PRES #endif -#ifdef _RO_ - { 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 50.0, CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 }, // PI_CONTROLLER_ID_RO_PUMP - { 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.1, CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 }, // PI_CONTROLLER_ID_RO_PUMP_MAX_PRES - { 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.5, CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 }, // PI_CONTROLLER_ID_BOOST_PUMP_FLOW - { 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.1, CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 }, // PI_CONTROLLER_ID_BOOST_PUMP_PRES -#endif }; /*********************************************************************//** @@ -132,9 +126,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID ) -#endif } } @@ -171,9 +162,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID ) -#endif } } @@ -271,9 +259,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID ) -#endif } return result; @@ -343,9 +328,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_SIGNAL, (U32)signalID ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_SIGNAL, (U32)signalID ) -#endif break; } // End of switch } @@ -354,9 +336,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID ) -#endif } return output; @@ -391,9 +370,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_STEP_LIMIT, (U32)stepLimit ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_STEP_LIMIT, (U32)stepLimit ) -#endif } } @@ -403,10 +379,6 @@ // Invalid controller given SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID ) #endif -#ifdef _RO_ - // Invalid controller given - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID ) -#endif } } Index: PIControllers.h =================================================================== diff -u -r4ed3097b9e36e0f5112b47b684b887c19e7d1dc4 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- PIControllers.h (.../PIControllers.h) (revision 4ed3097b9e36e0f5112b47b684b887c19e7d1dc4) +++ PIControllers.h (.../PIControllers.h) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -23,8 +23,6 @@ #endif #ifdef _DD_ #include "DDCommon.h" -#endif -#ifdef _RO_ #include "FPCommon.h" #endif @@ -54,12 +52,6 @@ PI_CONTROLLER_ID_BOOST_PUMP_FLOW, ///< Boost pump controller to flow PI_CONTROLLER_ID_BOOST_PUMP_PRES, ///< Boost pump controller to maximum pressure #endif -#ifdef _RO_ - PI_CONTROLLER_ID_RO_PUMP_FLOW, ///< RO Pump controller to flow - PI_CONTROLLER_ID_RO_PUMP_PRES, ///< RO pump controller to maximum pressure - PI_CONTROLLER_ID_BOOST_PUMP_FLOW, ///< Boost pump controller to flow - PI_CONTROLLER_ID_BOOST_PUMP_PRES, ///< Boost pump controller to maximum pressure -#endif NUM_OF_PI_CONTROLLERS_IDS ///< Number of PI controllers } PI_CONTROLLER_ID_T; Index: PersistentAlarm.c =================================================================== diff -u -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- PersistentAlarm.c (.../PersistentAlarm.c) (revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57) +++ PersistentAlarm.c (.../PersistentAlarm.c) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -106,9 +106,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX1, alarmId ); #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX1, alarmId ); -#endif } } @@ -192,9 +189,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX2, alarmId ); #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX2, alarmId ); -#endif } return isAlarmTriggered; @@ -240,9 +234,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX3, alarmId ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX3, alarmId ) -#endif } return isErrorConditionCleared; @@ -322,9 +313,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED1, (U32)group ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED1, (U32)group ) -#endif } } @@ -360,9 +348,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED2, (U32)group ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED2, (U32)group ) -#endif } } @@ -400,9 +385,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED3, errorType ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED3, errorType ) -#endif break; } Index: PersistentAlarm.h =================================================================== diff -u -r190f8e74913110e57f0e315cfd6279830afc6619 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- PersistentAlarm.h (.../PersistentAlarm.h) (revision 190f8e74913110e57f0e315cfd6279830afc6619) +++ PersistentAlarm.h (.../PersistentAlarm.h) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -63,14 +63,6 @@ } FPGA_PERSISTENT_ALARMS_GROUP_T; #endif -#ifdef _RO_ -/// FPGA persistent alarm groups data structure -typedef enum -{ - NUM_OF_FPGA_SENSOR_GROUPS = 0 ///< Number of FPGA persistent error sensor groups. -} FPGA_PERSISTENT_ALARMS_GROUP_T; -#endif - // ********** public function prototypes ********** void initPersistentAlarm( ALARM_ID_T alarmIndex, U32 persistentClearPeriod, U32 persistentTriggerPeriod ); Index: PressureCommon.h =================================================================== diff -u -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- PressureCommon.h (.../PressureCommon.h) (revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57) +++ PressureCommon.h (.../PressureCommon.h) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -23,8 +23,6 @@ #endif #ifdef _DD_ #include "DDCommon.h" -#endif -#ifdef _RO_ #include "FPCommon.h" #endif Index: SystemComm.c =================================================================== diff -u -r6145aa3d5ad75342f087f36b1fcd41af213f95f8 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- SystemComm.c (.../SystemComm.c) (revision 6145aa3d5ad75342f087f36b1fcd41af213f95f8) +++ SystemComm.c (.../SystemComm.c) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -32,9 +32,6 @@ #ifdef _DD_ #include "SystemCommDD.h" #include "OperationModes.h" -#endif -#ifdef _RO_ -#include "SystemCommFP.h" #include "FPOperationModes.h" #endif #include "Timers.h" @@ -253,9 +250,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox ) -#endif } } @@ -389,9 +383,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_CMMM_CAN_TRANSMIT_REJECTED, (U32)mBox ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_CMMM_CAN_TRANSMIT_REJECTED, (U32)mBox ) -#endif } } else @@ -402,9 +393,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_COMM_INVALID_FRAME_SIZE, ((U32)buffer << 16) | dataSize ) #endif -#ifdef _RO_ - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_COMM_INVALID_FRAME_SIZE, ((U32)buffer << 16) | dataSize ) -#endif } } @@ -497,10 +485,6 @@ checkInFromTD(); } #endif -#ifdef _RO_ - // TODO define RO related check in -#endif - } else if ( -1 == msgSize ) // Candidate message with bad CRC found? { @@ -727,11 +711,6 @@ // Remove message pending ACK from list if ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_TD_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_DD_2_TD ) ) #endif -#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_FP_2_DD ) ) ) -#endif { pendingAckList[ i ].used = FALSE; } @@ -791,12 +770,6 @@ SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_FP, (U32)msgID ); } #endif -#ifdef _RO_ - 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 ); - } -#endif pendingAckList[ i ].used = FALSE; // Take pending message off of list } } Index: SystemComm.h =================================================================== diff -u -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- SystemComm.h (.../SystemComm.h) (revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57) +++ SystemComm.h (.../SystemComm.h) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -23,8 +23,6 @@ #endif #ifdef _DD_ #include "DDCommon.h" -#endif -#ifdef _RO_ #include "FPCommon.h" #endif Index: TestSupport.c =================================================================== diff -u -rdb7f6c6bef6b14400abeed508ba3ffe31b0711a0 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- TestSupport.c (.../TestSupport.c) (revision db7f6c6bef6b14400abeed508ba3ffe31b0711a0) +++ TestSupport.c (.../TestSupport.c) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -604,9 +604,6 @@ #ifdef _TD_ msg.hdr.msgID = MSG_ID_TD_SEND_TEST_CONFIGURATION; #endif -#ifdef _RO_ - msg.hdr.msgID = MSG_ID_FP_SEND_TEST_CONFIGURATION; -#endif msg.hdr.payloadLen = MIN( sizeof( testConfig ), ( sizeof( BOOL ) * MAX_TEST_CONFIGS ) ); for ( config = TEST_CONFIG_FIRST; config < NUM_OF_TEST_CONFIGS; ++config ) @@ -630,9 +627,6 @@ #ifdef _TD_ result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_PC, ACK_NOT_REQUIRED ); #endif -#ifdef _RO_ - result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_PC, ACK_NOT_REQUIRED ); -#endif } return result; Index: TestSupport.h =================================================================== diff -u -r2c9349d6cc33c8bd1c94a843b20436afffd6b221 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- TestSupport.h (.../TestSupport.h) (revision 2c9349d6cc33c8bd1c94a843b20436afffd6b221) +++ TestSupport.h (.../TestSupport.h) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -67,16 +67,6 @@ } TEST_CONFIG_T; #endif -#ifdef _RO_ -/// FP test software configurations -typedef enum test_Config_enums -{ - TEST_CONFIG_BETA_HW = 0, ///< Test configuration using Beta HW - TEST_CONFIG_FIRST = TEST_CONFIG_BETA_HW, ///< Test configuration first configuration. - NUM_OF_TEST_CONFIGS = 1, ///< Number of test configuration. -} TEST_CONFIG_T; -#endif - #pragma pack(push,1) /// Test configuration payload Index: Utilities.h =================================================================== diff -u -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- Utilities.h (.../Utilities.h) (revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57) +++ Utilities.h (.../Utilities.h) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -23,8 +23,6 @@ #endif #ifdef _DD_ #include "DDCommon.h" -#endif -#ifdef _RO_ #include "FPCommon.h" #endif @@ -61,12 +59,8 @@ TIME_WINDOWED_COUNT_FPGA_COMM_FAILURES, ///< FPGA communication failure (NAK, CRC, timeout) TIME_WINDOWED_COUNT_FPGA_D12_PUMP_HALL_SENSOR_ERROR, ///< FPGA fresh dialysate pump hall sensor failure TIME_WINDOWED_COUNT_FPGA_D48_PUMP_HALL_SENSOR_ERROR, ///< FPGA spent dialysate pump hall sensor failure -#endif -#ifdef _RO_ TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR, ///< FPGA Conductivity sensor error TIME_WINDOWED_COUNT_FPGA_TEMPERATURE_SENSOR_ERROR, ///< FPGA Temperature sensor error - TIME_WINDOWED_COUNT_FPGA_COMM_FAILURES, ///< FPGA communication failure (NAK, CRC, timeout) - TIME_WINDOWED_COUNT_FPGA_DRAIN_PUMP_HALL_SENSOR_ERROR, ///< FPGA Drain pump hall sensor failure #endif NUM_OF_TIME_WINDOWED_COUNTS ///< Number of pressure sensors } TIME_WINDOWED_COUNT_T; Index: WatchdogMgmt.c =================================================================== diff -u -rcc8db062292cdcbdb29e4174af5976ccf150d0c0 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- WatchdogMgmt.c (.../WatchdogMgmt.c) (revision cc8db062292cdcbdb29e4174af5976ccf150d0c0) +++ WatchdogMgmt.c (.../WatchdogMgmt.c) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -24,13 +24,9 @@ #include "FpgaDD.h" #include "SafetyShutdown.h" #include "OperationModes.h" -#endif -#ifdef _RO_ -#include "FpgaFP.h" -#include "SafetyShutdown.h" #include "FPOperationModes.h" #endif -//#include "InternalADC.h" +#include "InternalADC.h" #include "Messaging.h" #include "Timers.h" #include "WatchdogMgmt.h" @@ -127,10 +123,6 @@ // TODO : clean up once we get the clarity PIN_SIGNAL_STATE_T safetyShutdownFeedbackSignal = PIN_SIGNAL_HIGH; #endif -#ifdef _RO_ -// TODO : clean up once we get the clarity - PIN_SIGNAL_STATE_T safetyShutdownFeedbackSignal = PIN_SIGNAL_HIGH; -#endif PIN_SIGNAL_STATE_T safetyShutdownSoftwareCmd = ( TRUE == isSafetyShutdownActivated() ? PIN_SIGNAL_LOW : PIN_SIGNAL_HIGH ); // Called by background task, so give bg task credit for checking in @@ -153,10 +145,6 @@ // 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() != DD_MODE_INIT ) ) #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() != FP_MODE_INIT ) ) -#endif { if ( ( PIN_SIGNAL_LOW == safetyShutdownFeedbackSignal ) || ( TRUE == didTimeout( safetyShutdownFeedbackMismatchTS, MAX_SAFETY_SHUTDOWN_MISMATCH_MS ) ) ) { @@ -166,9 +154,6 @@ #ifdef _DD_ activateAlarmNoData( ALARM_ID_DD_WATCHDOG_EXPIRED ); #endif -#ifdef _RO_ - //activateAlarmNoData( ALARM_ID_RO_WATCHDOG_EXPIRED ); -#endif } } else @@ -412,9 +397,6 @@ #ifdef _DD_ SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_WATCHDOG_INVALID_TASK, task ) #endif -#ifdef _RO_ - //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, TBD, task ) -#endif } return result; Index: WatchdogMgmt.h =================================================================== diff -u -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de --- WatchdogMgmt.h (.../WatchdogMgmt.h) (revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57) +++ WatchdogMgmt.h (.../WatchdogMgmt.h) (revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de) @@ -23,8 +23,6 @@ #endif #ifdef _DD_ #include "DDCommon.h" -#endif -#ifdef _RO_ #include "FPCommon.h" #endif #include "MessageSupport.h"