Index: AlarmMgmt.h =================================================================== diff -u -r8e3c1aa26d6668749668255dbc337910b30423ae -re8ab746b2c16710ba012665b29d44c755a7dab3e --- AlarmMgmt.h (.../AlarmMgmt.h) (revision 8e3c1aa26d6668749668255dbc337910b30423ae) +++ AlarmMgmt.h (.../AlarmMgmt.h) (revision e8ab746b2c16710ba012665b29d44c755a7dab3e) @@ -32,7 +32,7 @@ /** * @defgroup AlarmManagement AlarmManagement - * @brief Alarm Management service module. Provides general alarm management + * @brief Alarm Management service unit. Provides general alarm management * functionality including support functions for triggering and clearing * specific alarms. * Index: Common.h =================================================================== diff -u -r8b18c3e875bd5d265399b603b8ea0a4c3ce8fcbe -re8ab746b2c16710ba012665b29d44c755a7dab3e --- Common.h (.../Common.h) (revision 8b18c3e875bd5d265399b603b8ea0a4c3ce8fcbe) +++ Common.h (.../Common.h) (revision e8ab746b2c16710ba012665b29d44c755a7dab3e) @@ -314,7 +314,7 @@ #define _enable_FIQ() #endif -//// include alarm mgmt header so any module can trigger an alarm +//// include alarm mgmt header so any unit can trigger an alarm #include "AlarmMgmt.h" #ifdef _TD_ #include "AlarmMgmtTD.h" Index: FPGA.c =================================================================== diff -u -r9512aac6feeb1379d6d425361fa78d58f75c86f6 -re8ab746b2c16710ba012665b29d44c755a7dab3e --- FPGA.c (.../FPGA.c) (revision 9512aac6feeb1379d6d425361fa78d58f75c86f6) +++ FPGA.c (.../FPGA.c) (revision e8ab746b2c16710ba012665b29d44c755a7dab3e) @@ -83,42 +83,15 @@ #define SCI2_RECEIVE_DMA_REQUEST 28 ///< Serial port 2 receive DMA request line. #define SCI2_TRANSMIT_DMA_REQUEST 29 ///< Serial port 2 transmit DMA request line. -#define FPGA_INPUT_VOLTAGE_SCALE 3.0F ///< FPGA source and aux voltage. -#define FPGA_PVN_VOLTAGE_SCALE 1.0F ///< FPGA pvn voltage. - #define FPGA_ADC1_AUTO_READ_ENABLE 0x01 ///< Auto-read enable bit for ADC1 control register. -#define FPGA_AIRTRAP_LEVEL_LOW_MASK 0x0008 ///< Bit mask for air trap lower level sensor. -#define FPGA_AIRTRAP_LEVEL_HIGH_MASK 0x0004 ///< Bit mask for air trap upper level sensor. - -#define FPGA_FLUID_LEAK_STATE_MASK 0x0040 ///< Bit mask for fluid leak detector. - #define FPGA_BLOOD_LEAK_STATUS_MASK 0x1000 ///< Bit mask for blood leak detector. #define FPGA_BLOOD_LEAK_ST_BIT_INDEX 12 ///< Bit index for the blood leak self test status bit. #define FPGA_BLOOD_LEAK_ZERO_STATE_MASK 0x2000 ///< Bit mask for blood leak detector zero. #define FPAG_BLOOD_LEAK_ZERO_BIT_INDEX 13 ///< Bit index for the blood leak zero status bit. #define FPGA_BLOOD_LEAK_ZERO_CMD 0x02 ///< Bit for blood leak detector zero command. #define FPGA_BLOOD_LEAK_SELF_TEST_CMD 0x01 ///< Bit for blood leak detector self test command. -#define FPGA_ADA_BUBBLE_STATUS_MASK 0x0001 ///< Bit mask for arterial air bubble detector input status. -#define FPGA_ADV_BUBBLE_STATUS_MASK 0x0002 ///< Bit mask for venous air bubble detector input status. -#define FPGA_ADA_BUBBLE_SELF_TEST_CMD 0x04 ///< Bit for arterial air bubble detector self-test command. -#define FPGA_ADV_BUBBLE_SELF_TEST_CMD 0x08 ///< Bit for venous air bubble detector self-test command. - -#define FPGA_PBO_TEMP_DIVISOR 2047.0F ///< Used in conversion of PBo temperature reading to deg C. -#define FPGA_PBO_TEMP_GAIN 200.0F ///< Used in conversion of PBo temperature reading to deg C. -#define FPGA_PBO_TEMP_OFFSET 50.0F ///< Used in conversion of PBo temperature reading to deg C. - -#define FPGA_ALARM_AUDIO_VOLUME_SHIFT 3 ///< Shift alarm audio volume 3 bits to left before writing to register. -#define FPGA_ALARM_AUDIO_DIVIDE_SHIFT 6 ///< Shift alarm audio volume divider 6 bits to left before writing to register. - -#define FPGA_BACKUP_ALARM_AUDIO_CONVERT 0.4F ///< Converts backup (piezo) alarm audio ADC volts to amps. - -#define FRONT_DOOR_SWITCH_MASK 0x0010 ///< Front door switch bit mask. Bit 4 of the GPIO register. -#define PUMP_TRACK_SWITCH_MASK 0x0020 ///< Pump track switch bit mask. Bit 5 of the GPIO register. - -#define FPGA_VALVES_MIN_PWM_MODE_COUNT 2500 ///< FPGA valves minimum PWM in PWM mode in counts. - // ********** private data ********** // FPGA state Index: FPGA.h =================================================================== diff -u -r9512aac6feeb1379d6d425361fa78d58f75c86f6 -re8ab746b2c16710ba012665b29d44c755a7dab3e --- FPGA.h (.../FPGA.h) (revision 9512aac6feeb1379d6d425361fa78d58f75c86f6) +++ FPGA.h (.../FPGA.h) (revision e8ab746b2c16710ba012665b29d44c755a7dab3e) @@ -33,9 +33,9 @@ /** * @defgroup FPGA FPGA - * @brief FPGA service module. - * The FPGA module manages communication between the HD and the FPGA via UART. - * This module is driven by the Priority Task via calls to two FPGA executive functions: + * @brief FPGA service unit. + * The FPGA unit manages communication between the HD and the FPGA via UART. + * This unit is driven by the Priority Task via calls to two FPGA executive functions: * 1) an incoming executive manages the states of the state machine that deal with responses and data received from the FPGA * 2) an outgoing executive manages transmission of write and read commands to the FPGA. * This unit first reads the header record that includes the FPGA ID and revision and Index: SystemComm.h =================================================================== diff -u -r5fb988facecb08dceb2bba1c462d3097b53617f0 -re8ab746b2c16710ba012665b29d44c755a7dab3e --- SystemComm.h (.../SystemComm.h) (revision 5fb988facecb08dceb2bba1c462d3097b53617f0) +++ SystemComm.h (.../SystemComm.h) (revision e8ab746b2c16710ba012665b29d44c755a7dab3e) @@ -33,7 +33,7 @@ /** * @defgroup SystemComm SystemComm - * @brief System communication module. Manages incoming and outgoing CAN frames. + * @brief System communication unit. Manages incoming and outgoing CAN frames. * * @addtogroup SystemComm * @{ Index: Timers.h =================================================================== diff -u -r6d80d69a210f45c733e5307859351f2cd820a8e7 -re8ab746b2c16710ba012665b29d44c755a7dab3e --- Timers.h (.../Timers.h) (revision 6d80d69a210f45c733e5307859351f2cd820a8e7) +++ Timers.h (.../Timers.h) (revision e8ab746b2c16710ba012665b29d44c755a7dab3e) @@ -22,7 +22,7 @@ /** * @defgroup Timers Timers - * @brief Timers service module. Provides timer utility functions based on + * @brief Timers service unit. Provides timer utility functions based on * a 1ms timer counter incremented by TaskTimer.c. * * @addtogroup Timers Index: Utilities.h =================================================================== diff -u -r5fb988facecb08dceb2bba1c462d3097b53617f0 -re8ab746b2c16710ba012665b29d44c755a7dab3e --- Utilities.h (.../Utilities.h) (revision 5fb988facecb08dceb2bba1c462d3097b53617f0) +++ Utilities.h (.../Utilities.h) (revision e8ab746b2c16710ba012665b29d44c755a7dab3e) @@ -30,7 +30,7 @@ /** * @defgroup Utilities Utilities - * @brief Utilities module contains various utility functions. + * @brief Utilities unit contains various utility functions. * * @addtogroup Utilities * @{ Index: WatchdogMgmt.c =================================================================== diff -u -r03109dcf4d83b5d1bddbee79153a9b7bb7f028f2 -re8ab746b2c16710ba012665b29d44c755a7dab3e --- WatchdogMgmt.c (.../WatchdogMgmt.c) (revision 03109dcf4d83b5d1bddbee79153a9b7bb7f028f2) +++ WatchdogMgmt.c (.../WatchdogMgmt.c) (revision e8ab746b2c16710ba012665b29d44c755a7dab3e) @@ -116,7 +116,7 @@ { BOOL allTasksCheckedIn; #ifdef _TD_ - PIN_SIGNAL_STATE_T safetyShutdownFeedbackSignal = getCPLDWatchdogExpired(); + PIN_SIGNAL_STATE_T safetyShutdownFeedbackSignal = getCPLDSafety(); #endif #ifdef _DD_ // TODO : clean up once we get the clarity @@ -220,7 +220,7 @@ // Waiting here for w.d. test period to prevent this task from checking in - watchdog should expire } #ifdef _TD_ -// if ( PIN_SIGNAL_LOW == getCPLDWatchdogExpired() ) +// if ( PIN_SIGNAL_LOW == getCPLDSafety() ) #else // if ( TBD ) #endif @@ -259,7 +259,7 @@ if ( TRUE == didTimeout( watchdogSelfTestTimerCount, WATCHDOG_RECOVERY_TIME_MS ) ) { // Verify watchdog expired signal no longer active #ifdef _TD_ -// if ( PIN_SIGNAL_HIGH == getCPLDWatchdogExpired() ) +// if ( PIN_SIGNAL_HIGH == getCPLDSafety() ) #else // if ( TBD ) #endif Index: WatchdogMgmt.h =================================================================== diff -u -r3402723ffaf9fb1256d51fd23f4273ad7c087836 -re8ab746b2c16710ba012665b29d44c755a7dab3e --- WatchdogMgmt.h (.../WatchdogMgmt.h) (revision 3402723ffaf9fb1256d51fd23f4273ad7c087836) +++ WatchdogMgmt.h (.../WatchdogMgmt.h) (revision e8ab746b2c16710ba012665b29d44c755a7dab3e) @@ -30,7 +30,7 @@ /** * @defgroup WatchdogMgmt WatchdogMgmt - * @brief The watchdog management module provides functions for checking in + * @brief The watchdog management unit provides functions for checking in * with and petting the watchdog. * * @addtogroup WatchdogMgmt