First parts 2nd extruder

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 7bd94f640364b1f846ef4855ce310060eed872fa..3a1983956dc12101f42b15e70c423f8a7df10a83 100644 (file)
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -8,6 +8,7 @@
 //#define BAUDRATE 115200
 //#define BAUDRATE 230400
 
+#define EXTRUDERS 1
 
 // Frequency limit
 // See nophead's blog for more info

diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
index d765d222b6fa12093213c580dbedc0a63ad611ef..836f5aa9ab78a60c18d9ceceb2f28ba199fc5b92 100644 (file)
--- a/Marlin/Marlin.pde
+++ b/Marlin/Marlin.pde
@@ -174,7 +174,7 @@ static unsigned long stepper_inactive_time = 0;
 static unsigned long starttime=0;
 static unsigned long stoptime=0;
 
-
+static uint8_t tmp_extruder;
 
 //===========================================================================
 //=============================ROUTINES=============================
@@ -641,7 +641,6 @@ inline void process_commands()
       //processed in write to file routine above
       //card,saving = false;
       break;
-      
     #endif //SDSUPPORT
 
     case 30: //M30 take time since the start of the SD print or an M109 command
@@ -684,19 +683,36 @@ inline void process_commands()
       }
      break;
     case 104: // M104
-      if (code_seen('S')) setTargetHotend0(code_value());
+      tmp_extruder = active_extruder;
+      if(code_seen('T')) {
+        tmp_extruder = code_value();
+        if(tmp_extruder >= EXTRUDERS) {
+          SERIAL_ECHO_START;
+          SERIAL_ECHO("M104 Invalid extruder ");
+          SERIAL_ECHOLN(tmp_extruder);
+          break;
+        }
+      }
+      if (code_seen('S')) setTargetHotend(code_value(), tmp_extruder);
       setWatch();
       break;
     case 140: // M140 set bed temp
       if (code_seen('S')) setTargetBed(code_value());
       break;
     case 105 : // M105
-      //SERIAL_ECHOLN(freeMemory());
-       //test watchdog:
-       //delay(20000);
-      #if (TEMP_0_PIN > -1) || defined (HEATER_USES_AD595)
+      tmp_extruder = active_extruder;
+      if(code_seen('T')) {
+        tmp_extruder = code_value();
+        if(tmp_extruder >= EXTRUDERS) {
+          SERIAL_ECHO_START;
+          SERIAL_ECHO("M105 Invalid extruder ");
+          SERIAL_ECHOLN(tmp_extruder);
+          break;
+        }
+      }
+      #if (TEMP_0_PIN > -1) || (TEMP_2_PIN > -1)
         SERIAL_PROTOCOLPGM("ok T:");
-        SERIAL_PROTOCOL( degHotend0()); 
+        SERIAL_PROTOCOL( degHotend(tmp_extruder)); 
         #if TEMP_1_PIN > -1 
           SERIAL_PROTOCOLPGM(" B:");  
           SERIAL_PROTOCOL(degBed());
