correcting commit errors.

diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index 07dd0d8bf17bcb6086e992ace53d75f50fe310e3..e56b67128ec90d656f45c31e9ec2cf374c1ee748 100644 (file)
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -79,18 +79,6 @@ extern float homing_feedrate[];
 extern bool axis_relative_modes[];
 
 
-inline void kill()
-{
-  disable_heater();
-
-  disable_x();
-  disable_y();
-  disable_z();
-  disable_e();
-  
-  if(PS_ON_PIN > -1) pinMode(PS_ON_PIN,INPUT);
-  Serial.println("!! Printer halted. kill() called !!");
-  while(1); // Wait for reset
-}
+void kill();
 
 #endif

diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
index 6a6fb80f43e1ddb8570e580857c882caecbf865a..1c79af6cadb869abcdd37c6d9af9352de464b2b6 100644 (file)
--- a/Marlin/Marlin.pde
+++ b/Marlin/Marlin.pde
@@ -1278,3 +1278,18 @@ void manage_inactivity(byte debug) {
   check_axes_activity();
 }
 
+void kill()
+{
+  disable_heater();
+
+  disable_x();
+  disable_y();
+  disable_z();
+  disable_e();
+  
+  if(PS_ON_PIN > -1) pinMode(PS_ON_PIN,INPUT);
+  Serial.println("!! Printer halted. kill() called !!");
+  while(1); // Wait for reset
+}
+
+

diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp
index 0c5a2e4ce2cf3b89e0eb959374f1efe9f4d64b51..14530ca3f6f2480022dcb6756a6b78a849b1fe6c 100644 (file)
--- a/Marlin/temperature.cpp
+++ b/Marlin/temperature.cpp
@@ -36,6 +36,7 @@
 #include "ultralcd.h"\r
 #include "streaming.h"\r
 #include "temperature.h"\r
+#include "watchdog.h"\r
 \r
 \r
 int target_raw[3] = {0, 0, 0};\r
@@ -350,6 +351,28 @@ void setWatch()
 }\r
 \r
 \r
