Index: firmware/App/Services/AlarmMgmtTD.c =================================================================== diff -u -r37d4284f56e175716ea13ae56c621110fa96e53c -r512065f0a0c9ba2c335e8856b790e8448852fc52 --- firmware/App/Services/AlarmMgmtTD.c (.../AlarmMgmtTD.c) (revision 37d4284f56e175716ea13ae56c621110fa96e53c) +++ firmware/App/Services/AlarmMgmtTD.c (.../AlarmMgmtTD.c) (revision 512065f0a0c9ba2c335e8856b790e8448852fc52) @@ -419,8 +419,8 @@ * @brief * The signalAlarmSilence function executes an alarm silence request from * the user. - * @details \b Inputs: alarmStatus.alarmsSilenced - * @details \b Outputs: alarmStatus.alarmsSilenced + * @details \b Inputs: alarmStatus + * @details \b Outputs: alarmStatus * @param cmd ID of alarm silence request type (1=silence, 0=cancel silence) * @return none *************************************************************************/ Index: firmware/App/Services/DDInterface.c =================================================================== diff -u -r380b0afc95467d0861ff3aa2cdcde5d5d7ac85e7 -r512065f0a0c9ba2c335e8856b790e8448852fc52 --- firmware/App/Services/DDInterface.c (.../DDInterface.c) (revision 380b0afc95467d0861ff3aa2cdcde5d5d7ac85e7) +++ firmware/App/Services/DDInterface.c (.../DDInterface.c) (revision 512065f0a0c9ba2c335e8856b790e8448852fc52) @@ -38,8 +38,8 @@ // DG status static DD_OP_MODE_T ddCurrentOpMode; ///< Current DD operation mode. -static U32 ddSubMode; ///< Current state (sub-mode) of current DG operation mode. -static BOOL ddStartCommandSent; ///< Flag indicates command to start DG has been sent. +static U32 ddSubMode; ///< Current state (sub-mode) of current DD operation mode. +static BOOL ddStartCommandSent; ///< Flag indicates command to start DD has been sent. static BOOL ddStarted; ///< Flag indicates whether we have commanded the DD to start or stop. static BOOL ddOpModeDataFreshFlag = FALSE; ///< Flag to signal the handleDDOpMode() to process fresh dd op mode data Index: firmware/App/Services/FpgaTD.c =================================================================== diff -u -r5c0b7c734daaa5a3ee29d4948a8dcc17195572f9 -r512065f0a0c9ba2c335e8856b790e8448852fc52 --- firmware/App/Services/FpgaTD.c (.../FpgaTD.c) (revision 5c0b7c734daaa5a3ee29d4948a8dcc17195572f9) +++ firmware/App/Services/FpgaTD.c (.../FpgaTD.c) (revision 512065f0a0c9ba2c335e8856b790e8448852fc52) @@ -37,16 +37,14 @@ // ********** private definitions ********** -#define FPGA_EXPECTED_ID 0x5A ///< Expected ID for HD FPGA. +#define FPGA_EXPECTED_ID 0x03 ///< Expected ID for TD FPGA. #define PROCESSOR_FPGA_CLOCK_DIFF_TOLERANCE 1 ///< Tolerance for processor clock speed check against FPGA clock. #define MAX_FPGA_COMM_FAILURES_WINDOW_MS ( 1 * SEC_PER_MIN * MS_PER_SECOND ) ///< FPGA comm failures window #define MAX_FPGA_COMM_FAILURES 3 ///< FPGA maximum comm failures per MAX_FPGA_COMM_FAILURES_WINDOW_MS #define MIN_POWER_ON_TIME_FOR_COMM_FAILS ( 1 * MS_PER_SECOND ) ///< Allow FPGA comm errors for first second after power-up -#define FPGA_FLUID_LEAK_STATE_MASK 0x0040 ///< Bit mask for fluid leak detector. - #define FPGA_PINCH_VALVES_STOPPED 0x00 ///< FPGA pinch valve control register setting to stop valve motors. #define FPGA_VBV_CLOSED_LOOP 0x01 ///< Bit mask for running VBV motor in closed loop mode. #define FPGA_VBA_CLOSED_LOOP 0x02 ///< Bit mask for running VBA motor in closed loop mode. @@ -139,9 +137,11 @@ /// Record structure for FPGA continuous priority writes. typedef struct { - U16 fpgaGenWrRd; ///< Reg 04. FPGA general read-back register (mirrored to a general read register in read page at addr 256). + U16 fpgaGenWrRd; ///< Reg 04. FPGA general write/read-back register (mirrored to a general read register in read page at addr 256). U08 VBTControl; ///< Reg 06. VBT valve control register. + U08 reserved1; ///< Reg 07. Reserved. U08 VBTPWMEnable; ///< Reg 08. VBT valve PWM enable register. + U08 reserved2; ///< Reg 09. Reserved. U16 VBTPWMLowPeriod; ///< Reg 10. VBT PWM low signal period register. U16 VBTPWMPeriod; ///< Reg 12. VBT PWM period register. U16 VBTPWMPUllInTime; ///< Reg 14. VBT PWM pull in time register. @@ -157,9 +157,9 @@ U16 VBVStepSpeed; ///< Reg 30. VBV step speed set register. U16 VBAStepSpeed; ///< Reg 32. VBA step speed set register. U08 alarmControl; ///< Reg 34. Alarm audio register. - U08 reserved1; ///< Reg 35. Reserved. - U32 reserved2; ///< Reg 36. Reserved. - U32 reserved3; ///< Reg 40. Reserved. + U08 reserved3; ///< Reg 35. Reserved. + U32 reserved4; ///< Reg 36. Reserved. + U32 reserved5; ///< Reg 40. Reserved. U08 sensorTest; ///< Reg 44. Sensor self-test control register. } FPGA_ACTUATORS_T; @@ -493,7 +493,7 @@ /*********************************************************************//** * @brief - * The getFPGAVenousPressure function gets the latest venous pressure reading. + * The getPBOPressure function gets the latest venous pressure reading. * The high 2 bits are status bits: 00=ok, 01=cmd mode, 10=stale data, 11=diag * The low 14 bits are data. Zero is at 1638. Values above are positive, * below are negative. @@ -508,7 +508,7 @@ /*********************************************************************//** * @brief - * The getFPGAVenousPressureTemperature function gets the latest venous pressure + * The getPBOTemperature function gets the latest venous pressure * sensor temperature reading. * @details \b Inputs: fpgaSensorReadings * @details \b Outputs: none @@ -521,7 +521,7 @@ /*********************************************************************//** * @brief - * The getFPGAVenousPressureReadCounter function gets the latest venous pressure + * The getPBOReadCounter function gets the latest venous pressure * sensor read counter. * @details \b Inputs: fpgaSensorReadings * @details \b Outputs: none @@ -534,7 +534,7 @@ /*********************************************************************//** * @brief - * The getFPGAVenousPressureErrorCounter function gets the latest venous pressure + * The getPBOErrorCounter function gets the latest venous pressure * sensor error counter. * @details \b Inputs: fpgaSensorReadings * @details \b Outputs: none @@ -594,21 +594,6 @@ /*********************************************************************//** * @brief - * The noFPGAFluidLeakDetected function returns TRUE if no fluid leak has been - * detected (dry) and FALSE if a fluid leak has been detected (wet). - * @details \b Inputs: fpgaSensorReadings - * @details \b Outputs: none - * @return Latest fluid leak detected status - *************************************************************************/ -BOOL noFPGAFluidLeakDetected( void ) -{ - U16 noFPGAFluidLeakDetected = fpgaSensorReadings.GPIOReg & FPGA_FLUID_LEAK_STATE_MASK; - - return ( 0 == noFPGAFluidLeakDetected ? FALSE : TRUE ); -} - -/*********************************************************************//** - * @brief * The ADVBubbleDetected function determines whether ADV bubble detector * sensor is currently detecting a bubble. * @details \b Inputs: fpgaSensorReadings Index: firmware/App/Services/FpgaTD.h =================================================================== diff -u -r61456322255a686365146e88f79ffc61d00edb6c -r512065f0a0c9ba2c335e8856b790e8448852fc52 --- firmware/App/Services/FpgaTD.h (.../FpgaTD.h) (revision 61456322255a686365146e88f79ffc61d00edb6c) +++ firmware/App/Services/FpgaTD.h (.../FpgaTD.h) (revision 512065f0a0c9ba2c335e8856b790e8448852fc52) @@ -69,8 +69,6 @@ void setFPGAValvesControlMode( U16 bits ); -BOOL noFPGAFluidLeakDetected( void ); - BOOL ADVBubbleDetected( void ); void setFPGAVenousBubbleSelfTest( void ); void clearFPGAVenousBubbleSelfTest( void ); Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r37d4284f56e175716ea13ae56c621110fa96e53c -r512065f0a0c9ba2c335e8856b790e8448852fc52 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 37d4284f56e175716ea13ae56c621110fa96e53c) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision 512065f0a0c9ba2c335e8856b790e8448852fc52) @@ -104,7 +104,7 @@ * A sync byte is inserted at the beginning and an 8-bit CRC is appended to * the end. The serialized message data is queued for transmission in the given * buffer. - * @details Alarm: ALARM_ID_TD_SOFTWARE_FAULT on failure to add a message to the + * @details \b Alarm: ALARM_ID_TD_SOFTWARE_FAULT on failure to add a message to the * pending ACK list (list is full). * @details \b Inputs: blockedMessagesForXmit * @details \b Outputs: given buffer is populated with serialized message data and Index: firmware/App/Services/SystemCommTD.c =================================================================== diff -u -r380b0afc95467d0861ff3aa2cdcde5d5d7ac85e7 -r512065f0a0c9ba2c335e8856b790e8448852fc52 --- firmware/App/Services/SystemCommTD.c (.../SystemCommTD.c) (revision 380b0afc95467d0861ff3aa2cdcde5d5d7ac85e7) +++ firmware/App/Services/SystemCommTD.c (.../SystemCommTD.c) (revision 512065f0a0c9ba2c335e8856b790e8448852fc52) @@ -104,13 +104,13 @@ /*********************************************************************//** * @brief - * The checkInFromDG function checks in the DD with the TD - indicating that + * The checkInFromDD function checks in the DD with the TD - indicating that * the DD is communicating. * @details \b Inputs: none * @details \b Outputs: ddIsCommunicating, timeOfLastDDCheckIn * @return none *************************************************************************/ -void checkInFromDG( void ) +void checkInFromDD( void ) { ddIsCommunicating = TRUE; timeOfLastDDCheckIn = getMSTimerCount(); Index: firmware/App/Services/SystemCommTD.h =================================================================== diff -u -r380b0afc95467d0861ff3aa2cdcde5d5d7ac85e7 -r512065f0a0c9ba2c335e8856b790e8448852fc52 --- firmware/App/Services/SystemCommTD.h (.../SystemCommTD.h) (revision 380b0afc95467d0861ff3aa2cdcde5d5d7ac85e7) +++ firmware/App/Services/SystemCommTD.h (.../SystemCommTD.h) (revision 512065f0a0c9ba2c335e8856b790e8448852fc52) @@ -49,7 +49,7 @@ void checkForCommTimeouts( void ); void checkTooManyBadMsgCRCs( void ); -void checkInFromDG( void ); +void checkInFromDD( void ); void checkInFromUI( void ); BOOL isDDCommunicating( void );