Index: firmware/App/Controllers/BoostPump.h =================================================================== diff -u -r6545787080956983fed6bd9c2717938c202917ab -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Controllers/BoostPump.h (.../BoostPump.h) (revision 6545787080956983fed6bd9c2717938c202917ab) +++ firmware/App/Controllers/BoostPump.h (.../BoostPump.h) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -18,7 +18,6 @@ #ifndef __BOOSTPUMP_H__ #define __BOOSTPUMP_H__ - #include "FluidPump.h" #include "DDCommon.h" Index: firmware/App/Controllers/DialysatePumps.c =================================================================== diff -u -ra8b1004967be1c3bd4d46e96ff5886a0ec1446cc -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Controllers/DialysatePumps.c (.../DialysatePumps.c) (revision a8b1004967be1c3bd4d46e96ff5886a0ec1446cc) +++ firmware/App/Controllers/DialysatePumps.c (.../DialysatePumps.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -39,6 +39,7 @@ */ // ********** private definitions ********** + #define DIALYSATE_PUMP_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ///< Interval (ms/task time) at which the dialysate pump data is published on the CAN bus. #define DATA_PUBLISH_COUNTER_START_COUNT 60 ///< Data publish counter start count. #define DP_CONTROL_INTERVAL_MS 1000 ///< Dialysate pump control interval in ms Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -re803f3e6d135641015dc78e2aeac0a5489c9492c -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision e803f3e6d135641015dc78e2aeac0a5489c9492c) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -41,6 +41,7 @@ */ // ********** private definitions ********** + #define AC_HEATER_TX_MAX_DUTY_CYCLE 0.50F ///< AC Heater treatment mode max duty cycle (50% of 1400W : 700W ) #define AC_HEATER_HEAT_MAX_DUTY_CYCLE 0.70F ///< AC Heater heat disinfect mode max duty cycle (70% of 1400W : 980W ) #define AC_HEATER_MAX_DUTY_CYCLE 1.0F ///< AC Heater max duty cycle (100.0%) or ON state @@ -120,6 +121,8 @@ F32 temperature; ///< Temperature range ( 10.0 to 90.0 deg ) } HEATER_START_CMD_PAYLOAD_T; +// ********** private data ********** + static HEATER_STATUS_T heatersStatus[ NUM_OF_DD_HEATERS ]; ///< Heaters status. static OVERRIDE_F32_T targetTempC[ NUM_OF_DD_HEATERS ]; ///< Heater target temperature. static OVERRIDE_F32_T control[ NUM_OF_DD_HEATERS ]; ///< Heater control ( Primary : On/Off, Trimmer : Dutycycle). @@ -140,6 +143,7 @@ #ifdef __HEATERS_DEBUG__ static F32 pIControlSignal[ NUM_OF_CONTROLLER_SIGNAL ]; #endif + // ********** private function prototypes ********** static HEATERS_STATE_T handleHeaterStateOff( DD_HEATERS_T heater ); Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -r0b79c0e7dcf7f9e64c890447e83571d3123ab52c -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision 0b79c0e7dcf7f9e64c890447e83571d3123ab52c) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -42,8 +42,8 @@ /// Payload record structure for valve open/close request typedef struct { - U32 valveID; ///< ValveID ( valid range 0 to 28 ) - U32 valveState; ///< Valve state ( Open : 0, closed :1) + U32 valveID; ///< ValveID ( valid range 0 to 28 ) + U32 valveState; ///< Valve state ( Open : 0, closed :1) } VALVE_CMD_PAYLOAD_T; // ********** private data ********** @@ -109,7 +109,7 @@ // Initialize the commanded valve states commandedValvesStates = ALL_VALVES_DEENERGIZED; commandedBCValveStates = ALL_VALVES_DEENERGIZED; - commandedIOFPValveStates = ALL_VALVES_DEENERGIZED; + commandedIOFPValveStates = ALL_VALVES_DEENERGIZED; valveStateMismatchTimerCounter = 0; valvesStatesPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT; // reset valves states publication timer fpValveStatesPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT; // reset valves states publication timer Index: firmware/App/Drivers/ConductivitySensors.c =================================================================== diff -u -r89f18a07a6d5837bf9b4559a69046e2b06f32c35 -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 89f18a07a6d5837bf9b4559a69046e2b06f32c35) +++ firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -145,7 +145,7 @@ initFPGAPersistentAlarm( FPGA_PERS_ERROR_D43_COND_SENSOR, ALARM_ID_DD_D43_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); initFPGAPersistentAlarm( FPGA_PERS_ERROR_D74_COND_SENSOR, ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); //initFPGAPersistentAlarm( FPGA_PERS_ERROR_P9_COND_SENSOR, ALARM_ID_FP_P9_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); - //initFPGAPersistentAlarm( FPGA_PERS_ERROR_P9_COND_SENSOR, ALARM_ID_FP_P18_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); + //initFPGAPersistentAlarm( FPGA_PERS_ERROR_P18_COND_SENSOR, ALARM_ID_FP_P18_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); } /*********************************************************************//** Index: firmware/App/Drivers/FluidPump.h =================================================================== diff -u -r6545787080956983fed6bd9c2717938c202917ab -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Drivers/FluidPump.h (.../FluidPump.h) (revision 6545787080956983fed6bd9c2717938c202917ab) +++ firmware/App/Drivers/FluidPump.h (.../FluidPump.h) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -57,8 +57,8 @@ U16 getFluidPumpReadPWMDutyCycle( FP_FLUID_PUMP_T pumpID ); F32 getFluidPumpRPM( FP_FLUID_PUMP_T pumpID ); -F32 convertDutyCycleCntToPct( U32 dutyCycleCnt ); -U16 convertDutyCyclePctToCnt( F32 dutyCyclePct ); +F32 convertDutyCycleCntToPct( U32 dutyCycleCnt ); +U16 convertDutyCyclePctToCnt( F32 dutyCyclePct ); BOOL setFluidPumpPctToPWMDutyCycle( FP_FLUID_PUMP_T pumpID, F32 dutyCyclePct); void handleFluidPumpU32Data( OVERRIDE_U32_T *ovU32); void handleFluidPumpF32Data( OVERRIDE_F32_T *ovF32); Index: firmware/App/Drivers/PressureSensor.c =================================================================== diff -u -r4bc9893a967e7afe3d657907cafacc335755db27 -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 4bc9893a967e7afe3d657907cafacc335755db27) +++ firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -46,7 +46,6 @@ // ********** private function prototypes ********** - /*********************************************************************//** * @brief * The initPressureSensor function initializes the Pressure Sensor unit. Index: firmware/App/Drivers/SafetyShutdown.c =================================================================== diff -u -rfcc4687781eca7040763ca83b2c1b1ea73ae6f21 -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Drivers/SafetyShutdown.c (.../SafetyShutdown.c) (revision fcc4687781eca7040763ca83b2c1b1ea73ae6f21) +++ firmware/App/Drivers/SafetyShutdown.c (.../SafetyShutdown.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -241,8 +241,5 @@ return result; } - - - /**@}*/ Index: firmware/App/Modes/FPModes/FPModeFault.c =================================================================== diff -u -re8a090df33223455312adc5ad494a3b5e2507f00 -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Modes/FPModes/FPModeFault.c (.../FPModeFault.c) (revision e8a090df33223455312adc5ad494a3b5e2507f00) +++ firmware/App/Modes/FPModes/FPModeFault.c (.../FPModeFault.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -40,14 +40,14 @@ static SELF_TEST_STATUS_T faultPOSTSelfTestResult; ///< Fault POST self test result. // ********** private function prototypes ********** + static FP_FAULT_STATE_T handleFaultStartState( void ); static FP_FAULT_STATE_T handleFaultDeenergizedState( void ); static FP_FAULT_STATE_T handleFaultEnergizedState( void ); static FP_FAULT_NVDATA_STATE_T handleFaultNVDataMgmtStartState( void ); static FP_FAULT_NVDATA_STATE_T handleFaultRunNVPOSTsState( void ); - /*********************************************************************//** * @brief * The initFPFaultMode function initializes the fault mode unit. @@ -307,5 +307,3 @@ } /**@}*/ - - Index: firmware/App/Modes/FPModes/FPModeStandby.c =================================================================== diff -u -re8a090df33223455312adc5ad494a3b5e2507f00 -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Modes/FPModes/FPModeStandby.c (.../FPModeStandby.c) (revision e8a090df33223455312adc5ad494a3b5e2507f00) +++ firmware/App/Modes/FPModes/FPModeStandby.c (.../FPModeStandby.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -143,4 +143,5 @@ * TEST SUPPORT FUNCTIONS *************************************************************************/ + /**@}*/ Index: firmware/App/Modes/FPModes/FlushConcentrate.h =================================================================== diff -u -r6545787080956983fed6bd9c2717938c202917ab -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Modes/FPModes/FlushConcentrate.h (.../FlushConcentrate.h) (revision 6545787080956983fed6bd9c2717938c202917ab) +++ firmware/App/Modes/FPModes/FlushConcentrate.h (.../FlushConcentrate.h) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -51,6 +51,7 @@ BOOL testConcentrateFlushDataPublishIntervalOverride( MESSAGE_T *message ); BOOL testConcentrateFlushTimerOverride( MESSAGE_T *message ); + /**@}*/ #endif Index: firmware/App/Modes/FPModes/FlushFilter.h =================================================================== diff -u -r6545787080956983fed6bd9c2717938c202917ab -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Modes/FPModes/FlushFilter.h (.../FlushFilter.h) (revision 6545787080956983fed6bd9c2717938c202917ab) +++ firmware/App/Modes/FPModes/FlushFilter.h (.../FlushFilter.h) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -51,7 +51,7 @@ BOOL testFilterFlushDataPublishIntervalOverride( MESSAGE_T *message ); BOOL testFilterFlushTimerOverride( MESSAGE_T *message ); + /**@}*/ - #endif Index: firmware/App/Modes/FPModes/FlushPermeate.h =================================================================== diff -u -r6545787080956983fed6bd9c2717938c202917ab -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Modes/FPModes/FlushPermeate.h (.../FlushPermeate.h) (revision 6545787080956983fed6bd9c2717938c202917ab) +++ firmware/App/Modes/FPModes/FlushPermeate.h (.../FlushPermeate.h) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -51,7 +51,7 @@ BOOL testPermeateFlushDataPublishIntervalOverride( MESSAGE_T *message ); BOOL testPermeateFlushTimerOverride( MESSAGE_T *message ); + /**@}*/ - #endif Index: firmware/App/Modes/ModePreGenDialysate.c =================================================================== diff -u -r38ee99e9adeb19cacb0c88807e8f6f48b076a241 -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Modes/ModePreGenDialysate.c (.../ModePreGenDialysate.c) (revision 38ee99e9adeb19cacb0c88807e8f6f48b076a241) +++ firmware/App/Modes/ModePreGenDialysate.c (.../ModePreGenDialysate.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -64,7 +64,6 @@ static DD_WET_SELF_TEST_STATE_T handleNegativeDeaerationPressureCheckState( void ); static DD_WET_SELF_TEST_STATE_T handlePositiveDeaerationPressureCheckState( void ); - /*********************************************************************//** * @brief * The initPreGenDialysateMode function initializes the Pre-Generation Index: firmware/App/Modes/OperationModes.h =================================================================== diff -u -r2d6eb4c585a2b9cc1f67244c45ed2ac32835d608 -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision 2d6eb4c585a2b9cc1f67244c45ed2ac32835d608) +++ firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -21,6 +21,7 @@ #include "DDCommon.h" #include "DDDefs.h" #include "TDDefs.h" + /** * @defgroup DDOperationModes DDOperationModes * @brief Operation Modes unit. Manages the top level operation modes of the DD via a state machine. Index: firmware/App/Monitors/BloodLeak.c =================================================================== diff -u -r88662452040aa91ce9a7da032e9ed1865517bdd5 -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Monitors/BloodLeak.c (.../BloodLeak.c) (revision 88662452040aa91ce9a7da032e9ed1865517bdd5) +++ firmware/App/Monitors/BloodLeak.c (.../BloodLeak.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -1949,6 +1949,7 @@ * TEST SUPPORT FUNCTIONS *************************************************************************/ + /*********************************************************************//** * @brief * The testBloodLeakDataPublishIntervalOverride function overrides the Index: firmware/App/Monitors/BloodLeak.h =================================================================== diff -u -r2fbc96d39b371df18e2b1b641fcd4917806c0767 -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Monitors/BloodLeak.h (.../BloodLeak.h) (revision 2fbc96d39b371df18e2b1b641fcd4917806c0767) +++ firmware/App/Monitors/BloodLeak.h (.../BloodLeak.h) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -3,7 +3,6 @@ #ifndef __BLOODLEAK_H__ #define __BLOODLEAK_H__ - #include "DDCommon.h" /** Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -re6504e7e162d00745033a55191d6f810d2753105 -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision e6504e7e162d00745033a55191d6f810d2753105) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -28,6 +28,7 @@ */ // ********** private definitions ********** + #define PRESSURES_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ///< Interval (ms/task time) at which the pressures data is published on the CAN bus. #define DATA_PUBLISH_COUNTER_START_COUNT ( 5 ) ///< Data publish counter start count. #define PRESSURE_SAMPLE_FILTER_MS ( 50 ) ///< Filter pressure data for given time Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -re6504e7e162d00745033a55191d6f810d2753105 -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision e6504e7e162d00745033a55191d6f810d2753105) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -36,6 +36,7 @@ */ // ********** private definitions ********** + #define ADC_FPGA_READ_DELAY 30U ///< Delay in ms before reading the ADC values from FPGA. #define TEMP_SENSORS_DATA_PUBLISH_INTERVAL ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ///< Temperature sensors publish data time interval. Index: firmware/App/Monitors/WaterQualityMonitor.c =================================================================== diff -u -ra0c144ed9f72066d7a7b1d047b01fb76ca56d667 -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Monitors/WaterQualityMonitor.c (.../WaterQualityMonitor.c) (revision a0c144ed9f72066d7a7b1d047b01fb76ca56d667) +++ firmware/App/Monitors/WaterQualityMonitor.c (.../WaterQualityMonitor.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -32,6 +32,7 @@ */ // ********** private definitions ********** + #define INLET_TEMPERATURE_LOW_THRESHOLD_C 5.0F ///< Minimum allowed Inlet temperature in C. #define INLET_TEMPERATURE_HIGH_THRESHOLD_C 30.0F ///< Maximum allowed Inlet temperature in C. #define INLET_TEMPERATURE_PERSISTENCE_TIMER_MS ( 5 * MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ///< Persistence timer to trigger alarm in ms. Index: firmware/App/Monitors/WaterQualityMonitor.h =================================================================== diff -u -r6545787080956983fed6bd9c2717938c202917ab -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Monitors/WaterQualityMonitor.h (.../WaterQualityMonitor.h) (revision 6545787080956983fed6bd9c2717938c202917ab) +++ firmware/App/Monitors/WaterQualityMonitor.h (.../WaterQualityMonitor.h) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -32,8 +32,8 @@ // ********** public definitions ********** - // ********** public definitions ********** + void initWaterQualityMonitor( void ); void execWaterQualityMonitor( void ); void checkInletPressures( void ); Index: firmware/App/Services/AlarmMgmtDD.c =================================================================== diff -u -r6545787080956983fed6bd9c2717938c202917ab -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Services/AlarmMgmtDD.c (.../AlarmMgmtDD.c) (revision 6545787080956983fed6bd9c2717938c202917ab) +++ firmware/App/Services/AlarmMgmtDD.c (.../AlarmMgmtDD.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -26,7 +26,6 @@ #include "TDDefs.h" #include "Timers.h" - /** * @addtogroup AlarmManagement * @{ Index: firmware/App/Services/AlarmMgmtDD.h =================================================================== diff -u -r8079e04faec2a2eda7f33cb3b9f25a3cc26237af -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Services/AlarmMgmtDD.h (.../AlarmMgmtDD.h) (revision 8079e04faec2a2eda7f33cb3b9f25a3cc26237af) +++ firmware/App/Services/AlarmMgmtDD.h (.../AlarmMgmtDD.h) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -17,7 +17,6 @@ #ifndef __ALARM_MGMT_DD_H__ #define __ALARM_MGMT_DD_H__ - /** * @defgroup AlarmManagement AlarmManagement Index: firmware/App/Services/FPInterface.c =================================================================== diff -u -ra0c144ed9f72066d7a7b1d047b01fb76ca56d667 -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Services/FPInterface.c (.../FPInterface.c) (revision a0c144ed9f72066d7a7b1d047b01fb76ca56d667) +++ firmware/App/Services/FPInterface.c (.../FPInterface.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -194,6 +194,7 @@ return result; } + /************************************************************************* * TEST SUPPORT FUNCTIONS *************************************************************************/ Index: firmware/App/Services/FPInterface.h =================================================================== diff -u -re01f6c0b94312dec30878967be9ffa3228e8773b -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Services/FPInterface.h (.../FPInterface.h) (revision e01f6c0b94312dec30878967be9ffa3228e8773b) +++ firmware/App/Services/FPInterface.h (.../FPInterface.h) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -34,8 +34,6 @@ // ********** public definitions ********** - - // ********** public function prototypes ********** void initFPInterface( void ); Index: firmware/App/Services/FpgaDD.h =================================================================== diff -u -r3ededfebdde73ae377aa81e6bae2a4e2148bc689 -r6f961c6e113a4076ba9d5f97e078a398a8976d7c --- firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision 3ededfebdde73ae377aa81e6bae2a4e2148bc689) +++ firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) @@ -20,7 +20,6 @@ #include "DDCommon.h" - /** * @defgroup FpgaDD FpgaDD * @brief FPGA service unit. Provides functionality to interact with DD FPGA.