Merge branch 'heat_hold_fix' into 7.5

Conflicts: firmware/current_version.txt
dglassinc · Sep 5, 2013 · 85c35db · 85c35db
2 parents f96d154 + 4bae930
commit 85c35db
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/firmware/current_version.txt b/firmware/current_version.txt
@@ -1,5 +1,6 @@
 7.5.1.1.0
  * Removal of dual filament loading for Rep2X startup script
+ * Fix for Heat Hold not being handled properly
 7.4.1.1.0
  * Fix for build time rollover bug, 
  * Added fix for the button array setup

diff --git a/firmware/src/MightyBoard/Motherboard/Host.cc b/firmware/src/MightyBoard/Motherboard/Host.cc
@@ -680,7 +680,7 @@ sdcard::SdErrorCode startBuildFromSD() {
 	command::reset();
 	steppers::abort();
 	steppers::reset();
-	Motherboard::getBoard().state_reset();
+	Motherboard::getBoard().state_reset(false);
 
 	currentState = HOST_STATE_BUILDING_FROM_SD;
 	return e;

diff --git a/firmware/src/MightyBoard/Motherboard/Motherboard.cc b/firmware/src/MightyBoard/Motherboard/Motherboard.cc
@@ -239,7 +239,7 @@ void Motherboard::reset(bool hard_reset) {
 
 
 
-	state_reset();
+	state_reset(hard_reset);
 
 
 	// pop the splash screen unless we are showing the welcome script
@@ -253,7 +253,7 @@ void Motherboard::reset(bool hard_reset) {
 
 
 /// State reset, used to reset variables needed for printing
-void Motherboard::state_reset() {
+void Motherboard::state_reset(bool hard_reset) {
 
 
 	board_status = STATUS_NONE;
@@ -272,7 +272,11 @@ void Motherboard::state_reset() {
 	// disable platform heater if no HBP
 	platform_heater.disable(!eeprom::hasHBP());
 
-	user_input_timeout.start(restart_timeout);
+	resetUserInputTimeout();
+	//Don't start the heat hold timeout on a hard reset(power on)
+	if(!hard_reset){
+		resetHeatHoldTimeout();
+	}
 
 	RGB_LED::setDefaultColor(); 
 	buttonWait = false;	
@@ -552,7 +556,7 @@ void Motherboard::runMotherboardSlice() {
 
 	// if no user input for USER_INPUT_TIMEOUT, shutdown heaters and warn user
 	// don't do this if a heat failure has occured ( in this case heaters are already shutdown and separate error messaging used)
-	if(user_input_timeout.hasElapsed() && !heatShutdown && (host::getHostState() != host::HOST_STATE_BUILDING_FROM_SD) && (host::getHostState() != host::HOST_STATE_BUILDING))
+	if((heat_hold_timeout.hasElapsed() || user_input_timeout.hasElapsed()) && !heatShutdown && (host::getHostState() != host::HOST_STATE_BUILDING_FROM_SD) && (host::getHostState() != host::HOST_STATE_BUILDING))
 	{
 
 		board_status |= STATUS_HEAT_INACTIVE_SHUTDOWN;
@@ -574,8 +578,15 @@ void Motherboard::runMotherboardSlice() {
 		Extruder_Two.getExtruderHeater().set_target_temperature(0);
 		platform_heater.set_target_temperature(0);
 
-		// clear timeout
-		user_input_timeout.clear();
+		// clear timeouts
+		if(user_input_timeout.hasElapsed()){
+			user_input_timeout.clear();
+		}
+		if(heat_hold_timeout.hasElapsed()){
+			//clear and abort so the heat doesn't hold till the next print
+			heat_hold_timeout.clear();
+			heat_hold_timeout.abort();
+		}
 	}
 
 	// respond to heatshutdown.  response only needs to be called once
@@ -669,6 +680,9 @@ void Motherboard::runMotherboardSlice() {
 void Motherboard::resetUserInputTimeout(){
 	user_input_timeout.start(USER_INPUT_TIMEOUT);
 }
+void Motherboard::resetHeatHoldTimeout(){
+	heat_hold_timeout.start(restart_timeout);
+}
 
 //Frequency of Timer 2
 //100 = (1.0 / ( 16MHz / 64 / 25 = 10KHz)) * 1000000

diff --git a/firmware/src/MightyBoard/Motherboard/Motherboard.hh b/firmware/src/MightyBoard/Motherboard/Motherboard.hh
@@ -87,6 +87,7 @@ private:
   // TODO: Move this to an interface board slice.
 	Timeout interface_update_timeout;
 	Timeout user_input_timeout;
+	Timeout heat_hold_timeout;
 #ifdef MODEL_REPLICATOR2
 	Timeout therm_sensor_timeout;
 	ThermocoupleReader therm_sensor;
@@ -141,7 +142,7 @@ public:
 	void reset(bool hard_reset);
 
 	/// State reset, used to reset variables needed for printing
-	void state_reset();
+	void state_reset(bool hard_reset);
 
 	/// initialize things that only need to be set up once, on boot
 	void init();
@@ -172,6 +173,7 @@ public:
 	void setExtra(bool on);
 
 	void resetUserInputTimeout();
+	void resetHeatHoldTimeout();
 	void startButtonWait();
 	void heaterFail(HeaterFailMode mode);
 	/// push an error screen, and wait until button