Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -r96f8a305d3253904a4355cae78614a9333249896 -r095866efd8f10bdead490578e7584051d79292f0 --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 96f8a305d3253904a4355cae78614a9333249896) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 095866efd8f10bdead490578e7584051d79292f0) @@ -78,7 +78,6 @@ #define HEATERS_MAX_VOLTAGE_OUT_OF_RANGE_TOL 0.2F ///< Heaters max voltage out of range tolerance. #define D5_HEATER_DEADBAND_CONTROL 0.1F ///< Heater dead band range for control. -//#define D5_HEAT_CONTROL_INTERVAL_MS 30000 /// Primary heater control interval in milli seconds #define D5_HEAT_CONTROL_INTERVAL_MS 3000 /// Primary heater control interval in milli seconds #define D5_HEAT_CONTROL_INTERVAL_COUNT ( D5_HEAT_CONTROL_INTERVAL_MS / TASK_GENERAL_INTERVAL ) ///< Primary heater control interval count. #define D45_HEAT_CONTROL_INTERVAL_MS ( 1 * MS_PER_SECOND ) ///< Trimmer heater control interval in milli seconds @@ -607,7 +606,9 @@ if ( ++primaryTargetTempAdjCounter >= d5OuterLoopControlInterval ) { #ifdef __USE_D1_TEMP_ + // Use new RTD sensor placed closed to dialyzer, connected to D1 port + measuredTempAtDialyzer = getFilteredTemperatureValue( D1_TEMP ); #else if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) ) @@ -888,18 +889,7 @@ isLevelLow = ( ( getLevelStatus( D46_LEVL ) != LEVEL_STATE_LOW ) ? FALSE : TRUE ); } - // Disable alarm if test config enabled for D45 heater conductive level check. - if ( D5_HEAT == heater ) - { - checkPersistentAlarm( alarm, isLevelLow, 0.0F, 0.0F ); - } - else - { - if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_CONDUCTIVE_LEVEL_SENSOR_ERROR ) != TRUE ) - { - checkPersistentAlarm( alarm, isLevelLow, 0.0F, 0.0F ); - } - } + checkPersistentAlarm( alarm, isLevelLow, 0.0F, 0.0F ); } else {