Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -ra570e1827563618b8d26082eb63994f9f65adc17 -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision a570e1827563618b8d26082eb63994f9f65adc17) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -64,7 +64,7 @@ /*********************************************************************//** * @brief - * The initValves function initializes the Valves module. + * The initValves function initializes the Valves unit. * @details \b Inputs: none * @details \b Outputs: valveStates, pendingValveStateChanges, valveSensedStates, * pendingValveStateChangeCountDowns, valveStateMismatchCounter, Index: firmware/App/Controllers/Valves.h =================================================================== diff -u -ra570e1827563618b8d26082eb63994f9f65adc17 -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Controllers/Valves.h (.../Valves.h) (revision a570e1827563618b8d26082eb63994f9f65adc17) +++ firmware/App/Controllers/Valves.h (.../Valves.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -22,7 +22,7 @@ /** * @defgroup Valves Valves - * @brief Valves driver module. Controls all hydraulics valves, balancing chamber and + * @brief Valves driver unit. Controls all hydraulics valves, balancing chamber and * ultrafiltration valves through FPGA Interface. * * @addtogroup Valves Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -r5d682ef4b973ca85e67ac00cc2610e2f6c378b0c -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 5d682ef4b973ca85e67ac00cc2610e2f6c378b0c) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -101,9 +101,9 @@ /*********************************************************************//** * @brief - * The initInternalADC function initializes the InternalADC module. + * The initInternalADC function initializes the InternalADC unit. * @details \b Inputs: none - * @details \b Outputs: InternalADC module is initialized. + * @details \b Outputs: InternalADC unit is initialized. * @return none *************************************************************************/ void initInternalADC( void ) Index: firmware/App/Drivers/InternalADC.h =================================================================== diff -u -r5d682ef4b973ca85e67ac00cc2610e2f6c378b0c -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Drivers/InternalADC.h (.../InternalADC.h) (revision 5d682ef4b973ca85e67ac00cc2610e2f6c378b0c) +++ firmware/App/Drivers/InternalADC.h (.../InternalADC.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -22,7 +22,7 @@ /** * @defgroup InternalADC InternalADC - * @brief DD internal ADC module. This module converts all analog channel (DD + * @brief DD internal ADC unit. This unit converts all analog channel (DD * different voltage rails, pressure, temperature) into digital value for further * processing ( monitoring and controls). * Index: firmware/App/Drivers/PAL.h =================================================================== diff -u -r5d682ef4b973ca85e67ac00cc2610e2f6c378b0c -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Drivers/PAL.h (.../PAL.h) (revision 5d682ef4b973ca85e67ac00cc2610e2f6c378b0c) +++ firmware/App/Drivers/PAL.h (.../PAL.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -22,7 +22,7 @@ /** * @defgroup PAL PAL - * @brief The PAL (processor abstraction layer) module provides abstraction + * @brief The PAL (processor abstraction layer) unit provides abstraction * of processor register access via access functions. * * @addtogroup PAL Index: firmware/App/Drivers/SafetyShutdown.c =================================================================== diff -u -rf6b89ff07c594756de79c090cac2e74c7e7e5173 -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Drivers/SafetyShutdown.c (.../SafetyShutdown.c) (revision f6b89ff07c594756de79c090cac2e74c7e7e5173) +++ firmware/App/Drivers/SafetyShutdown.c (.../SafetyShutdown.c) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -57,8 +57,8 @@ /*********************************************************************//** * @brief - * The initSafetyShutdown function initializes the safety shutdown module. - * The safety shutdown module is to cut down the 24v DC supply to majority of actuators + * The initSafetyShutdown function initializes the safety shutdown unit. + * The safety shutdown unit is to cut down the 24v DC supply to majority of actuators * when system detects critical faulty conditions. * @details \b Inputs: none * @details \b Outputs: safetyShutdownActivated, safetyShutdownOverrideResetState, Index: firmware/App/Drivers/SafetyShutdown.h =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Drivers/SafetyShutdown.h (.../SafetyShutdown.h) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Drivers/SafetyShutdown.h (.../SafetyShutdown.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -22,7 +22,7 @@ /** * @defgroup SafetyShutdown SafetyShutdown - * @brief Safety Shutdown module. Allows any module to activate the safety shutdown signal. + * @brief Safety Shutdown unit. Allows any unit to activate the safety shutdown signal. * * @addtogroup SafetyShutdown * @{ Index: firmware/App/Modes/ModeFault.c =================================================================== diff -u -r051e0c243c0e6faa7a53287b16252d93044d87e0 -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision 051e0c243c0e6faa7a53287b16252d93044d87e0) +++ firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -42,9 +42,9 @@ /*********************************************************************//** * @brief - * The initFaultMode function initializes the Fault Mode module. + * The initFaultMode function initializes the Fault Mode unit. * @details \b Inputs : none - * @details \b Outputs: Fault mode module initialized + * @details \b Outputs: Fault mode unit initialized * @return none *************************************************************************/ void initFaultMode( void ) Index: firmware/App/Modes/ModeFault.h =================================================================== diff -u -r051e0c243c0e6faa7a53287b16252d93044d87e0 -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Modes/ModeFault.h (.../ModeFault.h) (revision 051e0c243c0e6faa7a53287b16252d93044d87e0) +++ firmware/App/Modes/ModeFault.h (.../ModeFault.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -33,7 +33,7 @@ // ********** public function prototypes ********** -void initFaultMode( void ); // initialize this module +void initFaultMode( void ); // initialize this unit U32 transitionToFaultMode( void ); // prepares for transition to fault mode U32 execFaultMode( void ); // execute the fault mode state machine (call from OperationModes) Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -r775b51d1fdbee9a270714c4c625e632ee7ace2e8 -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 775b51d1fdbee9a270714c4c625e632ee7ace2e8) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -59,7 +59,7 @@ /*********************************************************************//** * @brief * The initInitAndPOSTMode function initializes the Initialization and POST - * mode module. + * mode unit. * @details \b Inputs: none * @details \b Outputs: unit variables are initialized. * @return none Index: firmware/App/Modes/ModeInitPOST.h =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Modes/ModeInitPOST.h (.../ModeInitPOST.h) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Modes/ModeInitPOST.h (.../ModeInitPOST.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -23,7 +23,7 @@ /** * @defgroup DDInitAndPOSTMode DDInitAndPOSTMode - * @brief Initialization and POST mode module. Manages initialization and POST mode functions via a state machine. + * @brief Initialization and POST mode unit. Manages initialization and POST mode functions via a state machine. * * @addtogroup DDInitAndPOSTMode * @{ @@ -33,7 +33,7 @@ // ********** public function prototypes ********** -void initInitAndPOSTMode( void ); // initialize this module +void initInitAndPOSTMode( void ); // initialize this unit U32 transitionToInitAndPOSTMode( void ); // prepares for transition to init. & POST mode U32 execInitAndPOSTMode( void ); // execute the init. & POST mode state machine (call from OperationModes) Index: firmware/App/Modes/ModeService.c =================================================================== diff -u -r051e0c243c0e6faa7a53287b16252d93044d87e0 -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Modes/ModeService.c (.../ModeService.c) (revision 051e0c243c0e6faa7a53287b16252d93044d87e0) +++ firmware/App/Modes/ModeService.c (.../ModeService.c) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -35,9 +35,9 @@ /*********************************************************************//** * @brief - * The initServiceMode function initializes the service mode module. + * The initServiceMode function initializes the service mode unit. * @details \b Inputs: none - * @details \b Outputs: Service mode module initialized + * @details \b Outputs: Service mode unit initialized * @return none *************************************************************************/ void initServiceMode( void ) Index: firmware/App/Modes/ModeService.h =================================================================== diff -u -r051e0c243c0e6faa7a53287b16252d93044d87e0 -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Modes/ModeService.h (.../ModeService.h) (revision 051e0c243c0e6faa7a53287b16252d93044d87e0) +++ firmware/App/Modes/ModeService.h (.../ModeService.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -23,7 +23,7 @@ /** * @defgroup DDServiceMode DDServiceMode - * @brief Service mode module. Manages service mode functions via a state machine. + * @brief Service mode unit. Manages service mode functions via a state machine. * * @addtogroup DDServiceMode * @{ @@ -33,7 +33,7 @@ // ********** public function prototypes ********** -void initServiceMode( void ); // initialize this module +void initServiceMode( void ); // initialize this unit U32 transitionToServiceMode( void ); // prepares for transition to service mode U32 execServiceMode( void ); // execute the service mode state machine (call from OperationModes) Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r051e0c243c0e6faa7a53287b16252d93044d87e0 -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 051e0c243c0e6faa7a53287b16252d93044d87e0) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -76,7 +76,7 @@ /*********************************************************************//** * @brief - * The initStandbyMode function initializes the standby mode module. + * The initStandbyMode function initializes the standby mode unit. * @details \b Inputs: none * @details \b Outputs:unit variables initialized. * @return none Index: firmware/App/Modes/ModeStandby.h =================================================================== diff -u -r051e0c243c0e6faa7a53287b16252d93044d87e0 -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Modes/ModeStandby.h (.../ModeStandby.h) (revision 051e0c243c0e6faa7a53287b16252d93044d87e0) +++ firmware/App/Modes/ModeStandby.h (.../ModeStandby.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -23,7 +23,7 @@ /** * @defgroup DDStandbyMode DDStandbyMode - * @brief Standby mode module. Manages standby mode functions via a state machine. + * @brief Standby mode unit. Manages standby mode functions via a state machine. * * @addtogroup DDStandbyMode * @{ @@ -40,7 +40,7 @@ // ********** public function prototypes ********** -void initStandbyMode( void ); // initialize this module +void initStandbyMode( void ); // initialize this unit U32 transitionToStandbyMode( void ); // prepares for transition to standby mode U32 execStandbyMode( void ); // execute the standby mode state machine (call from OperationModes) Index: firmware/App/Modes/OperationModes.c =================================================================== diff -u -r775b51d1fdbee9a270714c4c625e632ee7ace2e8 -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision 775b51d1fdbee9a270714c4c625e632ee7ace2e8) +++ firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -73,7 +73,7 @@ /*********************************************************************//** * @brief - * The initOperationModes function initializes the operation modes module. + * The initOperationModes function initializes the operation modes unit. * @details \b Inputs: none * @details \b Outputs: unit vairables initialized. * @return none Index: firmware/App/Modes/OperationModes.h =================================================================== diff -u -r775b51d1fdbee9a270714c4c625e632ee7ace2e8 -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision 775b51d1fdbee9a270714c4c625e632ee7ace2e8) +++ firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -23,7 +23,7 @@ #include "TDDefs.h" /** * @defgroup DDOperationModes DDOperationModes - * @brief Operation Modes module. Manages the top level operation modes of the DD via a state machine. + * @brief Operation Modes unit. Manages the top level operation modes of the DD via a state machine. * * @addtogroup DDOperationModes * @{ @@ -49,7 +49,7 @@ // ********** public function prototypes ********** -void initOperationModes( void ); // initialize this module +void initOperationModes( void ); // initialize this unit void execOperationModes( void ); // execute the operation modes state machine (scheduled periodic call) void requestNewOperationMode( DD_OP_MODE_T newMode ); // request a transition to a new operation mode DD_OP_MODE_T getCurrentOperationMode( void ); // get the current operation mode Index: firmware/App/Services/AlarmMgmtDD.c =================================================================== diff -u -r262381341fba476bb71f5cf0d67ac2fe17dee9c6 -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Services/AlarmMgmtDD.c (.../AlarmMgmtDD.c) (revision 262381341fba476bb71f5cf0d67ac2fe17dee9c6) +++ firmware/App/Services/AlarmMgmtDD.c (.../AlarmMgmtDD.c) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -55,7 +55,7 @@ /*********************************************************************//** * @brief - * The initAlarmMgmtDD function initializes the AlarmMgmt module. + * The initAlarmMgmtDD function initializes the AlarmMgmt unit. * @details \b Inputs: none * @details \b Outputs: unit variables initialized. * @return none Index: firmware/App/Services/AlarmMgmtDD.h =================================================================== diff -u -r262381341fba476bb71f5cf0d67ac2fe17dee9c6 -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Services/AlarmMgmtDD.h (.../AlarmMgmtDD.h) (revision 262381341fba476bb71f5cf0d67ac2fe17dee9c6) +++ firmware/App/Services/AlarmMgmtDD.h (.../AlarmMgmtDD.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -21,7 +21,7 @@ /** * @defgroup AlarmManagement AlarmManagement - * @brief Alarm management service module. Provides general alarm management functionality + * @brief Alarm management service unit. Provides general alarm management functionality * including support functions for triggering and clearing specific alarms. * * @addtogroup AlarmManagement Index: firmware/App/Services/CommBuffers.c =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Services/CommBuffers.c (.../CommBuffers.c) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Services/CommBuffers.c (.../CommBuffers.c) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -46,9 +46,9 @@ /*********************************************************************//** * @brief - * The initCommBuffers function initializes the CommBuffers module. + * The initCommBuffers function initializes the CommBuffers unit. * @details \b Inputs: none - * @details \b Outputs: CommBuffers module initialized. + * @details \b Outputs: CommBuffers unit initialized. * @return none *************************************************************************/ void initCommBuffers( void ) Index: firmware/App/Services/CommBuffers.h =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Services/CommBuffers.h (.../CommBuffers.h) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Services/CommBuffers.h (.../CommBuffers.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -22,7 +22,7 @@ /** * @defgroup CommBuffers CommBuffers - * @brief Communication buffers service module. Provides communication buffers functionality + * @brief Communication buffers service unit. Provides communication buffers functionality * including support functions for adding and clearing communication buffer. * * @addtogroup CommBuffers Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -6,7 +6,7 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file FPGADD.c +* @file FpgaDD.c * * @author (last) Vinayakam Mani * @date (last) 05-Aug-2024 @@ -16,25 +16,23 @@ * ***************************************************************************/ -#include -#include // for memset(), memcpy() +#include "string.h" // for memset(), memcpy() -#include "gio.h" +#include "gio.h" // hal headers #include "sci.h" #include "sys_dma.h" -#include "FPGA.h" -#include "Messaging.h" + #include "Comm.h" #include "Compatible.h" -//#include "NVDataMgmt.h" +#include "FPGA.h" +#include "Messaging.h" #include "OperationModes.h" #include "PersistentAlarm.h" -#include "Messaging.h" #include "Timers.h" #include "Utilities.h" /** - * @addtogroup FPGADD + * @addtogroup FpgaDD * @{ */ @@ -48,7 +46,7 @@ #define FPGA_FLUIDLEAK_STATE_MASK 0x0004 ///< Bit mask for fluid leak detector. -//ToDo : Define the default values for the Valves ( 0: Deenergized, 1 : Energized) on power up. +//TODO : Define the default values for the Valves ( 0: Deenergized, 1 : Energized) on power up. #define FPGA_ENABLE_VALVES_CONTROL 0x0000 ///< FPGA enable valves control. #define FPGA_ENABLE_BC_VALVES_CONTROL 0x00 ///< FPGA enable Balancing chamber valves control. #define FPGA_ENABLE_UF_VALVES_CONTROL 0x00 ///< FPGA enable Balancing Chamber valves control. @@ -69,7 +67,6 @@ #define FPGA_CP1_PARK_FAULT_BIT 0x08 ///< Concentrate pump 1 park fault status bit mask. #define FPGA_CP2_PARK_FAULT_BIT 0x20 ///< Concentrate pump 2 park fault status bit mask. #define FPGA_CONC_PUMP_PARK_COMMAND 0x80 ///< Park command bit for the concentrate pumps. -#define DIALYSATE_CAP_SWITCH_MASK 0x20 ///< Dialysate cap switch bit mask. #define FPGA_THD_CONTROL_COMMAND 0X01 ///< FPGA THd control command. #define FPGA_POWER_OUT_TIMEOUT_MS ( 2 * MS_PER_SECOND ) ///< FPGA power out timeout in milliseconds. #define FPGA_GPIO_POWER_STATUS_PIN 7 ///< FPGA GPIO power status pin. @@ -85,8 +82,8 @@ #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 -// FPGA header struct. #pragma pack(push,1) +/// FPGA header struct. typedef struct { U08 fpgaId; ///< Reg 0. FPGA ID code. Checked against expected value at power up to verify basic FPGA communication and operation @@ -95,7 +92,7 @@ U08 fpgaRevLab; ///< Reg 3. FPGA revision (lab) being reported } FPGA_HEADER_T; // read only on FPGA -/// FPGA sensors' readings struct. +/// FPGA sensor readings struct. typedef struct { U16 fpgaCompatibilityRev; ///< Reg 256. Compatibility revision @@ -171,7 +168,6 @@ U08 fpgaValveBCPWMStates; ///< Reg 363. Balancing Chamber Valve PWM states U08 fpgaValveUFStates; ///< Reg 364. Ultrafiltration Valves states U08 fpgaValveUFPWMStates; ///< Reg 365. Ultrafiltration Valves PWM states - } DD_FPGA_SENSORS_T; typedef struct @@ -247,24 +243,24 @@ U08 fpgaBloodLeakSensorTest; ///< Reg 114. Blood leak sensor test U08 fpgaBloodLeakUARTControl; ///< Reg 115. Blood leak sensor UART control U08 fpgaBloodLeakFIFOTx; ///< Reg 116. Blood leak sensor FIFO transmit control - } FPGA_ACTUATORS_T; #pragma pack(pop) // ********** private data ********** -// FPGA data static FPGA_HEADER_T fpgaHeader; ///< FPGA header structure. static DD_FPGA_SENSORS_T fpgaSensorReadings; ///< DD FPGA sensors structure. static FPGA_ACTUATORS_T fpgaActuatorSetPoints; ///< FPGA actuator set points structure. // ********** private function prototypes ********** +static U16 getFPGATimerCount( void ); + /*********************************************************************//** * @brief - * The initFPGADD function initializes the DD FPGA module. + * The initFPGADD function initializes the DD FPGA unit. * @details \b Inputs: none - * @details \b Outputs: FPGA module initialized. + * @details \b Outputs: FPGA unit initialized. * @return none *************************************************************************/ void initFPGADD( void ) @@ -280,6 +276,8 @@ // Set the THd control register to 0x1 to make sure its ADC is running //fpgaActuatorSetPoints.fpgaTHdControlReg = FPGA_THD_CONTROL_COMMAND; + + // Set the valve control mode and default state of valve fpgaActuatorSetPoints.fpgaValveControl = FPGA_ENABLE_VALVES_CONTROL; fpgaActuatorSetPoints.fpgaValvePWMEnable = FPGA_ENABLE_VALVES_PWM; fpgaActuatorSetPoints.fpgaBCValveControl = FPGA_ENABLE_BC_VALVES_CONTROL; @@ -289,7 +287,6 @@ // initialize FPGA clock speed error time windowed count initTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_COMM_FAILURES, MAX_FPGA_COMM_FAILURES, MAX_FPGA_COMM_FAILURES_WINDOW_MS); - } /*********************************************************************//** @@ -332,21 +329,16 @@ * @brief * The execFPGAClockSpeedTest function verifies the processor clock speed * against the FPGA clock. - * @details \b Inputs: fpgaHeader, - * window timer TIME_WINDOWED_COUNT_FPGA_CLOCK_SPEED_ERROR + * @details \b Inputs: time windowed error count for FPGA clock speed alarm * @details \b Outputs: none * @details \b Alarm: ALARM_ID_DD_FPGA_CLOCK_SPEED_CHECK_FAILURE when clock speed * mismatch seen. - * @return: none + * @warning: It may be necessary to comment out the following code to prevent + * the alarm from occurring while debugging. + * @return: none *************************************************************************/ void execFPGAClockSpeedTest( void ) { - /* DEBUG WARNING - * It may be necessary to comment out the following - * code to prevent the alarm from occurring while - * debugging. - */ - static U16 currentFPGATimerCount_ms = 0; static U32 currentTimerCount_ms = 0; @@ -834,11 +826,11 @@ /*********************************************************************//** * @brief - * The getFPGAPnReadCount function gets Pn/PHo pressure sensor counter of + * The getFPGAPnReadCount function gets hydraulics outlet pressure sensor counter of * good I2C transmissions between FPGA and Sensor. * @details \b Inputs: fpgaSensorReadings.fpgaPnReadCnt * @details \b Outputs: none - * @return Latest Pn/PHo Pressure sensor read count + * @return Latest hydraulics outlet Pressure sensor read count *************************************************************************/ U08 getFPGAPnReadCount( void ) { @@ -847,10 +839,10 @@ /*********************************************************************//** * @brief - * The getFPGAPnErrorCount function gets Pn/PHo pressure sensor error count. + * The getFPGAPnErrorCount function gets hydraulics outlet pressure sensor error count. * @details \b Inputs: fpgaSensorReadings.fpgaPnErrorCnt * @details \b Outputs: none - * @return Latest Pn/PHo pressure sensor read error count + * @return Latest hydraulics outlet pressure sensor read error count *************************************************************************/ U08 getFPGAPnErrorCount( void ) { @@ -859,11 +851,11 @@ /*********************************************************************//** * @brief - * The getFPGAPnRawPressure function gets Pn/PHo pressure sensor raw + * The getFPGAPnRawPressure function gets hydraulics outlet pressure sensor raw * pressure value. * @details \b Inputs: fpgaSensorReadings.fpgaPnPressure * @details \b Outputs: none - * @return Latest Pn/PHo pressure sensor raw pressure data + * @return Latest hydraulics outlet pressure sensor raw pressure data *************************************************************************/ U32 getFPGAPnRawPressure( void ) { @@ -872,11 +864,11 @@ /*********************************************************************//** * @brief - * The getFPGAPnRawTemperature function gets Pn/PHo pressure sensor raw + * The getFPGAPnRawTemperature function gets hydraulics outlet pressure sensor raw * temperature value. * @details \b Inputs: fpgaSensorReadings.fpgaPnTemp * @details \b Outputs: none - * @return Latest Pn/PHo pressure sensor raw temperature data + * @return Latest hydraulics outlet pressure sensor raw temperature data *************************************************************************/ U32 getFPGAPnRawTemperature( void ) { @@ -885,11 +877,11 @@ /*********************************************************************//** * @brief - * The getFPGAPCbReadCount function gets PCb/PDB pressure sensor counter of + * The getFPGAPCbReadCount function gets Bibag pressure sensor counter of * good I2C transmissions between FPGA and Sensor. * @details \b Inputs: fpgaSensorReadings.fpgaPCbReadCnt * @details \b Outputs: none - * @return Latest PCb/PDB Pressure sensor read count + * @return Latest Bibag Pressure sensor read count *************************************************************************/ U08 getFPGAPCbReadCount( void ) { @@ -898,10 +890,10 @@ /*********************************************************************//** * @brief - * The getFPGAPCbErrorCount function gets PCb/PDB pressure sensor error count. + * The getFPGAPCbErrorCount function gets Bibag pressure sensor error count. * @details \b Inputs: fpgaSensorReadings.fpgaPCbErrorCnt * @details \b Outputs: none - * @return Latest PCb/PDB pressure sensor read error count + * @return Latest Bibag pressure sensor read error count *************************************************************************/ U08 getFPGAPCbErrorCount( void ) { @@ -910,11 +902,11 @@ /*********************************************************************//** * @brief - * The getFPGAPCbRawPressure function gets PCb/PDB pressure sensor raw + * The getFPGAPCbRawPressure function gets Bibag pressure sensor raw * pressure value. * @details \b Inputs: fpgaSensorReadings.fpgaPCbPressure * @details \b Outputs: none - * @return Latest PCb/PDB pressure sensor raw pressure data + * @return Latest Bibag pressure sensor raw pressure data *************************************************************************/ U32 getFPGAPCbRawPressure( void ) { @@ -923,11 +915,11 @@ /*********************************************************************//** * @brief - * The getFPGAPCbRawTemperature function gets PCb/PDB pressure sensor raw + * The getFPGAPCbRawTemperature function gets Bibag pressure sensor raw * temperature value. * @details \b Inputs: fpgaSensorReadings.fpgaPCbTemp * @details \b Outputs: none - * @return Latest PCb/PDB pressure sensor raw temperature data + * @return Latest Bibag pressure sensor raw temperature data *************************************************************************/ U32 getFPGAPCbRawTemperature( void ) { @@ -936,11 +928,11 @@ /*********************************************************************//** * @brief - * The getFPGAPDsReadCount function gets PDs pressure sensor counter of + * The getFPGAPDsReadCount function gets spent dialysate pressure sensor counter of * good I2C transmissions between FPGA and Sensor. * @details \b Inputs: fpgaSensorReadings.fpgaPDsReadCnt * @details \b Outputs: none - * @return Latest PDs Pressure sensor read count + * @return Latest spent dialysate Pressure sensor read count *************************************************************************/ U08 getFPGAPDsReadCount( void ) { @@ -949,10 +941,10 @@ /*********************************************************************//** * @brief - * The getFPGAPDsErrorCount function gets PDs pressure sensor error count. + * The getFPGAPDsErrorCount function gets spent dialysate pressure sensor error count. * @details \b Inputs: fpgaSensorReadings.fpgaPDsErrorCnt * @details \b Outputs: none - * @return Latest PDs pressure sensor read error count + * @return Latest spent dialysate pressure sensor read error count *************************************************************************/ U08 getFPGAPDsErrorCount( void ) { @@ -961,11 +953,11 @@ /*********************************************************************//** * @brief - * The getFPGAPDsRawPressure function gets PDs pressure sensor raw + * The getFPGAPDsRawPressure function gets spent dialysate pressure sensor raw * pressure value. * @details \b Inputs: fpgaSensorReadings.fpgaPDsPressure * @details \b Outputs: none - * @return Latest PDs pressure sensor raw pressure data + * @return Latest spent dialysate pressure sensor raw pressure data *************************************************************************/ U32 getFPGAPDsRawPressure( void ) { @@ -974,11 +966,11 @@ /*********************************************************************//** * @brief - * The getFPGAPDsRawTemperature function gets PDs pressure sensor raw + * The getFPGAPDsRawTemperature function gets spent dialysate pressure sensor raw * temperature value. * @details \b Inputs: fpgaSensorReadings.fpgaPDsTemp * @details \b Outputs: none - * @return Latest PDs pressure sensor raw temperature data + * @return Latest spent dialysate pressure sensor raw temperature data *************************************************************************/ U32 getFPGAPDsRawTemperature( void ) { @@ -987,11 +979,11 @@ /*********************************************************************//** * @brief - * The getFPGAPDfReadCount function gets PDf pressure sensor counter of + * The getFPGAPDfReadCount function gets fresh dialysate pressure sensor counter of * good I2C transmissions between FPGA and Sensor. * @details \b Inputs: fpgaSensorReadings.fpgaPDfReadCnt * @details \b Outputs: none - * @return Latest PDf Pressure sensor read count + * @return Latest fresh dialysate Pressure sensor read count *************************************************************************/ U08 getFPGAPDfReadCount( void ) { @@ -1000,10 +992,10 @@ /*********************************************************************//** * @brief - * The getFPGAPDfErrorCount function gets PDf pressure sensor error count. + * The getFPGAPDfErrorCount function gets fresh dialysate pressure sensor error count. * @details \b Inputs: fpgaSensorReadings.fpgaPDfErrorCnt * @details \b Outputs: none - * @return Latest PDf pressure sensor read error count + * @return Latest fresh dialysate pressure sensor read error count *************************************************************************/ U08 getFPGAPDfErrorCount( void ) { @@ -1012,11 +1004,11 @@ /*********************************************************************//** * @brief - * The getFPGAPDfRawPressure function gets PDf pressure sensor raw + * The getFPGAPDfRawPressure function gets fresh dialysate pressure sensor raw * pressure value. * @details \b Inputs: fpgaSensorReadings.fpgaPDfPressure * @details \b Outputs: none - * @return Latest PDf pressure sensor raw pressure data + * @return Latest fresh dialysate pressure sensor raw pressure data *************************************************************************/ U32 getFPGAPDfRawPressure( void ) { @@ -1025,11 +1017,11 @@ /*********************************************************************//** * @brief - * The getFPGAPDfRawTemperature function gets PDf pressure sensor raw + * The getFPGAPDfRawTemperature function gets fresh dialysate pressure sensor raw * temperature value. * @details \b Inputs: fpgaSensorReadings.fpgaPDfTemp * @details \b Outputs: none - * @return Latest PDf pressure sensor raw temperature data + * @return Latest fresh dialysate pressure sensor raw temperature data *************************************************************************/ U32 getFPGAPDfRawTemperature( void ) { @@ -1038,11 +1030,11 @@ /*********************************************************************//** * @brief - * The getFPGAPtmReadCount function gets Ptm pressure sensor counter of + * The getFPGAPtmReadCount function gets transmembrane pressure sensor counter of * good I2C transmissions between FPGA and Sensor. * @details \b Inputs: fpgaSensorReadings.fpgaPtmReadCnt * @details \b Outputs: none - * @return Latest Ptm Pressure sensor read count + * @return Latest transmembrane Pressure sensor read count *************************************************************************/ U08 getFPGAPtmReadCount( void ) { @@ -1051,10 +1043,10 @@ /*********************************************************************//** * @brief - * The getFPGAPtmErrorCount function gets Ptm pressure sensor error count. + * The getFPGAPtmErrorCount function gets transmembrane pressure sensor error count. * @details \b Inputs: fpgaSensorReadings.fpgaPtmErrorCnt * @details \b Outputs: none - * @return Latest Ptm pressure sensor read error count + * @return Latest transmembrane pressure sensor read error count *************************************************************************/ U08 getFPGAPtmErrorCount( void ) { @@ -1063,11 +1055,11 @@ /*********************************************************************//** * @brief - * The getFPGAPtmRawPressure function gets Ptm pressure sensor raw + * The getFPGAPtmRawPressure function gets transmembrane pressure sensor raw * pressure value. * @details \b Inputs: fpgaSensorReadings.fpgaPtmPressure * @details \b Outputs: none - * @return Latest Ptm pressure sensor raw pressure data + * @return Latest transmembrane pressure sensor raw pressure data *************************************************************************/ U32 getFPGAPtmRawPressure( void ) { @@ -1076,11 +1068,11 @@ /*********************************************************************//** * @brief - * The getFPGAPtmRawTemperature function gets Ptm pressure sensor raw + * The getFPGAPtmRawTemperature function gets transmembrane pressure sensor raw * temperature value. * @details \b Inputs: fpgaSensorReadings.fpgaPtmTemp * @details \b Outputs: none - * @return Latest Ptm pressure sensor raw temperature data + * @return Latest transmembrane pressure sensor raw temperature data *************************************************************************/ U32 getFPGAPtmRawTemperature( void ) { @@ -1360,7 +1352,7 @@ * @details \b Outputs: none * @return last FPGA timer count *************************************************************************/ -U16 getFPGATimerCount( void ) +static U16 getFPGATimerCount( void ) { return fpgaSensorReadings.fpgaTimerCountMS; } Index: firmware/App/Services/FpgaDD.h =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -5,28 +5,27 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file FPGADD.h +* @file FpgaDD.h * * @author (last) Vinayakam Mani * @date (last) 08-Aug-2024 * -* @author (original) Dara Navaei +* @author (original) Vinayakam Mani * @date (original) 08-Aug-2024 * ***************************************************************************/ -#ifndef __FPGADD_H__ -#define __FPGADD_H__ +#ifndef __FPGA_DD_H__ +#define __FPGA_DD_H__ #include "DDCommon.h" -#include "Interrupts.h" -#include "Utilities.h" + /** - * @defgroup FPGADD FPGADD - * @brief FPGA service module. Provides functionality to interact with DD FPGA. + * @defgroup FpgaDD FpgaDD + * @brief FPGA service unit. Provides functionality to interact with DD FPGA. * - * @addtogroup FPGADD + * @addtogroup FpgaDD * @{ */ @@ -41,36 +40,25 @@ void checkFPGACommFailure( void ); BOOL checkFPGAFEOEFailure( void ); -//Set FPGA functions +void getFPGAVersions( U08 *Id, U08 *Maj, U08 *Min, U08 *Lab ); + +//Valve void setFPGAValveStates( U16 valveStates ); void setFPGABCValveStates( U08 valveStates ); void setFPGAUFValveStates( U08 valveStates ); +U16 getFPGAValveStates( void ); +U08 getFPGAValveBCStates( void ); +U08 getFPGAValveUFStates( void ); + +// Conductivity and Temperature Sensor void setFPGACD12Control( U08 control ); void setFPGACD34Control( U08 control ); void setFPGACD12Address( U16 address ); void setFPGACD34Address( U16 address ); void setFPGACD12Data( U16 data ); void setFPGACD34Data( U16 data ); -void setFPGAAcidPumpSetStepSpeed( U16 stepSpeed ); -void setFPGABicarbSetStepSpeed( U16 stepSpeed ); -void setFPGADialysateOutPumpSpeed( U16 speed ); -void setFPGADialysateOutPumpControl( U08 control ); -void setFPGADialysateInPumpControl( U08 control ); - -void setFPGAAcidPumpControl( U08 control ); -void setFPGABicarbPumpControl( U08 control ); - -// Get FPGA functions -void getFPGAVersions( U08 *Id, U08 *Maj, U08 *Min, U08 *Lab ); -U16 getFPGAValveStates( void ); -U08 getFPGAValveBCStates( void ); -U08 getFPGAValveUFStates( void ); - -U16 getFPGALevelSensor1( void ); -U16 getFPGALevelSensor2( void ); - U08 getFPGACD1ReadCount( void ); U08 getFPGACD1ErrorCount( void ); U16 getFPGACD1( void ); @@ -95,6 +83,19 @@ U16 getFPGACD4Temp( void ); U16 getFPGACD4Data( void ); +// Pumps ( Concentrate and Gear pumps ) +void setFPGAAcidPumpSetStepSpeed( U16 stepSpeed ); +void setFPGABicarbSetStepSpeed( U16 stepSpeed ); +void setFPGADialysateOutPumpSpeed( U16 speed ); +void setFPGADialysateOutPumpControl( U08 control ); +void setFPGADialysateInPumpControl( U08 control ); +void setFPGAAcidPumpControl( U08 control ); +void setFPGABicarbPumpControl( U08 control ); + +U08 getFPGADialysateOutPumpControl( void ); +U08 getFPGADialysateInPumpControl( void ); + +//Pressure sensor U08 getFPGAPnReadCount( void ); U08 getFPGAPnErrorCount( void ); U32 getFPGAPnRawPressure( void ); @@ -115,114 +116,15 @@ U32 getFPGAPDfRawPressure( void ); U32 getFPGAPDfRawTemperature( void ); -U08 getFPGADialysateOutPumpControl( void ); -U08 getFPGADialysateInPumpControl( void ); - U08 getFPGAPtmReadCount( void ); U08 getFPGAPtmErrorCount( void ); U32 getFPGAPtmRawPressure( void ); U32 getFPGAPtmRawTemperature( void ); -U16 getFPGATimerCount( void ); +//Level sensor +U16 getFPGALevelSensor1( void ); +U16 getFPGALevelSensor2( void ); -//===================================================== -// ToDo : clean up required on following set functions -//===================================================== -void setFPGADrainPumpSpeed( U08 drainPumpDAC ); -void setFPGACPoProbeType( U16 probeType ); -void setFPGACPiProbeType( U16 probeType ); -void setFPGAAcidPumpParkCmd( void ); -void setFPGABicarbPumpParkCmd( void ); -//====================================================== - -//==================================================== -//Todo : Following get functions need clean up -//==================================================== -U16 getFPGADrainPumpSpeed( void ); - -U08 getFPGARTDErrorCount( void ); -U08 getFPGARTDReadCount( void ); - -U32 getFPGATRoTemp( void ); -U08 getFPGATRoErrorCount( void ); -U08 getFPGATRoReadCount( void ); - -U32 getFPGATDiTemp( void ); -U08 getFPGATDiErrorCount( void ); -U08 getFPGATDiReadCount( void ); - -U16 getFPGAPrimaryHeaterTemp( void ); -U08 getFPGAPrimaryHeaterFlags( void ); -U08 getFPGAPrimaryHeaterReadCount( void ); - -U16 getFPGATrimmerHeaterTemp( void ); -U08 getFPGATrimmerHeaterFlags( void ); -U08 getFPGATrimmerHeaterReadCount( void ); - -U16 getFPGAPrimaryColdJunctionTemp( void ); -U16 getFPGATrimmerColdJunctionTemp( void ); - -U08 getFPGAConcentratePumpsFault( void ); -BOOL getFPGAAcidPumpIsParked( void ); -BOOL getFPGABicarbPumpIsParked( void ); -BOOL getFPGAAcidPumpParkFault( void ); -BOOL getFPGABicarbPumpParkFault( void ); - -U16 getFPGACP1HallSensePulseWidth( void ); -U16 getFPGACP2HallSensePulseWidth( void ); - -U16 getFPGABoardTemp( void ); -U32 getFPGATRoInternalTemp( void ); -U32 getFPGATDiInternalTemp( void ); -U32 getFPGACondSnsrInternalTemp( void ); - -U08 getFPGAADC1ReadCount( void ); -U08 getFPGAADC1ErrorCount( void ); - -U08 getFPGAADC2ReadCount( void ); -U08 getFPGAADC2ErrorCount( void ); - -BOOL noFPGAFluidLeakDetected( void ); - -U08 getFPGADialysateCapStatus( void ); -U08 getFPGAConcentrateCapStatus( void ); - -U16 getFPGAInternalVccVoltage( void ); -U16 getFPGAInternalVccAuxiliaryVoltage( void ); -U16 getFPGAVPVNVoltage( void ); - -U08 getFPGABaroReadCount( void ); -U08 getFPGABaroErrorCount( void ); -U16 getFPGABaroMfgInfo( void ); -U16 getFPGABaroPressureSensitivity( void ); -U16 getFPGABaroPressureOffset( void ); -U16 getFPGABaroTempCoeffOfPressSensitvity( void ); -U16 getFPGABaroTempCoeffOfPressOffset( void ); -U16 getFPGABaroReferenceTemperature( void ); -U16 getFPGABaroTempCoeffOfTemperature( void ); -U16 getFPGABaroCoeffsCRC( void ); -U32 getFPGABaroPressure( void ); -U32 getFPGABaroTemperature( void ); - -U32 getFPGATHdTemp( void ); -U32 getFPGATHdInternalTemp( void ); -U08 getFPGATHdReadCount( void ); -U08 getFPGATHdErrorCount( void ); - -U16 getFPGAHeaterGateADC( void ); -U16 getFPGAHeaterGndADC( void ); -U08 getFPGAHeaterGateADCReadCount( void ); -U08 getFPGAHeaterGateADCErrorCount( void ); - -U16 getFPGADrainPumpCurrentFeedback( void ); -U16 getFPGADrainPumpSpeedFeedback( void ); -U08 getFPGADrainPumpDirection( void ); - -U16 getFPGAOnBoardThermistorCount( void ); -U16 getFPGAPowerSupply2ThermistorCount( void ); -//==================================================== - - /**@}*/ #endif Index: firmware/App/Services/Interrupts.c =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -14,18 +14,17 @@ * @date (original) 05-Aug-2024 * ***************************************************************************/ - -#include "SystemCommDD.h" + #include "can.h" #include "rti.h" #include "sci.h" #include "sys_dma.h" -#include "SystemComm.h" -#include "AlarmMgmt.h" -#include "Comm.h" -#include "Interrupts.h" +#include "AlarmMgmtDD.h" +#include "Comm.h" #include "FPGA.h" +#include "Interrupts.h" +#include "SystemCommDD.h" #include "TaskGeneral.h" #include "TaskPriority.h" #include "TaskTimer.h" @@ -51,9 +50,9 @@ /*********************************************************************//** * @brief - * The initInterrupts function initializes the Interrupts module. + * The initInterrupts function initializes the Interrupts unit. * @details \b Inputs: none - * @details \b Outputs: Interrupts module initialized + * @details \b Outputs: Interrupts unit initialized * @return none *************************************************************************/ void initInterrupts( void ) Index: firmware/App/Services/Interrupts.h =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Services/Interrupts.h (.../Interrupts.h) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Services/Interrupts.h (.../Interrupts.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -22,7 +22,7 @@ /** * @defgroup Interrupts Interrupts - * @brief Interrupts module handles various peripheral interrupts. + * @brief Interrupts unit handles various peripheral interrupts. * * @addtogroup Interrupts * @{ Index: firmware/App/Services/Messaging.h =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Services/Messaging.h (.../Messaging.h) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Services/Messaging.h (.../Messaging.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -25,7 +25,7 @@ /** * @defgroup Messaging Messaging - * @brief The system communication messages module provides helper functions + * @brief The system communication messages unit provides helper functions * for sending outgoing system message and handling incoming system messages. * * @addtogroup Messaging Index: firmware/App/Services/MsgQueues.c =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Services/MsgQueues.c (.../MsgQueues.c) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Services/MsgQueues.c (.../MsgQueues.c) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -37,9 +37,9 @@ /*********************************************************************//** * @brief - * The initMsgQueues function initializes the MsgQueues module. + * The initMsgQueues function initializes the MsgQueues unit. * @details \b Inputs: none - * @details \b Outputs: MsgQueues module initialized + * @details \b Outputs: MsgQueues unit initialized * @return none *************************************************************************/ void initMsgQueues( void ) Index: firmware/App/Services/MsgQueues.h =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Services/MsgQueues.h (.../MsgQueues.h) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Services/MsgQueues.h (.../MsgQueues.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -24,7 +24,7 @@ /** * @defgroup MsgQueues MsgQueues - * @brief Message queues service module. Provides message queue functionality + * @brief Message queues service unit. Provides message queue functionality * including support functions for adding and getting a message. * * @addtogroup MsgQueues Index: firmware/App/Services/SystemCommDD.c =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Services/SystemCommDD.c (.../SystemCommDD.c) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Services/SystemCommDD.c (.../SystemCommDD.c) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -81,9 +81,9 @@ /*********************************************************************//** * @brief - * The initSystemCommDD function initializes the DD SystemComm module. + * The initSystemCommDD function initializes the DD SystemComm unit. * @details \b Inputs: none - * @details \b Outputs: SystemComm module initialized. + * @details \b Outputs: SystemComm unit initialized. * @return none *************************************************************************/ void initSystemCommDD( void ) Index: firmware/App/Services/SystemCommDD.h =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Services/SystemCommDD.h (.../SystemCommDD.h) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Services/SystemCommDD.h (.../SystemCommDD.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -25,7 +25,7 @@ /** * @defgroup SystemCommDD SystemCommDD - * @brief System communication module. Manages incoming and outgoing CAN frames. + * @brief System communication unit. Manages incoming and outgoing CAN frames. * * @addtogroup SystemCommDD * @{ Index: firmware/App/Tasks/TaskBG.h =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Tasks/TaskBG.h (.../TaskBG.h) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Tasks/TaskBG.h (.../TaskBG.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -22,7 +22,7 @@ /** * @defgroup TaskBG TaskBG - * @brief Background task module. The background task is an infinite loop running in the background after initialization. + * @brief Background task unit. The background task is an infinite loop running in the background after initialization. * * @addtogroup TaskBG * @{ Index: firmware/App/Tasks/TaskGeneral.h =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Tasks/TaskGeneral.h (.../TaskGeneral.h) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Tasks/TaskGeneral.h (.../TaskGeneral.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -22,7 +22,7 @@ /** * @defgroup TaskGeneral TaskGeneral - * @brief General task module. The general task is called by RTI interrupt every 50 ms and performs the + * @brief General task unit. The general task is called by RTI interrupt every 50 ms and performs the * bulk of sensor, actuator, mode, alarm and communication operations. * * @addtogroup TaskGeneral Index: firmware/App/Tasks/TaskPriority.h =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Tasks/TaskPriority.h (.../TaskPriority.h) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Tasks/TaskPriority.h (.../TaskPriority.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -22,7 +22,7 @@ /** * @defgroup TaskPriority TaskPriority - * @brief Priority task module. The priority task is called by RTI interrupt every 10 ms and performs high priority + * @brief Priority task unit. The priority task is called by RTI interrupt every 10 ms and performs high priority * and/or more urgent sensor/actuator processing as well as the interface to the FPGA. * * @addtogroup TaskPriority Index: firmware/App/Tasks/TaskTimer.h =================================================================== diff -u -r26ee1d67dca19aac1850077cbd41c05498cf059d -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Tasks/TaskTimer.h (.../TaskTimer.h) (revision 26ee1d67dca19aac1850077cbd41c05498cf059d) +++ firmware/App/Tasks/TaskTimer.h (.../TaskTimer.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -20,7 +20,7 @@ /** * @defgroup TaskTimer TaskTimer - * @brief Timer task module. Timer task is called by RTI interrupt every 1 ms to update the ms timer counter. + * @brief Timer task unit. Timer task is called by RTI interrupt every 1 ms to update the ms timer counter. * * @addtogroup TaskTimer * @{