+void disable_heater()\r
+{\r
+   #if TEMP_0_PIN > -1\r
+  target_raw[0]=0;\r
+   #if HEATER_0_PIN > -1  \r
+     WRITE(HEATER_0_PIN,LOW);\r
+   #endif\r
+  #endif\r
+  #if TEMP_1_PIN > -1\r
+  target_raw[1]=0;\r
+  #if HEATER_1_PIN > -1 \r
+    WRITE(HEATER_1_PIN,LOW);\r
+  #endif\r
+  #endif\r
+  #if TEMP_2_PIN > -1\r
+  target_raw[2]=0;\r
+  #if HEATER_2_PIN > -1  \r
+    WRITE(HEATER_2_PIN,LOW);\r
+  #endif\r
+  #endif \r
+}\r
+\r
 // Timer 0 is shared with millies\r
 ISR(TIMER0_COMPB_vect)\r
 {\r

diff --git a/Marlin/temperature.h b/Marlin/temperature.h
index fcc8edb9ea63c6cf60f933cdaad6924c5493ddd9..44d54db141e5bcda9a3116a54e9cfab3d052343d 100644 (file)
--- a/Marlin/temperature.h
+++ b/Marlin/temperature.h
@@ -42,7 +42,7 @@ extern int target_raw[3];
 extern int current_raw[3];\r
 extern float Kp,Ki,Kd,Kc;\r
 #ifdef PIDTEMP\r
-  float pid_setpoint = 0.0;\r
+  extern float pid_setpoint ;\r
 #endif\r
 #ifdef WATCHPERIOD\r
   extern int watch_raw[3] ;\r
@@ -81,38 +81,9 @@ inline bool isCoolingHotend0() {return target_raw[TEMPSENSOR_HOTEND_0] < current
 inline bool isCoolingHotend1() {return target_raw[TEMPSENSOR_HOTEND_1] < current_raw[TEMPSENSOR_HOTEND_1];};\r
 inline bool isCoolingBed() {return target_raw[TEMPSENSOR_BED] < current_raw[TEMPSENSOR_BED];};\r
 \r
-inline void disable_heater()\r
-{\r
-   #if TEMP_0_PIN > -1\r
-  target_raw[0]=0;\r
-   #if HEATER_0_PIN > -1  \r
-     WRITE(HEATER_0_PIN,LOW);\r
-   #endif\r
-  #endif\r
-  #if TEMP_1_PIN > -1\r
-  target_raw[1]=0;\r
-  #if HEATER_1_PIN > -1 \r
-    WRITE(HEATER_1_PIN,LOW);\r
-  #endif\r
-  #endif\r
-  #if TEMP_2_PIN > -1\r
-  target_raw[2]=0;\r
-  #if HEATER_2_PIN > -1  \r
-    WRITE(HEATER_2_PIN,LOW);\r
-  #endif\r
-  #endif \r
-}\r
-void setWatch() {  \r
-  if(isHeatingHotend0())\r
-  {\r
-    watchmillis = max(1,millis());\r
-    watch_raw[TEMPSENSOR_HOTEND_0] = current_raw[TEMPSENSOR_HOTEND_0];\r
-  }\r
-  else\r
-  {\r
-    watchmillis = 0;\r
-  } \r
-}\r
+void disable_heater();\r
+void setWatch();\r
+\r
 #ifdef HEATER_0_USES_THERMISTOR\r
     #define HEATERSOURCE 1\r
 #endif\r

diff --git a/Marlin/watchdog.h b/Marlin/watchdog.h
index 2577bc1384381f6a6436bda388c0a1989794d05c..7dd31f9f7e4117d5dd570b83d7595e50cd7168cb 100644 (file)
--- a/Marlin/watchdog.h
+++ b/Marlin/watchdog.h
@@ -1,10 +1,13 @@
 #ifndef __WATCHDOGH
 #define __WATCHDOGH
-#ifdef
+#include "Configuration.h"
+//#ifdef USE_WATCHDOG
+
 /// intialise watch dog with a 1 sec interrupt time
 void wd_init();
 /// pad the dog/reset watchdog. MUST be called at least every second after the first wd_init or avr will go into emergency procedures..
 void wd_reset();
 
+//#endif
 
 #endif

diff --git a/Marlin/watchdog.cpp b/Marlin/watchdog.pde
similarity index 98%
rename from Marlin/watchdog.cpp
rename to Marlin/watchdog.pde
index 0adf9cc7d7c9a958a5b0d8386ac34702dea49d83..4c677e79e3782cbbdd705c11d0338299190d5370 100644 (file)
--- a/Marlin/watchdog.cpp
+++ b/Marlin/watchdog.pde
@@ -1,5 +1,5 @@
 #ifdef USE_WATCHDOG
-
+#include "watchdog.h"
 #include  <avr/wdt.h>
 #include  <avr/interrupt.h>
 

diff --git a/watchdog.cpp b/watchdog.cpp
deleted file mode 100644 (file)
index 0adf9cc..0000000
--- a/watchdog.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifdef USE_WATCHDOG
-
-#include  <avr/wdt.h>
-#include  <avr/interrupt.h>
-
-volatile uint8_t timeout_seconds=0;
-
-void(* ctrlaltdelete) (void) = 0; //does not work on my atmega2560
-
-//Watchdog timer interrupt, called if main program blocks >1sec
-ISR(WDT_vect) 
-{ 
-  if(timeout_seconds++ >= WATCHDOG_TIMEOUT)
-  {
- 
-    #ifdef RESET_MANUAL
-      LCD_MESSAGE("Please Reset!");
-      ECHOLN("echo_: Something is wrong, please turn off the printer.");
-    #else
-      LCD_MESSAGE("Timeout, resetting!");
-    #endif 
-    //disable watchdog, it will survife reboot.
-    WDTCSR |= (1<<WDCE) | (1<<WDE);
-    WDTCSR = 0;
-    #ifdef RESET_MANUAL
-      kill(); //kill blocks
-      while(1); //wait for user or serial reset
-    #else
-      ctrlaltdelete();
-    #endif
-  }
-}
-
-/// intialise watch dog with a 1 sec interrupt time
-void wd_init() 
-{
-  WDTCSR = (1<<WDCE )|(1<<WDE ); //allow changes
-  WDTCSR = (1<<WDIF)|(1<<WDIE)| (1<<WDCE )|(1<<WDE )|  (1<<WDP2 )|(1<<WDP1)|(0<<WDP0);
-}
-
-/// reset watchdog. MUST be called every 1s after init or avr will reset.
-void wd_reset() 
-{
-  wdt_reset();
-  timeout_seconds=0; //reset counter for resets
-}
-
-#endif /* USE_WATCHDOG */

diff --git a/watchdog.h b/watchdog.h
deleted file mode 100644 (file)
index 2577bc1..0000000
--- a/watchdog.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __WATCHDOGH
-#define __WATCHDOGH
-#ifdef
-/// intialise watch dog with a 1 sec interrupt time
-void wd_init();
-/// pad the dog/reset watchdog. MUST be called at least every second after the first wd_init or avr will go into emergency procedures..
-void wd_reset();
-
-
-#endif