Index: firmware/App/Monitors/BloodLeak.h =================================================================== diff -u -r6f961c6e113a4076ba9d5f97e078a398a8976d7c -r6f7ada05f12562eef3d0135168b37cdabf7e3eae --- firmware/App/Monitors/BloodLeak.h (.../BloodLeak.h) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) +++ firmware/App/Monitors/BloodLeak.h (.../BloodLeak.h) (revision 6f7ada05f12562eef3d0135168b37cdabf7e3eae) @@ -3,7 +3,9 @@ #ifndef __BLOODLEAK_H__ #define __BLOODLEAK_H__ + #include "DDCommon.h" +#include "DDDefs.h" /** * @defgroup BloodLeak BloodLeak @@ -19,33 +21,32 @@ // ********** public definitions ********** /// Enumeration of blood leak detector status. -typedef enum BloodLeakDetectorStatus -{ - BLOOD_LEAK_DETECTED = 0, ///< Blood leak detector senses blood. - BLOOD_LEAK_NOT_DETECTED, ///< Blood leak detector does not sense any blood. - NUM_OF_BLOOD_LEAK_STATUS ///< Number of blood leak detector status. -} BLOOD_LEAK_STATUS_T; +//typedef enum BloodLeakDetectorStatus +//{ +// BLOOD_LEAK_DETECTED = 0, ///< Blood leak detector senses blood. +// BLOOD_LEAK_NOT_DETECTED, ///< Blood leak detector does not sense any blood. +// NUM_OF_BLOOD_LEAK_STATUS ///< Number of blood leak detector status. +//} BLOOD_LEAK_STATUS_T; /// Blood leak detector data publish -typedef struct -{ - U32 bloodLeakStatus; ///< Blood leak detector status. - U32 bloodLeakState; ///< Blood leak detector state. - U32 bloodLeakPersistentCounter; ///< Blood leak detector persistent counter. - U32 bloodLeakSerialCommState; ///< Blood leak detector serial communication state. - U32 bloodLeakIntensity; ///< Blood leak detector intensity. - U32 bloodLeakDetect; ///< Blood leak detector detect. - F32 bloodLeakIntensityMovingAvg; ///< Blood leak detector intensity moving average. - U32 bloodLeakTimeSinceZeroMS; ///< Blood leak detector time since last zero in milliseconds. - U32 driftInRangeStatus; ///< Blood leak detector drift in range status. - U32 driftUpperRangeStatus; ///< Blood leak detector drift upper range status. -} BLOOD_LEAK_DATA_T; +//typedef struct +//{ +// U32 bloodLeakStatus; ///< Blood leak detector status. +// U32 bloodLeakState; ///< Blood leak detector state. +// U32 bloodLeakPersistentCounter; ///< Blood leak detector persistent counter. +// U32 bloodLeakSerialCommState; ///< Blood leak detector serial communication state. +// U32 bloodLeakIntensity; ///< Blood leak detector intensity. +// U32 bloodLeakDetect; ///< Blood leak detector detect. +// F32 bloodLeakIntensityMovingAvg; ///< Blood leak detector intensity moving average. +// U32 bloodLeakTimeSinceZeroMS; ///< Blood leak detector time since last zero in milliseconds. +// U32 driftInRangeStatus; ///< Blood leak detector drift in range status. +// U32 driftUpperRangeStatus; ///< Blood leak detector drift upper range status. +//} BLOOD_LEAK_DATA_T; // ********** public function prototypes ********** void initBloodLeak( void ); void execBloodLeak( void ); -void execBloodLeakEmbModeCommand( void ); BOOL zeroBloodLeak( void ); void zeroBloodLeakReset( void ); BOOL hasBloodLeakZeroSequenceFailed( void ); @@ -59,9 +60,6 @@ BOOL testBloodLeakDataPublishIntervalOverride( MESSAGE_T *message ); BOOL testBloodLeakStatusOverride( MESSAGE_T *message ); -BOOL testSetBloodLeak2EmbeddedMode( MESSAGE_T *message ); -BOOL testSetBloodLeakEmbeddedModeCommand( MESSAGE_T *message ); -BOOL testBloodLeakEmbeddedModeInfoOverride( MESSAGE_T *message ); BOOL testBloodLeakIntensityMovingAverageOverride( MESSAGE_T *message ); BOOL testBloodLeakZeroingIntervalInMillisecondsOverride( MESSAGE_T *message ); BOOL testBloodLeakZeroSequenceRequest( MESSAGE_T *message );