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