Index: firmware/App/Modes/BloodPrime.c =================================================================== diff -u -ra2a882ee989ef142887cd54a0f8311addaca812d -rc65ad0538ff99c3e13d7d7866ac15e38a1ef6002 --- firmware/App/Modes/BloodPrime.c (.../BloodPrime.c) (revision a2a882ee989ef142887cd54a0f8311addaca812d) +++ firmware/App/Modes/BloodPrime.c (.../BloodPrime.c) (revision c65ad0538ff99c3e13d7d7866ac15e38a1ef6002) @@ -51,7 +51,7 @@ static const U32 BLOOD_PRIME_RAMPING_INTERVAL = ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ); /// Interval at which blood prime progress is to be published to UI. -static const U32 BLOOD_PRIME_DATA_PUBLISH_INTERVAL = ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ); +#define BLOOD_PRIME_DATA_PUBLISH_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) /// Multiplier to convert flow (mL/min) into volume (mL) for period of general task interval. static const F32 BLOOD_PRIME_FLOW_INTEGRATOR = 1.0 / (F32)( SEC_PER_MIN * ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ); @@ -65,6 +65,8 @@ static U32 bloodPrimeRampControlTimerCtr; ///< Timer counter for determining interval for controlling BP ramp. static U32 bloodPrimePublishTimerCtr; ///< Timer counter for determining interval for blood prime status to be published. +/// Interval (in task intervals) at which to publish blood prime data to CAN bus. +static OVERRIDE_U32_T bloodPrimePublishInterval = { BLOOD_PRIME_DATA_PUBLISH_INTERVAL, BLOOD_PRIME_DATA_PUBLISH_INTERVAL, BLOOD_PRIME_DATA_PUBLISH_INTERVAL, 0 }; static OVERRIDE_F32_T cumulativeBloodPrimeVolume_mL = { 0.0, 0.0, 0.0, 0 }; ///< Total cumulative blood prime volume (in mL). static OVERRIDE_F32_T bloodPrimeVolumeDelivered_Safety = { 0.0, 0.0, 0.0, 0 }; ///< The cumulative independent blood prime volume (in mL) calculated so far. @@ -318,7 +320,7 @@ *************************************************************************/ static void publishBloodPrimeData( void ) { - if ( ++bloodPrimePublishTimerCtr >= BLOOD_PRIME_DATA_PUBLISH_INTERVAL ) + if ( ++bloodPrimePublishTimerCtr >= getU32OverrideValue( &bloodPrimePublishInterval ) ) { BLOOD_PRIME_DATA_PAYLOAD_T data; @@ -426,4 +428,51 @@ return result; } +/*********************************************************************//** + * @brief + * The testSetBloodPrimePublishIntervalOverride function sets the override of the + * blood prime data publication interval. + * @details Inputs: none + * @details Outputs: bloodPrimePublishInterval + * @param ms milliseconds between blood prime broadcasts + * @return TRUE if override set successful, FALSE if not + *************************************************************************/ +BOOL testSetBloodPrimePublishIntervalOverride( U32 ms ) +{ + BOOL result = FALSE; + + if ( TRUE == isTestingActivated() ) + { + U32 intvl = ms / TASK_GENERAL_INTERVAL; + + result = TRUE; + bloodPrimePublishInterval.ovData = intvl; + bloodPrimePublishInterval.override = OVERRIDE_KEY; + } + + return result; +} + +/*********************************************************************//** + * @brief + * The testResetBloodPrimePublishIntervalOverride function resets the override of the + * blood prime data publication interval. + * @details Inputs: none + * @details Outputs: bloodPrimePublishInterval + * @return TRUE if override reset successful, FALSE if not + *************************************************************************/ +BOOL testResetBloodPrimePublishIntervalOverride( void ) +{ + BOOL result = FALSE; + + if ( TRUE == isTestingActivated() ) + { + result = TRUE; + bloodPrimePublishInterval.override = OVERRIDE_RESET; + bloodPrimePublishInterval.ovData = bloodPrimePublishInterval.ovInitData; + } + + return result; +} + /**@}*/