Index: firmware/App/Controllers/DGInterface.c =================================================================== diff -u -r640525dbad258a32c5dfecdc29268b432f72fb43 -r95d7d8e230da1c04c2fed2be5a43afd273d95846 --- firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 640525dbad258a32c5dfecdc29268b432f72fb43) +++ firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 95d7d8e230da1c04c2fed2be5a43afd273d95846) @@ -45,6 +45,7 @@ #define DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C 2.0F ///< Dialysate temperature clear alarm tolerance C #define DIALYSATE_TEMP_OUT_OF_TARGET_TOL_C 4.0F ///< Dialysate temperature out of target tolerance C. +#define DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS ( 90 * MS_PER_SECOND ) ///< Dialysate temperature out of target timeout in milliseconds. #define DIALYSATE_TEMP_UPPER_MAX_SAFETY_LIMIT_C 46.0F ///< Dialysate upper bound maximum temperature limit in C. #define DIALYSATE_TEMP_UPPER_MAX_SAFETY_TIMEOUT_MS ( 1 * MS_PER_SECOND ) ///< Dialysate temperature upper bound maximum safety timeout in milliseconds. #define DIALYSATE_TEMP_UPPER_SAFETY_LIMIT_C 42.0F ///< Dialysate upper bound safety temperature limit in C. @@ -98,9 +99,6 @@ static DG_RESERVOIR_ID_T dgActiveReservoir; ///< Latest active reservoir reported by the DG. static DG_RESERVOIR_ID_T dgActiveReservoirSet; ///< Active reservoir commanded. -// Tdi temperature Monitor -static DG_TDI_TEMP_COUNTER_T dgTdiTempCounter; ///< DG Tdi temperature Counter. - static DG_DISINFECT_UI_STATES_T disinfectsStatus; ///< DG disinfects status. static DG_MIXING_RATIOS_T dgMixingRatios; ///< DG mixing ratios. static HEATERS_DATA_T dgHeatersData; ///< DG heaters data. @@ -176,40 +174,16 @@ lgLoadCellBackupReadingsTotal[ DG_RESERVOIR_1 ] = 0.0F; lgLoadCellBackupReadingsTotal[ DG_RESERVOIR_2 ] = 0.0F; + initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS ); + initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_UPPER_MAX_SAFETY_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_HD_NEW_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_HD_NEW_DIALYSATE_TEMP_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS ); - - resetTdiTempCounters(); } -/*********************************************************************//** - * @brief - * The resetTdiTempCounters function initializes the counter variables. - * @details Inputs: none - * @details Outputs: TdiTemperature counter variables initialized. - * @return none - *************************************************************************/ -void resetTdiTempCounters ( void ) -{ - //Initialize tdi temperature counter values - dgTdiTempCounter.tdiHighTempUpCounter = 0; - dgTdiTempCounter.tdiHighTempDownCounter = 0; - dgTdiTempCounter.prevTdiHighTempUpCounter = 0; - dgTdiTempCounter.prevTdiHighTempDownCounter = 0; - dgTdiTempCounter.tdiHighclearAlarmStartTime = 0; - dgTdiTempCounter.tdiLowTempUpCounter = 0; - dgTdiTempCounter.tdiLowTempDownCounter = 0; - dgTdiTempCounter.prevTdiLowTempUpCounter = 0; - dgTdiTempCounter.prevTdiLowTempDownCounter = 0; - dgTdiTempCounter.tdiHighclearAlarmStartTime = 0; - dgTdiTempCounter.dgPrevActiveReservoir = DG_RESERVOIR_2; - dgTdiTempCounter.dgCurrentActiveReservoir = DG_RESERVOIR_2; -} - /**********************************************************************//** * @brief * The checkDGDataFreshness function checks the condition @@ -297,30 +271,6 @@ /*********************************************************************//** * @brief - * The getDGTdiTempCounter function gets the TDI temperature high and low counters values. - * @details Inputs: dgTdiTempCounter - * @details Outputs: none - * @return TDI temperature high and low temperature counter values. - *************************************************************************/ -DG_TDI_TEMP_COUNTER_T getDGTdiTempCounter( void ) -{ - return dgTdiTempCounter; -} - -/*********************************************************************//** - * @brief - * The getDGTdiTempetraure function gets the TDI temperature value. - * @details Inputs: dgDialysateTemp - * @details Outputs: none - * @return TDI temperature value. - *************************************************************************/ -F32 getDGTdiTempetraure( void ) -{ - return dgDialysateTemp; -} - -/*********************************************************************//** - * @brief * The getDGSubMode function gets the current DG operating sub-mode. * @details Inputs: dgSubMode * @details Outputs: none @@ -1312,124 +1262,29 @@ BOOL isTDiTempBelowDialysateTarget = ( dgDialysateTemp <= TDiLow ? TRUE : FALSE ); BOOL isTempBelowTrigger = (BOOL)( isTDITempBelowLowSafety || isTDiTempBelowDialysateTarget ); BOOL isTempAboveTrigger = (BOOL)( isTDiTempAboveLowSafety || isTDiTempAboveDialysateTarget ); - DG_RESERVOIR_ID_T currentActiveRes = getDGActiveReservoir(); #ifndef _RELEASE_ if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DIALYSATE_TEMP_CHECK ) != SW_CONFIG_ENABLE_VALUE ) #endif { - // Check Tdi High/Low temperature alarm active - BOOL alarmTdiHighIsActive = isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP ); - BOOL alarmTdiLowIsActive = isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP ); - - // Tdi high temp alarm clear - if ( dgDialysateTemp <= ( dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ) + // check clear condition first + if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP ) ) { - if ( TRUE == alarmTdiHighIsActive ) - { - if ( dgTdiTempCounter.tdiHighclearAlarmStartTime == 0 ) - { - dgTdiTempCounter.tdiHighclearAlarmStartTime = getMSTimerCount(); - } - else if ( TRUE == didTimeout(dgTdiTempCounter.tdiHighclearAlarmStartTime, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS ) ) - { - clearAlarmCondition( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP ); - } - } + isTDiTempAboveHighSafety = ( dgDialysateTemp <= ( dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE ); } - else - { - dgTdiTempCounter.tdiHighclearAlarmStartTime = 0; - } + checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP, isTDiTempAboveHighSafety, dgDialysateTemp, dgTrimmerTempSet ); - // Tdi Low temp alarm clear - if ( dgDialysateTemp >= ( dgTrimmerTempSet - DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ) + if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP ) ) { - if ( TRUE == alarmTdiLowIsActive ) - { - if ( dgTdiTempCounter.tdiLowclearAlarmStartTime == 0 ) - { - dgTdiTempCounter.tdiLowclearAlarmStartTime = getMSTimerCount(); - } - else if ( TRUE == didTimeout(dgTdiTempCounter.tdiLowclearAlarmStartTime, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS ) ) - { - clearAlarmCondition( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP ); - } - } + isTempAboveTrigger = ( dgDialysateTemp <= ( dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE ); } - else - { - dgTdiTempCounter.tdiLowclearAlarmStartTime = 0; - } + checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, isTempAboveTrigger, dgDialysateTemp, dgTrimmerTempSet ); - if ( currentActiveRes != dgTdiTempCounter.dgPrevActiveReservoir ) + if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP ) ) { - // Tdi high temp alarm set - if ( TRUE == isTempAboveTrigger ) - { - //Increment tdi high temp up count when temperature is exceeded the defined threshold - dgTdiTempCounter.tdiHighTempUpCounter++; - } - // Initiate tdi high temp down Counter only when temperature is crossed the threshold. otherwise do not increment down counter - else if ( dgTdiTempCounter.tdiHighTempUpCounter > 0 ) - { - dgTdiTempCounter.tdiHighTempDownCounter++; - } - - //Tdi Low temp alarm set - if ( TRUE == isTempBelowTrigger ) - { - //Increment tdi low temp down count when temperature is goes below the defined threshold - dgTdiTempCounter.tdiLowTempDownCounter++; - } - // Initiate Tdi low up Counter only when temperature is crossed the threshold. otherwise do not increment up counter - else if ( dgTdiTempCounter.tdiLowTempDownCounter > 0 ) - { - dgTdiTempCounter.tdiLowTempUpCounter++; - } - - //get current reservoir value - dgTdiTempCounter.dgCurrentActiveReservoir = currentActiveRes; + isTempBelowTrigger = ( dgDialysateTemp >= ( dgTrimmerTempSet - DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE ); } - else - { - // last reservoir cycle temperature should have crossed the threshold level, - // to compute next reservoir cycle temperature rise count is greater than the previous one. - if ( (dgTdiTempCounter.prevTdiHighTempUpCounter != 0) && - (dgTdiTempCounter.tdiHighTempUpCounter >= dgTdiTempCounter.prevTdiHighTempUpCounter ) && - (dgTdiTempCounter.tdiHighTempDownCounter <= dgTdiTempCounter.prevTdiHighTempDownCounter ) ) - { - //Activate Alarm - SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, dgDialysateTemp, dgTrimmerTempSet ); - } - // Tdi low temp alarm - if ( (dgTdiTempCounter.prevTdiLowTempDownCounter != 0) && - (dgTdiTempCounter.tdiLowTempDownCounter >= dgTdiTempCounter.prevTdiLowTempDownCounter ) && - (dgTdiTempCounter.tdiLowTempUpCounter <= dgTdiTempCounter.prevTdiLowTempUpCounter ) ) - { - //Activate Alarm - SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, dgDialysateTemp, dgTrimmerTempSet ); - } - // readiness for the next reservoir cycle - dgTdiTempCounter.prevTdiHighTempUpCounter = dgTdiTempCounter.tdiHighTempUpCounter; - dgTdiTempCounter.prevTdiHighTempDownCounter = dgTdiTempCounter.tdiHighTempDownCounter; - dgTdiTempCounter.tdiHighTempUpCounter = 0; - dgTdiTempCounter.tdiHighTempDownCounter = 0; - dgTdiTempCounter.prevTdiLowTempUpCounter = dgTdiTempCounter.tdiLowTempUpCounter; - dgTdiTempCounter.prevTdiLowTempDownCounter = dgTdiTempCounter.tdiLowTempDownCounter; - dgTdiTempCounter.tdiLowTempUpCounter = 0; - dgTdiTempCounter.tdiLowTempDownCounter = 0; - - // assign last current reservoir to previous Active reservoir value once reservoir switch happened - dgTdiTempCounter.dgPrevActiveReservoir = dgTdiTempCounter.dgCurrentActiveReservoir; - } - - // check clear condition first - if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP ) ) - { - isTDiTempAboveHighSafety = ( dgDialysateTemp <= ( dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE ); - } - checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP, isTDiTempAboveHighSafety, dgDialysateTemp, dgTrimmerTempSet ); + checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, isTempBelowTrigger, dgDialysateTemp, dgTrimmerTempSet ); } } Index: firmware/App/Controllers/DGInterface.h =================================================================== diff -u -r640525dbad258a32c5dfecdc29268b432f72fb43 -r95d7d8e230da1c04c2fed2be5a43afd273d95846 --- firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision 640525dbad258a32c5dfecdc29268b432f72fb43) +++ firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision 95d7d8e230da1c04c2fed2be5a43afd273d95846) @@ -95,32 +95,13 @@ BOOL isDGUsageInfoAvailable; ///< Flag to indicate DG usage info is available. } DG_SERVICE_AND_USAGE_DATA_T; -/// Tdi High/Low temperature up/down counters when the temperature varies above/below threshold value. -typedef struct -{ - U32 tdiHighTempUpCounter; ///< tdi high temperature Up counter - U32 tdiHighTempDownCounter; ///< tdi high temperature down counter - U32 prevTdiHighTempUpCounter; ///< previous tdi high temperature Up counter - U32 prevTdiHighTempDownCounter; ///< previous tdi high temperature down counter - U32 tdiHighclearAlarmStartTime; ///< to clear temp high alarm, use persistent method - U32 tdiLowTempUpCounter; ///< tdi Low temperature Up counter - U32 tdiLowTempDownCounter; ///< tdi Low temperature down counter - U32 prevTdiLowTempUpCounter; ///< previous tdi low temperature Up counter - U32 prevTdiLowTempDownCounter; ///< previous tdi low temperature down counter - U32 tdiLowclearAlarmStartTime; ///< to clear temp low alarm, use persistent method - DG_RESERVOIR_ID_T dgPrevActiveReservoir; ///< Previous Active reservoir. - DG_RESERVOIR_ID_T dgCurrentActiveReservoir; ///< Current Active reservoir. -} DG_TDI_TEMP_COUNTER_T; - // ********** public function prototypes ********** void initDGInterface( void ); void execDGInterfaceMonitor( void ); DG_OP_MODE_T getDGOpMode( void ); -DG_TDI_TEMP_COUNTER_T getDGTdiTempCounter(void); -F32 getDGTdiTempetraure( void ); U32 getDGSubMode( void ); DG_RESERVOIR_ID_T getDGActiveReservoir( void ); DG_RESERVOIR_ID_T getDGInactiveReservoir( void ); @@ -139,7 +120,6 @@ DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void ); DG_MIXING_RATIOS_T getDGMixingRatios( void ); void getHDVersionDGServiceAndUsageData( DG_SERVICE_AND_USAGE_DATA_T* data ); -void resetTdiTempCounters (void); void setDGOpMode( U32 opMode, U32 subMode ); void setDialysateTemperatureReadings( F32 tdi, F32 tro, F32 thd ); Index: firmware/App/Modes/ModeTreatment.c =================================================================== diff -u -rc9b28951079eff02aa70fd931b926195376a4910 -r95d7d8e230da1c04c2fed2be5a43afd273d95846 --- firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision c9b28951079eff02aa70fd931b926195376a4910) +++ firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision 95d7d8e230da1c04c2fed2be5a43afd273d95846) @@ -59,8 +59,6 @@ #define TREATMENT_TIME_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) /// Interval (ms/task time) at which the treatment state data is published on the CAN bus. #define TREATMENT_STATE_DATA_PUB_INTERVAL ( 250 / TASK_GENERAL_INTERVAL ) -/// Interval (ms/task time) at which the treatment state data is published on the CAN bus. -#define TDI_TEMPERATURE_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) /// Interval (ms/task time) at which updated, valid treatment setting ranges are published on the CAN bus. #define TREATMENT_SETTINGS_RANGES_PUB_INTERVAL ( ( 60 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL ) /// Interval (ms) at which the treatment periodic data is published on the CAN bus. @@ -90,7 +88,6 @@ static U32 lastTreatmentTimeStamp; ///< Last time elapsed treatment time was recorded (a timestamp in ms). static U32 treatmentTimeBroadcastTimerCtr; ///< Treatment time data broadcast timer counter used to schedule when to transmit data. static U32 treatmentStateBroadcastTimerCtr; ///< Treatment state data broadcast timer counter used to schedule when to transmit data. -static U32 tdiTempCounterBroadcastTimerCtr; ///< TDI temperature data broadcast timer counter used to schedule when to transmit data. static U32 treatmentParamsRangesBroadcastTimerCtr; ///< Treatment parameter ranges broadcast timer counter used to schedule when to transmit updated ranges. /// Interval (in task intervals) at which to publish alarm status to CAN bus. @@ -99,8 +96,6 @@ static OVERRIDE_U32_T treatmentStatePublishInterval = { TREATMENT_STATE_DATA_PUB_INTERVAL, TREATMENT_STATE_DATA_PUB_INTERVAL, TREATMENT_STATE_DATA_PUB_INTERVAL, 0 }; /// Interval (in task intervals) at which to publish alarm status to CAN bus. static OVERRIDE_U32_T treatmentParamRangesPublishInterval = { TREATMENT_SETTINGS_RANGES_PUB_INTERVAL, TREATMENT_SETTINGS_RANGES_PUB_INTERVAL, TREATMENT_SETTINGS_RANGES_PUB_INTERVAL, 0 }; -/// Interval (in task intervals) at which to publish alarm status to CAN bus. -static OVERRIDE_U32_T tdiTemperatureCounterPublishInterval = { TDI_TEMPERATURE_DATA_PUB_INTERVAL, TDI_TEMPERATURE_DATA_PUB_INTERVAL, TDI_TEMPERATURE_DATA_PUB_INTERVAL, 0 }; static BOOL resumeTreatmentAlarmResponseRequest; ///< Flag indicates user has requested treatment resume. static BOOL initiateRinsebackAlarmResponseRequest; ///< Flag indicates user has requested rinseback. @@ -171,15 +166,13 @@ treatmentTimeBroadcastTimerCtr = TREATMENT_TIME_DATA_PUB_INTERVAL; // So we send time data immediately when we begin treatment mode treatmentStateBroadcastTimerCtr = TREATMENT_STATE_DATA_PUB_INTERVAL; // So we send state data immediately when we begin treatment mode treatmentParamsRangesBroadcastTimerCtr = TREATMENT_SETTINGS_RANGES_PUB_INTERVAL; // So we send ranges immediately when we begin treatment mode - tdiTempCounterBroadcastTimerCtr = TDI_TEMPERATURE_DATA_PUB_INTERVAL; // So we send state data immediately when we begin treatment mode presTreatmentTimeSecs = 0; presMaxUFVolumeML = 0.0; presUFRate = 0.0; resetSignalFlags(); resetAlarmSignalFlags(); - resetTdiTempCounters(); pendingParamChangesTimer = 0; pendingUFVolumeChange = 0.0; @@ -683,7 +676,6 @@ broadcastTreatmentTimeAndState(); broadcastTreatmentSettingsRanges(); broadcastTreatmentPeriodicData(); - broadcastTdiTemperatureCounters(); // Manage air trap control execAirTrapMonitorTreatment(); @@ -1469,43 +1461,6 @@ /*********************************************************************//** * @brief - * The broadcastTdiTemperatureCounters function broadcasts tdi temperature high and low - * counter variables. - * @details Inputs: tdiTempCounterBroadcastTimerCtr,dgDialysateTemp - * @details Outputs: tdiTempCounterBroadcastTimerCtr. - * @return none - *************************************************************************/ -void broadcastTdiTemperatureCounters( void ) -{ - DG_TDI_TEMP_COUNTER_T tdiTempCounter; - - // get Tdi temperature counter variables - tdiTempCounter = getDGTdiTempCounter(); - - // Broadcast treatment state data at interval - if ( ++tdiTempCounterBroadcastTimerCtr >= getU32OverrideValue( &tdiTemperatureCounterPublishInterval ) ) - { - TDI_TEMP_COUNTER_T payload; - - payload.tdiHighTempUpCntr = tdiTempCounter.tdiHighTempUpCounter; - payload.tdiHighTempDownCntr = tdiTempCounter.tdiHighTempDownCounter; - payload.prevTdiHighTempUpCntr = tdiTempCounter.prevTdiHighTempUpCounter; - payload.prevTdiHighTempDownCntr = tdiTempCounter.prevTdiHighTempDownCounter; - payload.tdiLowTempUpCntr = tdiTempCounter.tdiLowTempUpCounter; - payload.tdiLowTempDownCntr = tdiTempCounter.tdiLowTempDownCounter; - payload.prevTdiLowTempUpCntr = tdiTempCounter.prevTdiLowTempUpCounter; - payload.prevTdiLowTempDownCntr = tdiTempCounter.prevTdiLowTempDownCounter; - payload.dgCurrentActiveReservoir = (U32)tdiTempCounter.dgCurrentActiveReservoir; - payload.dgPrevActiveReservoir = (U32)tdiTempCounter.dgPrevActiveReservoir; - payload.dgTdiTemp = getDGTdiTempetraure(); - - broadcastData( MSG_ID_HD_TDI_TEMP_COUNTER_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&payload, sizeof( TDI_TEMP_COUNTER_T ) ); - tdiTempCounterBroadcastTimerCtr = 0; - } -} - -/*********************************************************************//** - * @brief * The broadcastTreatmentSettingsRanges function computes and broadcasts * updated treatment parameter ranges that the user may change during treatment. * It is assumed that prescription settings have already been set prior to calling Index: firmware/App/Modes/ModeTreatment.h =================================================================== diff -u -rc9b28951079eff02aa70fd931b926195376a4910 -r95d7d8e230da1c04c2fed2be5a43afd273d95846 --- firmware/App/Modes/ModeTreatment.h (.../ModeTreatment.h) (revision c9b28951079eff02aa70fd931b926195376a4910) +++ firmware/App/Modes/ModeTreatment.h (.../ModeTreatment.h) (revision 95d7d8e230da1c04c2fed2be5a43afd273d95846) @@ -56,22 +56,6 @@ U32 dialysisState; } TREATMENT_STATE_DATA_T; -/// Payload record structure for a tdi temperature counter message. -typedef struct -{ - U32 tdiHighTempUpCntr; - U32 tdiHighTempDownCntr; - U32 prevTdiHighTempUpCntr; - U32 prevTdiHighTempDownCntr; - U32 tdiLowTempUpCntr; - U32 tdiLowTempDownCntr; - U32 prevTdiLowTempUpCntr; - U32 prevTdiLowTempDownCntr; - U32 dgPrevActiveReservoir; - U32 dgCurrentActiveReservoir; - F32 dgTdiTemp; -} TDI_TEMP_COUNTER_T; - /// Payload record structure for an ultrafiltration volume change confirmation message. typedef struct { @@ -145,7 +129,6 @@ U32 getTreatmentEndTimeStamp( void ); // Get the treatment end time stamp void broadcastTreatmentTimeAndState( void ); // Broadcast the times and states of this treatment -void broadcastTdiTemperatureCounters( void ); // Broadcast the counter variables used in Tdi high and low temperature alarms BOOL verifyTreatmentDurationSettingChange( U32 treatmentTime ); BOOL verifyUFSettingsChange( F32 uFVolume );