Index: firmware/App/Controllers/DialInFlow.c =================================================================== diff -u -r8466e63f95f65a3ffb18c3af85ac99328e41167b -re64816def7cd98e7dcb6d133b3a56c9fea835af3 --- firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 8466e63f95f65a3ffb18c3af85ac99328e41167b) +++ firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision e64816def7cd98e7dcb6d133b3a56c9fea835af3) @@ -63,8 +63,8 @@ #define DIP_SPEED_CALC_BUFFER_LEN ( 1000 / DIP_SPEED_CALC_INTERVAL / TASK_PRIORITY_INTERVAL ) #define DIP_HALL_EDGE_COUNTS_PER_REV 48 ///< Number of hall sensor edge counts per motor revolution. -#define DIP_MAX_FLOW_RATE 1320.0 ///< Maximum measured BP flow rate allowed. -#define DIP_MIN_FLOW_RATE -1320.0 ///< Minimum measured BP flow rate allowed. +#define DIP_MAX_FLOW_RATE 1320.0 ///< Maximum measured BP flow rate allowed. +#define DIP_MIN_FLOW_RATE -1320.0 ///< Minimum measured BP flow rate allowed. #define DIP_MAX_FLOW_VS_SPEED_DIFF_RPM 200.0 ///< Maximum difference between measured motor speed and speed implied by measured flow. #define DIP_MAX_MOTOR_SPEED_WHILE_OFF_RPM 100.0 ///< Maximum motor speed (RPM) while motor is commanded off. #define DIP_MAX_ROTOR_VS_MOTOR_DIFF_RPM 5.0 ///< Maximum difference in speed between motor and rotor (in rotor RPM). Index: firmware/App/Controllers/DialOutFlow.c =================================================================== diff -u -rcce9dc093c569089e29b52faffceb2701469a7cd -re64816def7cd98e7dcb6d133b3a56c9fea835af3 --- firmware/App/Controllers/DialOutFlow.c (.../DialOutFlow.c) (revision cce9dc093c569089e29b52faffceb2701469a7cd) +++ firmware/App/Controllers/DialOutFlow.c (.../DialOutFlow.c) (revision e64816def7cd98e7dcb6d133b3a56c9fea835af3) @@ -15,7 +15,7 @@ * ***************************************************************************/ -#include +#include // Using fabs() function #include "etpwm.h" #include "gio.h" Index: firmware/App/Controllers/PresOccl.h =================================================================== diff -u -rb87b0135945e60e11688b7f2002839023f30b588 -re64816def7cd98e7dcb6d133b3a56c9fea835af3 --- firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision b87b0135945e60e11688b7f2002839023f30b588) +++ firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision e64816def7cd98e7dcb6d133b3a56c9fea835af3) @@ -23,7 +23,8 @@ /** * @defgroup PressureOcclusion PressureOcclusion * @brief Pressure & Occlusion controller/monitor module. Monitors the - * blood line pressure sensors and pump occlusion sensors. + * venous line pressure sensor (Honeywell HSCMRNN030PDSA3), arterial line + * pressure sensor (Memscap 32022-100mm) and pump occlusion sensors (SMD DIA8308). * * @addtogroup PressureOcclusion * @{ Index: firmware/App/Modes/Dialysis.c =================================================================== diff -u -rb87b0135945e60e11688b7f2002839023f30b588 -re64816def7cd98e7dcb6d133b3a56c9fea835af3 --- firmware/App/Modes/Dialysis.c (.../Dialysis.c) (revision b87b0135945e60e11688b7f2002839023f30b588) +++ firmware/App/Modes/Dialysis.c (.../Dialysis.c) (revision e64816def7cd98e7dcb6d133b3a56c9fea835af3) @@ -15,6 +15,8 @@ * ***************************************************************************/ +#include // Using fabs() function + #include "AirTrap.h" #include "BloodFlow.h" #include "Buttons.h" Index: firmware/App/Modes/Rinseback.c =================================================================== diff -u -r8466e63f95f65a3ffb18c3af85ac99328e41167b -re64816def7cd98e7dcb6d133b3a56c9fea835af3 --- firmware/App/Modes/Rinseback.c (.../Rinseback.c) (revision 8466e63f95f65a3ffb18c3af85ac99328e41167b) +++ firmware/App/Modes/Rinseback.c (.../Rinseback.c) (revision e64816def7cd98e7dcb6d133b3a56c9fea835af3) @@ -1083,7 +1083,7 @@ /*********************************************************************//** * @brief * The testSetRinsebackSafetyVolumeOverride function overrides the calculated - * rinseback volume. + * rinseback safety volume. * @details Inputs: none * @details Outputs: rinsebackVolumeDelivered_Safety * @param vol override calculated rinseback safety volume (in mL) Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -r5aed859fcb5f3874fe5ca6dde0d2d99fe7d7c26e -re64816def7cd98e7dcb6d133b3a56c9fea835af3 --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 5aed859fcb5f3874fe5ca6dde0d2d99fe7d7c26e) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision e64816def7cd98e7dcb6d133b3a56c9fea835af3) @@ -80,18 +80,18 @@ /// Enumeration of alarm audio self-test states. typedef enum Alarm_Lamp_Self_Test_States { - ALARM_AUDIO_SELF_TEST_STATE_START = 0, ///< Start state of alarm lamp self-test. - ALARM_AUDIO_SELF_TEST_STATE_PRIMARY, ///< Red state of alarm lamp self-test. - ALARM_AUDIO_SELF_TEST_STATE_COMPLETE, ///< Completed state of alarm lamp self-test. - NUM_OF_ALARM_AUDIO_SELF_TEST_STATES ///< Number of states in alarm lamp self-test. + ALARM_AUDIO_SELF_TEST_STATE_START = 0, ///< Start state of alarm lamp self-test. + ALARM_AUDIO_SELF_TEST_STATE_PRIMARY, ///< Red state of alarm lamp self-test. + ALARM_AUDIO_SELF_TEST_STATE_COMPLETE, ///< Completed state of alarm lamp self-test. + NUM_OF_ALARM_AUDIO_SELF_TEST_STATES ///< Number of states in alarm lamp self-test. } ALARM_AUDIO_SELF_TEST_STATE_T; /// Enumeration of alarm audio volume factors. typedef enum Alarm_Audio_Volume_Factors { - ALARM_AUDIO_VOLUME_GAIN = 0, - ALARM_AUDIO_VOLUME_DIVIDER, - NUM_OF_ALARM_AUDIO_VOLUME_FACTORS + ALARM_AUDIO_VOLUME_GAIN = 0, ///< Gain setting for alarm audio volume. + ALARM_AUDIO_VOLUME_DIVIDER, ///< Divider setting for alarm audio volume. + NUM_OF_ALARM_AUDIO_VOLUME_FACTORS ///< Number of alarm audio volume factors. } ALARM_AUDIO_VOLUME_FACTOR_T; /// Lookup table to determine appropriate divider for a given alarm audio volume level. Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r8466e63f95f65a3ffb18c3af85ac99328e41167b -re64816def7cd98e7dcb6d133b3a56c9fea835af3 --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 8466e63f95f65a3ffb18c3af85ac99328e41167b) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision e64816def7cd98e7dcb6d133b3a56c9fea835af3) @@ -78,10 +78,6 @@ #define MAX_COMM_ERROR_RETRIES 5 ///< Maximum consecutive FPGA communication error retries. -/// Conversion factor converts FPGA temperature counts to degrees C. -#define FPGA_TEMP_CONVERSION_FACTOR ( 503.975 / (F32)BITS_12_FULL_SCALE ) -#define FPGA_TEMP_CONVERSION_OFFSET -273.15 ///< Conversion offset for FPGA temperature. - #define FPGA_INPUT_VOLTAGE_SCALE 3.0 ///< FPGA source and aux voltage. #define FPGA_PVN_VOLTAGE_SCALE 1.0 ///< FPGA pvn voltage. @@ -1126,13 +1122,11 @@ * The getFPGATemperature function gets the fpga internal die temperature. * @details Inputs: fpgaHeader * @details Outputs: none - * @return current internal FPGA die temperature (in deg C) + * @return current internal FPGA die temperature (in counts) *************************************************************************/ -F32 getFPGATemperature( void ) +U16 getFPGATemperature( void ) { - F32 result = (F32)fpgaSensorReadings.fpgaTemperature * FPGA_TEMP_CONVERSION_FACTOR + FPGA_TEMP_CONVERSION_OFFSET; - - return result; + return fpgaSensorReadings.fpgaTemperature; } /*********************************************************************//** Index: firmware/App/Services/FPGA.h =================================================================== diff -u -r8466e63f95f65a3ffb18c3af85ac99328e41167b -re64816def7cd98e7dcb6d133b3a56c9fea835af3 --- firmware/App/Services/FPGA.h (.../FPGA.h) (revision 8466e63f95f65a3ffb18c3af85ac99328e41167b) +++ firmware/App/Services/FPGA.h (.../FPGA.h) (revision e64816def7cd98e7dcb6d133b3a56c9fea835af3) @@ -51,7 +51,7 @@ void signalFPGATransmitCompleted( void ); void getFPGAVersions( U08 *Id, U08 *Maj, U08 *Min, U08 *Lab ); -F32 getFPGATemperature( void ); +U16 getFPGATemperature( void ); F32 getFPGAVcc( void ); F32 getFPGAVccAux( void ); F32 getFPGAVpvn( void );