From 7005c6d6852082e54af8e7df7b7382b43d6a4365 Mon Sep 17 00:00:00 2001
From: PavelSindler <sindlerpa@gmail.com>
Date: Tue, 6 Jun 2017 10:51:01 +0200
Subject: [PATCH] selftest for heater/heatbed thermistor updated (prolonged
 heating times, changed target temperature for heater)

---
 Firmware/Marlin_main.cpp |  2 +-
 Firmware/ultralcd.cpp    | 24 +++++++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 1f5466b18..aab1abc89 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -2754,7 +2754,7 @@ void process_commands()
             clean_up_after_endstop_move();
         }
         break;
-
+	
 
 	case 75:
 	{
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 515cd88bb..2884a248c 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4122,7 +4122,7 @@ static void lcd_selftest()
 	}
 
 	if (_result)
-	{
+	{		
 		_progress = lcd_selftest_screen(5, _progress, 3, true, 2000);
 		_result = lcd_selfcheck_check_heater(true);
 	}
@@ -4339,9 +4339,9 @@ static bool lcd_selfcheck_check_heater(bool _isbed)
 
 	int _checked_snapshot = (_isbed) ? degBed() : degHotend(0);
 	int _opposite_snapshot = (_isbed) ? degHotend(0) : degBed();
-	int _cycles = (_isbed) ? 120 : 30;
+	int _cycles = (_isbed) ? 180 : 60; //~ 90s / 30s
 
-	target_temperature[0] = (_isbed) ? 0 : 100;
+	target_temperature[0] = (_isbed) ? 0 : 200;
 	target_temperature_bed = (_isbed) ? 100 : 0;
 	manage_heater();
 	manage_inactivity(true);
@@ -4353,8 +4353,16 @@ static bool lcd_selfcheck_check_heater(bool _isbed)
 		manage_heater();
 		manage_inactivity(true);
 		_progress = (_isbed) ? lcd_selftest_screen(5, _progress, 2, false, 400) : lcd_selftest_screen(1, _progress, 2, false, 400);
+		/*if (_isbed) {
+			MYSERIAL.print("Bed temp:");
+			MYSERIAL.println(degBed());
+		}
+		else {
+			MYSERIAL.print("Hotend temp:");
+			MYSERIAL.println(degHotend(0));
+		}*/
 
-	} while (_docycle);
+	} while (_docycle); 
 
 	target_temperature[0] = 0;
 	target_temperature_bed = 0;
@@ -4362,7 +4370,13 @@ static bool lcd_selfcheck_check_heater(bool _isbed)
 
 	int _checked_result = (_isbed) ? degBed() - _checked_snapshot : degHotend(0) - _checked_snapshot;
 	int _opposite_result = (_isbed) ? degHotend(0) - _opposite_snapshot : degBed() - _opposite_snapshot;
-
+	/*
+	MYSERIAL.println("");
+	MYSERIAL.print("Checked result:");
+	MYSERIAL.println(_checked_result);
+	MYSERIAL.print("Opposite result:");
+	MYSERIAL.println(_opposite_result);
+	*/
 	if (_opposite_result < ((_isbed) ? 10 : 3))
 	{
 		if (_checked_result >= ((_isbed) ? 3 : 10))