@@ -715,41 +731,51 @@ inline void process_commands()
       break;
     case 109: 
     {// M109 - Wait for extruder heater to reach target.
-        LCD_MESSAGEPGM("Heating...");   
-        #ifdef AUTOTEMP
-          autotemp_enabled=false;
-        #endif
-        if (code_seen('S')) setTargetHotend0(code_value());
-        #ifdef AUTOTEMP
-          if (code_seen('S')) autotemp_min=code_value();
-          if (code_seen('T')) autotemp_max=code_value();
-          if (code_seen('F')) 
-          {
-            autotemp_factor=code_value();
-            autotemp_enabled=true;
-          }
-        #endif
-        
-        setWatch();
-        codenum = millis(); 
-
-        /* See if we are heating up or cooling down */
-        bool target_direction = isHeatingHotend0(); // true if heating, false if cooling
-
-        #ifdef TEMP_RESIDENCY_TIME
-          long residencyStart;
-          residencyStart = -1;
-          /* continue to loop until we have reached the target temp   
-            _and_ until TEMP_RESIDENCY_TIME hasn't passed since we reached it */
-          while((target_direction ? (isHeatingHotend0()) : (isCoolingHotend0())) ||
-                  (residencyStart > -1 && (millis() - residencyStart) < TEMP_RESIDENCY_TIME*1000) ) {
-        #else
-          while ( target_direction ? (isHeatingHotend0()) : (isCoolingHotend0()&&(CooldownNoWait==false)) ) {
-        #endif //TEMP_RESIDENCY_TIME
+      tmp_extruder = active_extruder;
+      if(code_seen('T')) {
+        tmp_extruder = code_value();
+        if(tmp_extruder >= EXTRUDERS) {
+          SERIAL_ECHO_START;
+          SERIAL_ECHO("M109 Invalid extruder ");
+          SERIAL_ECHOLN(tmp_extruder);
+          break;
+        }
+      }
+      LCD_MESSAGEPGM("Heating...");   
+      #ifdef AUTOTEMP
+        autotemp_enabled=false;
+      #endif
+      if (code_seen('S')) setTargetHotend(code_value(), tmp_extruder);
+      #ifdef AUTOTEMP
+        if (code_seen('S')) autotemp_min=code_value();
+        if (code_seen('G')) autotemp_max=code_value();
+        if (code_seen('F')) 
+        {
+          autotemp_factor=code_value();
+          autotemp_enabled=true;
+        }
+      #endif
+      
+      setWatch();
+      codenum = millis(); 
+
+      /* See if we are heating up or cooling down */
+      bool target_direction = isHeatingHotend(tmp_extruder); // true if heating, false if cooling
+
+      #ifdef TEMP_RESIDENCY_TIME
+        long residencyStart;
+        residencyStart = -1;
+        /* continue to loop until we have reached the target temp   
+          _and_ until TEMP_RESIDENCY_TIME hasn't passed since we reached it */
+        while((target_direction ? (isHeatingHotend(tmp_extruder)) : (isCoolingHotend(tmp_extruder))) ||
+                (residencyStart > -1 && (millis() - residencyStart) < TEMP_RESIDENCY_TIME*1000) ) {
+      #else
+        while ( target_direction ? (isHeatingHotend(tmp_extruder)) : (isCoolingHotend(tmp_extruder)&&(CooldownNoWait==false)) ) {
+      #endif //TEMP_RESIDENCY_TIME
         if( (millis() - codenum) > 1000 ) 
         { //Print Temp Reading every 1 second while heating up/cooling down
           SERIAL_PROTOCOLPGM("T:");
-          SERIAL_PROTOCOLLN( degHotend0() ); 
+          SERIAL_PROTOCOLLN( degHotend(tmp_extruder) ); 
           codenum = millis();
         }
         manage_heater();
@@ -757,9 +783,9 @@ inline void process_commands()
         #ifdef TEMP_RESIDENCY_TIME
             /* start/restart the TEMP_RESIDENCY_TIME timer whenever we reach target temp for the first time
               or when current temp falls outside the hysteresis after target temp was reached */
-          if ((residencyStart == -1 &&  target_direction && !isHeatingHotend0()) ||
-              (residencyStart == -1 && !target_direction && !isCoolingHotend0()) ||
-              (residencyStart > -1 && labs(degHotend0() - degTargetHotend0()) > TEMP_HYSTERESIS) ) 
+          if ((residencyStart == -1 &&  target_direction && !isHeatingHotend(tmp_extruder)) ||
+              (residencyStart == -1 && !target_direction && !isCoolingHotend(tmp_extruder)) ||
+              (residencyStart > -1 && labs(degHotend(tmp_extruder) - degTargetHotend(tmp_extruder)) > TEMP_HYSTERESIS) ) 
           {
             residencyStart = millis();
           }
@@ -943,8 +969,6 @@ inline void process_commands()
     #ifdef PIDTEMP
     case 301: // M301
       {
-        
-       
         if(code_seen('P')) Kp = code_value();
         if(code_seen('I')) Ki = code_value()*PID_dT;
         if(code_seen('D')) Kd = code_value()/PID_dT;
@@ -989,6 +1013,18 @@ inline void process_commands()
 
     }
   }
+  else if(code_seen('T')) {
+    tmp_extruder = code_value();
+    if(tmp_extruder >= EXTRUDERS) {
+      SERIAL_ECHO_START;
+      SERIAL_ECHO("T");
+      SERIAL_ECHO(tmp_extruder);
+      SERIAL_ECHOLN("Invalid extruder");
+    }
+    else {
+      active_extruder = tmp_extruder;
+    }
+  }
   else
   {
     SERIAL_ECHO_START;

diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp
index bb2e2a672af42da4cf2fa37688afa56c8f9afb51..0f9b1eb9ee93a327ec0c02392926d00df7180c9c 100644 (file)
--- a/Marlin/planner.cpp
+++ b/Marlin/planner.cpp
@@ -81,6 +81,8 @@ float max_z_jerk;
 float mintravelfeedrate;
 unsigned long axis_steps_per_sqr_second[NUM_AXIS];
 
+uint8_t active_extruder = 0;
+
 // The current position of the tool in absolute steps
 long position[4];   //rescaled from extern when axis_steps_per_unit are changed by gcode
 static float previous_speed[4]; // Speed of previous path line segment

diff --git a/Marlin/planner.h b/Marlin/planner.h
index 9aa121acae94e4ea5ba3d690f6b3b68b024b10cc..57c59a0b0f2859cf6937e138b7c34bce3d772f55 100644 (file)
--- a/Marlin/planner.h
+++ b/Marlin/planner.h
@@ -94,6 +94,7 @@ extern float max_z_jerk;
 extern float mintravelfeedrate;
 extern unsigned long axis_steps_per_sqr_second[NUM_AXIS];
 
+extern uint8_t active_extruder;
 
 #ifdef AUTOTEMP
     extern bool autotemp_enabled;

diff --git a/Marlin/temperature.h b/Marlin/temperature.h
index 0f0de985f4e3ad3429a54d887fa1c2f89deab48f..e832eb6236520c733e46ce33a8bd2056d745da26 100644 (file)
--- a/Marlin/temperature.h
+++ b/Marlin/temperature.h
@@ -62,9 +62,18 @@ extern float Kp,Ki,Kd,Kc;
 inline float degHotend0(){  return analog2temp(current_raw[TEMPSENSOR_HOTEND_0]);};\r
 inline float degHotend1(){  return analog2temp(current_raw[TEMPSENSOR_HOTEND_1]);};\r
 inline float degBed() {  return analog2tempBed(current_raw[TEMPSENSOR_BED]);};\r
+inline float degHotend(uint8_t extruder){  \r
+  if(extruder == 0) return analog2temp(current_raw[TEMPSENSOR_HOTEND_0]);\r
+  if(extruder == 1) return analog2temp(current_raw[TEMPSENSOR_HOTEND_1]);\r
+};\r
 \r
 inline float degTargetHotend0() {  return analog2temp(target_raw[TEMPSENSOR_HOTEND_0]);};\r
 inline float degTargetHotend1() {  return analog2temp(target_raw[TEMPSENSOR_HOTEND_1]);};\r
+inline float degTargetHotend(uint8_t extruder){  \r
+  if(extruder == 0) return analog2temp(target_raw[TEMPSENSOR_HOTEND_0]);\r
+  if(extruder == 1) return analog2temp(target_raw[TEMPSENSOR_HOTEND_1]);\r
+};\r
+\r
 inline float degTargetBed() {   return analog2tempBed(target_raw[TEMPSENSOR_BED]);};\r
 \r
 inline void setTargetHotend0(const float &celsius) \r
@@ -75,14 +84,26 @@ inline void setTargetHotend0(const float &celsius)
   #endif //PIDTEMP\r
 };\r
 inline void setTargetHotend1(const float &celsius) {  target_raw[TEMPSENSOR_HOTEND_1]=temp2analog(celsius);};\r
+inline float setTargetHotend(const float &celcius, uint8_t extruder){  \r
+  if(extruder == 0) setTargetHotend0(celcius);\r
+  if(extruder == 1) setTargetHotend1(celcius);\r
+};\r
 inline void setTargetBed(const float &celsius)     {  target_raw[TEMPSENSOR_BED     ]=temp2analogBed(celsius);};\r
 \r
 inline bool isHeatingHotend0() {return target_raw[TEMPSENSOR_HOTEND_0] > current_raw[TEMPSENSOR_HOTEND_0];};\r
 inline bool isHeatingHotend1() {return target_raw[TEMPSENSOR_HOTEND_1] > current_raw[TEMPSENSOR_HOTEND_1];};\r
+inline float isHeatingHotend(uint8_t extruder){  \r
+  if(extruder == 0) return target_raw[TEMPSENSOR_HOTEND_0] > current_raw[TEMPSENSOR_HOTEND_0];\r
+  if(extruder == 1) return target_raw[TEMPSENSOR_HOTEND_1] > current_raw[TEMPSENSOR_HOTEND_1];\r
+};\r
 inline bool isHeatingBed() {return target_raw[TEMPSENSOR_BED] > current_raw[TEMPSENSOR_BED];};\r
 \r
 inline bool isCoolingHotend0() {return target_raw[TEMPSENSOR_HOTEND_0] < current_raw[TEMPSENSOR_HOTEND_0];};\r
 inline bool isCoolingHotend1() {return target_raw[TEMPSENSOR_HOTEND_1] < current_raw[TEMPSENSOR_HOTEND_1];};\r
+inline float isCoolingHotend(uint8_t extruder){  \r
+  if(extruder == 0) return target_raw[TEMPSENSOR_HOTEND_0] < current_raw[TEMPSENSOR_HOTEND_0];\r
+  if(extruder == 1) return target_raw[TEMPSENSOR_HOTEND_1] < current_raw[TEMPSENSOR_HOTEND_1];\r
+};\r
 inline bool isCoolingBed() {return target_raw[TEMPSENSOR_BED] < current_raw[TEMPSENSOR_BED];};\r
 \r
 void disable_heater();\r