Fix

MarlinKimbra/Conditionals.h

@@ -368,11 +368,11 @@
   /**
    * Shorthand for pin tests, for temperature.cpp
    */
-  #define HAS_TEMP_0 (defined(TEMP_0_PIN) && TEMP_0_PIN >= 0)
-  #define HAS_TEMP_1 (defined(TEMP_1_PIN) && TEMP_1_PIN >= 0)
-  #define HAS_TEMP_2 (defined(TEMP_2_PIN) && TEMP_2_PIN >= 0)
-  #define HAS_TEMP_3 (defined(TEMP_3_PIN) && TEMP_3_PIN >= 0)
-  #define HAS_TEMP_BED (defined(TEMP_BED_PIN) && TEMP_BED_PIN >= 0)
+  #define HAS_TEMP_0 (defined(TEMP_0_PIN) && (TEMP_0_PIN >= 0) && TEMP_SENSOR_0)
+  #define HAS_TEMP_1 (defined(TEMP_1_PIN) && (TEMP_1_PIN >= 0) && TEMP_SENSOR_1)
+  #define HAS_TEMP_2 (defined(TEMP_2_PIN) && (TEMP_2_PIN >= 0) && TEMP_SENSOR_2)
+  #define HAS_TEMP_3 (defined(TEMP_3_PIN) && (TEMP_3_PIN >= 0) && TEMP_SENSOR_3)
+  #define HAS_TEMP_BED ((defined(TEMP_BED_PIN) && TEMP_BED_PIN >= 0) && TEMP_SENSOR_BED)
   #define HAS_FILAMENT_SENSOR (defined(FILAMENT_SENSOR) && defined(FILWIDTH_PIN) && FILWIDTH_PIN >= 0)
   #define HAS_POWER_CONSUMPTION_SENSOR (defined(POWER_CONSUMPTION) && defined(POWER_CONSUMPTION_PIN) && POWER_CONSUMPTION_PIN >= 0)
   #define HAS_HEATER_0 (defined(HEATER_0_PIN) && HEATER_0_PIN >= 0)

MarlinKimbra/Configuration.h

@@ -128,48 +128,51 @@
 //===========================================================================
 
 //================================ Thermistor ===============================
-// Standard 4.7kohm pull up tables
+//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
+//
+//// Temperature sensor settings:
+// -2 is thermocouple with MAX6675 (only for sensor 0)
+// -1 is thermocouple with AD595
+// 0 is not used
+// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
+// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
+// 3 is Mendel-parts thermistor (4.7k pullup)
+// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
+// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
+// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
+// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
+// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
+// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
+// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
+// 10 is 100k RS thermistor 198-961 (4.7k pullup)
+// 11 is 100k beta 3950 1% thermistor (4.7k pullup)
+// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
+// 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE" 
+// 20 is the PT100 circuit found in the Ultimainboard V2.x
+// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
+//
+//    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
+//                          (but gives greater accuracy and more stable PID)
+// 51 is 100k thermistor - EPCOS (1k pullup)
+// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
+// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
 //
-//   -2 is thermocouple with MAX6675 (only for sensor 0)
-//   -1 is thermocouple with AD595
-//    0  is not used
-//    1  is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
-//    2  is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
-//    3  is Mendel-parts thermistor (4.7k pullup)
-//    4  is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
-//    5  is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
-//    6  is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
-//    7  is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
-//   71  is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
-//    8  is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
-//    9  is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
-//   10 is 100k RS thermistor 198-961 (4.7k pullup)
-//   11 is 100k beta 3950 1% thermistor (4.7k pullup)
-//   12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
-//   13 is 100k Hisens 3950  1% up to 300 degC for hotend "Simple ONE " & "Hotend "All In ONE" 
-//   20 is the PT100 circuit found in the Ultimainboard V2.x
-//   60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
 // 1047 is Pt1000 with 4k7 pullup
 // 1010 is Pt1000 with 1k pullup (non standard)
-//  147 is Pt100 with 4k7 pullup
-//  110 is Pt100 with 1k pullup (non standard)
-
-// 1 kohm pullup tables
-// ATTENTION: This is not normal, you would have to have changed out your 4.7k for 1k
-// This gives greater accuracy and more stable PID
-//
-//   51 is 100k thermistor - EPCOS (1k pullup)
-//   52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
-//   55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
+// 147 is Pt100 with 4k7 pullup
+// 110 is Pt100 with 1k pullup (non standard)
+// 998 and 999 are Dummy Tables. They will ALWAYS read 25�C or the temperature defined below. 
+//     Use it for Testing or Development purposes. NEVER for production machine.
+//     #define DUMMY_THERMISTOR_998_VALUE 25
+//     #define DUMMY_THERMISTOR_999_VALUE 100
 
 #define TEMP_SENSOR_0 1
 #define TEMP_SENSOR_1 0
 #define TEMP_SENSOR_2 0
 #define TEMP_SENSOR_3 0
-#define TEMP_SENSOR_BED 0
+#define TEMP_SENSOR_BED 1
 
-// This makes temp sensor 1 a redundant sensor for sensor 0.
-// If the temperatures difference between these sensors is to high the print will be aborted.
+// This makes temp sensor 1 a redundant sensor for sensor 0. If the temperatures difference between these sensors is to high the print will be aborted.
 //#define TEMP_SENSOR_1_AS_REDUNDANT
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10 // (degC)
 
@@ -196,7 +199,7 @@
 #define HEATER_3_MAXTEMP 275 // (degC)
 #define BED_MAXTEMP      150 // (degC)
 
-// If your bed has low resistance e.g. 0.6 ohm and throws the fuse you can duty cycle it to reduce the
+// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the
 // average current. The value should be an integer and the heat bed will be turned on for 1 interval of
 // HEATER_BED_DUTY_CYCLE_DIVIDER intervals.
 //#define HEATER_BED_DUTY_CYCLE_DIVIDER 4
@@ -237,7 +240,7 @@
 // Select PID or bang-bang with PIDTEMPBED. If bang-bang, BED_LIMIT_SWITCHING will enable hysteresis
 //
 // Uncomment this to enable PID on the bed. It uses the same frequency PWM as the extruder.
-// If your PID_dT above is the default, and correct for your hardware/configuration, that means 7.689Hz,
+// If your PID_dT is the default, and correct for your hardware/configuration, that means 7.689Hz,
 // which is fine for driving a square wave into a resistive load and does not significantly impact you FET heating.
 // This also works fine on a Fotek SSR-10DA Solid State Relay into a 250W heater.
 // If your configuration is significantly different than this and you don't understand the issues involved, you probably
@@ -253,22 +256,25 @@
 // so you shouldn't use it unless you are OK with PWM on your bed.  (see the comment on enabling PIDTEMPBED)
 #define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current
 
+//#define PID_BED_DEBUG // Sends debug data to the serial port.
+
 #ifdef PIDTEMPBED
-  //#define PID_BED_DEBUG // Sends debug data to the serial port.
-  // 120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
-  // from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of 0.15 (vs 0.1, 1, 10)
-  #define DEFAULT_bedKp 10.00
-  #define DEFAULT_bedKi 0.023
-  #define DEFAULT_bedKd 305.4
-
-  // 120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
-  // From pidautotune:
-  //#define DEFAULT_bedKp 97.1
-  //#define DEFAULT_bedKi 1.41
-  //#define DEFAULT_bedKd 1675.16
-  // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
+//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
+//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
+    #define  DEFAULT_bedKp 10.00
+    #define  DEFAULT_bedKi .023
+    #define  DEFAULT_bedKd 305.4
+
+//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
+//from pidautotune
+//    #define  DEFAULT_bedKp 97.1
+//    #define  DEFAULT_bedKi 1.41
+//    #define  DEFAULT_bedKd 1675.16
+
+// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
 #endif // PIDTEMPBED
 
+
 //this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
 //can be software-disabled for whatever purposes by
 #define PREVENT_DANGEROUS_EXTRUDE

MarlinKimbra/Configuration_adv.h

@@ -367,7 +367,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
 
 // Add support for experimental filament exchange support M600; requires display
 #ifdef ULTIPANEL
-  #define FILAMENTCHANGEENABLE
+  //#define FILAMENTCHANGEENABLE
   #ifdef FILAMENTCHANGEENABLE
     #define FILAMENTCHANGE_XPOS 3
     #define FILAMENTCHANGE_YPOS 3
@@ -377,13 +377,6 @@ const unsigned int dropsegments=5; //everything with less than this number of st
   #endif
 #endif
 
-#ifdef FILAMENTCHANGEENABLE
-  #ifdef EXTRUDER_RUNOUT_PREVENT
-    #error EXTRUDER_RUNOUT_PREVENT currently incompatible with FILAMENTCHANGE
-  #endif
-#endif
-
-
 /******************************************************************************\
  * enable this section if you have TMC26X motor drivers. 
  * you need to import the TMC26XStepper library into the arduino IDE for this

MarlinKimbra/Marlin.h

@@ -22,6 +22,12 @@
 #include "Configuration.h"
 #include "pins.h"
 
+#if (ARDUINO >= 100)
+  #include "Arduino.h"
+#else
+  #include "WProgram.h"
+#endif
+
 #define BIT(b) (1<<(b))
 #define TEST(n,b) (((n)&BIT(b))!=0)
 
@@ -205,8 +211,8 @@ extern float delta_tower2_x,delta_tower2_y;
 extern float delta_tower3_x,delta_tower3_y;
 #endif
 #ifdef SCARA
-void calculate_delta(float cartesian[3]);
-void calculate_SCARA_forward_Transform(float f_scara[3]);
+  void calculate_delta(float cartesian[3]);
+  void calculate_SCARA_forward_Transform(float f_scara[3]);
 #endif
 void prepare_move();
 void kill();
@@ -283,10 +289,10 @@ extern int fanSpeed;
 #endif
 
 #ifdef FAN_SOFT_PWM
-extern unsigned char fanSpeedSoftPwm;
+  extern unsigned char fanSpeedSoftPwm;
 #endif
 
-#if defined(FILAMENT_SENSOR) && defined(FILWIDTH_PIN) && (FILWIDTH_PIN >= 0)
+#if HAS_FILAMENT_SENSOR
   extern float filament_width_nominal;    //holds the theoretical filament diameter ie., 3.00 or 1.75
   extern bool filament_sensor;            //indicates that filament sensor readings should control extrusion
   extern float filament_width_meas;       //holds the filament diameter as accurately measured
@@ -296,7 +302,7 @@ extern unsigned char fanSpeedSoftPwm;
   extern int meas_delay_cm;               //delay distance
 #endif
 
-#if (defined(POWER_CONSUMPTION) && defined(POWER_CONSUMPTION_PIN) && POWER_CONSUMPTION_PIN >= 0)
+#if HAS_POWER_CONSUMPTION_SENSOR
   extern float power_consumption_meas;          //holds the power consumption as accurately measured
   extern unsigned long power_consumption_hour;  //holds the power consumption per hour as accurately measured
 #endif

MarlinKimbra/SanityCheck.h

@@ -128,13 +128,13 @@
 
       // Make sure probing points are reachable
       #if LEFT_PROBE_BED_POSITION < MIN_PROBE_X
-        #error The given LEFT_PROBE_BED_POSITION can't be reached by the probe.
+        #error The given LEFT_PROBE_BED_POSITION can not be reached by the probe.
       #elif RIGHT_PROBE_BED_POSITION > MAX_PROBE_X
-        #error The given RIGHT_PROBE_BED_POSITION can't be reached by the probe.
+        #error The given RIGHT_PROBE_BED_POSITION can not be reached by the probe.
       #elif FRONT_PROBE_BED_POSITION < MIN_PROBE_Y
-        #error The given FRONT_PROBE_BED_POSITION can't be reached by the probe.
+        #error The given FRONT_PROBE_BED_POSITION can not be reached by the probe.
       #elif BACK_PROBE_BED_POSITION > MAX_PROBE_Y
-        #error The given BACK_PROBE_BED_POSITION can't be reached by the probe.
+        #error The given BACK_PROBE_BED_POSITION can not be reached by the probe.
       #endif
 
       #define PROBE_SIZE_X (X_PROBE_OFFSET_FROM_EXTRUDER * (AUTO_BED_LEVELING_GRID_POINTS-1))

MarlinKimbra/cardreader.h

-#ifndef __CARDREADER_H
-#define __CARDREADER_H
+#ifndef CARDREADER_H
+#define CARDREADER_H
 
 #ifdef SDSUPPORT
 

MarlinKimbra/language.h

@@ -7,7 +7,7 @@
 //   ==> ALSO TRY ALL AVAILABLE "LANGUAGE_CHOICE" OPTIONS
 
 // Languages
-// 1  English
+// 1  English  // Language base
 // 2  Polish
 // 3  French
 // 4  German
@@ -109,6 +109,7 @@
 #define MSG_UNKNOWN_COMMAND                 "Unknown command: \""
 #define MSG_ACTIVE_EXTRUDER                 "Active Extruder: "
 #define MSG_INVALID_EXTRUDER                "Invalid extruder"
+#define MSG_INVALID_SOLENOID                "Invalid solenoid"
 #define MSG_X_MIN                           "x_min: "
 #define MSG_X_MAX                           "x_max: "
 #define MSG_Y_MIN                           "y_min: "
@@ -248,9 +249,9 @@
 #define TESTSTRING360 "\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377"
 */
 
-#if   LANGUAGE_CHOICE == 1 // English
-  #include "language_en.h"
-#elif LANGUAGE_CHOICE == 2 // Polish
+#include "language_en.h" // English
+
+#if LANGUAGE_CHOICE == 2 // Polish
   #include "language_pl.h"
 #elif LANGUAGE_CHOICE == 3 // French
   #include "language_fr.h"

MarlinKimbra/planner.cpp

@@ -524,7 +524,7 @@ float junction_deviation = 0.1;
           #ifdef EASY_LOAD
             if (!allow_lengthy_extrude_once) {
           #endif
-          position[E_AXIS] = target[E_AXIS]; //behave as if the move really took place, but ignore E part
+          position[E_AXIS] = target[E_AXIS]; // Behave as if the move really took place, but ignore E part
           SERIAL_ECHO_START;
           SERIAL_ECHOLNPGM(MSG_ERR_LONG_EXTRUDE_STOP);
           #ifdef EASY_LOAD

MarlinKimbra/planner.h

@@ -26,10 +26,6 @@
 
 #include "Marlin.h"
 
-#ifdef ENABLE_AUTO_BED_LEVELING
-#include "vector_3.h"
-#endif // ENABLE_AUTO_BED_LEVELING
-
 // This struct is used when buffering the setup for each linear movement "nominal" values are as specified in 
 // the source g-code and may never actually be reached if acceleration management is active.
 typedef struct {
@@ -127,6 +123,8 @@ extern unsigned long axis_steps_per_sqr_second[3 + EXTRUDERS];
 #endif
 
 extern block_t block_buffer[BLOCK_BUFFER_SIZE];            // A ring buffer for motion instructions
+extern volatile unsigned char block_buffer_head;           // Index of the next block to be pushed
+extern volatile unsigned char block_buffer_tail; 
 
 // Returns true if the buffer has a queued block, false otherwise
 FORCE_INLINE bool blocks_queued() { return (block_buffer_head != block_buffer_tail); }

MarlinKimbra/stepper.cpp

@@ -33,7 +33,6 @@
   #include <SPI.h>
 #endif
 
-
 //===========================================================================
 //============================= public variables ============================
 //===========================================================================
@@ -86,6 +85,7 @@ static volatile bool endstop_z_hit = false;
 #ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
   bool abort_on_endstop_hit = false;
 #endif
+
 #ifdef MOTOR_CURRENT_PWM_XY_PIN
   int motor_current_setting[3] = DEFAULT_PWM_MOTOR_CURRENT;
 #endif
@@ -145,9 +145,6 @@ volatile signed char count_direction[NUM_AXIS] = { 1, 1, 1, 1 };
 
 #ifdef Z_DUAL_STEPPER_DRIVERS
   #define Z_APPLY_DIR(v,Q) { Z_DIR_WRITE(v); Z2_DIR_WRITE(v); }
-<<<<<<< HEAD
-  #define Z_APPLY_STEP(v,Q) { Z_STEP_WRITE(v); Z2_STEP_WRITE(v); }
-=======
   #ifdef Z_DUAL_ENDSTOPS
     #define Z_APPLY_STEP(v,Q) \
     if (performing_homing) { \
@@ -165,7 +162,6 @@ volatile signed char count_direction[NUM_AXIS] = { 1, 1, 1, 1 };
   #else
     #define Z_APPLY_STEP(v,Q) Z_STEP_WRITE(v), Z2_STEP_WRITE(v)
   #endif
->>>>>>> origin/master
 #else
   #define Z_APPLY_DIR(v,Q) Z_DIR_WRITE(v)
   #define Z_APPLY_STEP(v,Q) Z_STEP_WRITE(v)
@@ -521,7 +517,7 @@ ISR(TIMER1_COMPA_vect) {
           else { // +direction
             #ifdef DUAL_X_CARRIAGE
               // with 2 x-carriages, endstops are only checked in the homing direction for the active extruder
-              if ((current_block->active_driver == 0 && X_HOME_DIR == 1) || (current_block->active_extruder != 0 && X2_HOME_DIR == 1))
+              if ((current_block->active_driver == 0 && X_HOME_DIR == 1) || (current_block->active_driver != 0 && X2_HOME_DIR == 1))
             #endif
               {
                 #if defined(X_MAX_PIN) && X_MAX_PIN >= 0
@@ -797,52 +793,51 @@ ISR(TIMER1_COMPA_vect) {
           E0_STEP_WRITE(!INVERT_E_STEP_PIN);
         }
       }
- #if DRIVER_EXTRUDERS > 1
-      if (e_steps[1] != 0) {
-        E1_STEP_WRITE(INVERT_E_STEP_PIN);
-        if (e_steps[1] < 0) {
-          E1_DIR_WRITE(INVERT_E1_DIR);
-          e_steps[1]++;
-          E1_STEP_WRITE(!INVERT_E_STEP_PIN);
-        }
-        else if (e_steps[1] > 0) {
-          E1_DIR_WRITE(!INVERT_E1_DIR);
-          e_steps[1]--;
-          E1_STEP_WRITE(!INVERT_E_STEP_PIN);
-        }
-      }
- #endif
- #if DRIVER_EXTRUDERS > 2
-      if (e_steps[2] != 0) {
-        E2_STEP_WRITE(INVERT_E_STEP_PIN);
-        if (e_steps[2] < 0) {
-          E2_DIR_WRITE(INVERT_E2_DIR);
-          e_steps[2]++;
-          E2_STEP_WRITE(!INVERT_E_STEP_PIN);
-        }
-        else if (e_steps[2] > 0) {
-          E2_DIR_WRITE(!INVERT_E2_DIR);
-          e_steps[2]--;
-          E2_STEP_WRITE(!INVERT_E_STEP_PIN);
+      #if DRIVER_EXTRUDERS > 1
+        if (e_steps[1] != 0) {
+          E1_STEP_WRITE(INVERT_E_STEP_PIN);
+          if (e_steps[1] < 0) {
+            E1_DIR_WRITE(INVERT_E1_DIR);
+            e_steps[1]++;
+            E1_STEP_WRITE(!INVERT_E_STEP_PIN);
+          }
+          else if (e_steps[1] > 0) {
+            E1_DIR_WRITE(!INVERT_E1_DIR);
+            e_steps[1]--;
+            E1_STEP_WRITE(!INVERT_E_STEP_PIN);
+          }
         }
-      }
- #endif
- #if DRIVER_EXTRUDERS > 3
-      if (e_steps[3] != 0) {
-        E3_STEP_WRITE(INVERT_E_STEP_PIN);
-        if (e_steps[3] < 0) {
-          E3_DIR_WRITE(INVERT_E3_DIR);
-          e_steps[3]++;
-          E3_STEP_WRITE(!INVERT_E_STEP_PIN);
+      #endif
+      #if DRIVER_EXTRUDERS > 2
+        if (e_steps[2] != 0) {
+          E2_STEP_WRITE(INVERT_E_STEP_PIN);
+          if (e_steps[2] < 0) {
+            E2_DIR_WRITE(INVERT_E2_DIR);
+            e_steps[2]++;
+            E2_STEP_WRITE(!INVERT_E_STEP_PIN);
+          }
+          else if (e_steps[2] > 0) {
+            E2_DIR_WRITE(!INVERT_E2_DIR);
+            e_steps[2]--;
+            E2_STEP_WRITE(!INVERT_E_STEP_PIN);
+          }
         }
-        else if (e_steps[3] > 0) {
-          E3_DIR_WRITE(!INVERT_E3_DIR);
-          e_steps[3]--;
-          E3_STEP_WRITE(!INVERT_E_STEP_PIN);
+      #endif
+      #if DRIVER_EXTRUDERS > 3
+        if (e_steps[3] != 0) {
+          E3_STEP_WRITE(INVERT_E_STEP_PIN);
+          if (e_steps[3] < 0) {
+            E3_DIR_WRITE(INVERT_E3_DIR);
+            e_steps[3]++;
+            E3_STEP_WRITE(!INVERT_E_STEP_PIN);
+          }
+          else if (e_steps[3] > 0) {
+            E3_DIR_WRITE(!INVERT_E3_DIR);
+            e_steps[3]--;
+            E3_STEP_WRITE(!INVERT_E_STEP_PIN);
+          }
         }
-      }
- #endif
-
+      #endif
     }
   }
 #endif // ADVANCE

MarlinKimbra/temperature.h

@@ -30,7 +30,7 @@
 void tp_init();  //initialize the heating
 void manage_heater(); //it is critical that this is called periodically.
 
-#if (defined(FILAMENT_SENSOR) && defined(FILWIDTH_PIN) && FILWIDTH_PIN >= 0)
+#if HAS_FILAMENT_SENSOR
   // For converting raw Filament Width to milimeters 
   float analog2widthFil(); 
 
@@ -38,7 +38,7 @@ void manage_heater(); //it is critical that this is called periodically.
   int widthFil_to_size_ratio();
 #endif
 
-#if (defined(POWER_CONSUMPTION) && defined(POWER_CONSUMPTION_PIN) && POWER_CONSUMPTION_PIN >= 0)
+#if HAS_POWER_CONSUMPTION_SENSOR
   // For converting raw Power Consumption to watt
   float analog2current();
   float analog2power();
@@ -64,12 +64,8 @@ extern float current_temperature_bed;
 #endif
 
 #ifdef PIDTEMP
-<<<<<<< HEAD
-  extern float Kp[HOTENDS],Ki[HOTENDS],Kd[HOTENDS];
-=======
   extern float Kp[HOTENDS], Ki[HOTENDS], Kd[HOTENDS];
   #define PID_PARAM(param,e) param[e] // use macro to point to array value
->>>>>>> origin/master
   float scalePID_i(float i);
   float scalePID_d(float d);
   float unscalePID_i(float i);
@@ -150,11 +146,7 @@ FORCE_INLINE bool isCoolingBed() { return target_temperature_bed < current_tempe
   #define setTargetHotend3(_celsius) do{}while(0)
 #endif
 #if HOTENDS > 4
-<<<<<<< HEAD
-  #error Invalid number of hotend
-=======
   #error Invalid number of hotends
->>>>>>> origin/master
 #endif
 
 int getHeaterPower(int heater);

MarlinKimbra/ultralcd.cpp

@@ -214,11 +214,7 @@ static void menu_action_setting_edit_callback_long5(const char* pstr, unsigned l
   #define MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(type, label, args...) MENU_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## args)
 #endif //!ENCODER_RATE_MULTIPLIER
 #define END_MENU() \
-<<<<<<< HEAD
-    if (encoderLine >= _menuItemNr) encoderPosition = _menuItemNr * ENCODER_STEPS_PER_MENU_ITEM - 1; encoderLine = encoderPosition / ENCODER_STEPS_PER_MENU_ITEM;\
-=======
     if (encoderLine >= _menuItemNr) { encoderPosition = _menuItemNr * ENCODER_STEPS_PER_MENU_ITEM - 1; encoderLine = encoderPosition / ENCODER_STEPS_PER_MENU_ITEM; }\
->>>>>>> origin/master
     if (encoderLine >= currentMenuViewOffset + LCD_HEIGHT) { currentMenuViewOffset = encoderLine - LCD_HEIGHT + 1; lcdDrawUpdate = 1; _lineNr = currentMenuViewOffset - 1; _drawLineNr = -1; } \
     } } while(0)
 
@@ -1025,41 +1021,6 @@ static void lcd_control_temperature_menu() {
   #endif
   #ifdef PIDTEMP
     // set up temp variables - undo the default scaling
-<<<<<<< HEAD
-    raw_Ki = unscalePID_i(Ki[0]);
-    raw_Kd = unscalePID_d(Kd[0]);
-    MENU_ITEM_EDIT(float52, MSG_PID_P, &Kp[0], 1, 9990);
-    // i is typically a small value so allows values below 1
-    MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I, &raw_Ki, 0.01, 9990, copy_and_scalePID_i);
-    MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D, &raw_Kd, 1, 9990, copy_and_scalePID_d);
-    #if HOTENDS > 1
-      // set up temp variables - undo the default scaling
-      raw_Ki = unscalePID_i(Ki[1]);
-      raw_Kd = unscalePID_d(Kd[1]);
-      MENU_ITEM_EDIT(float52, MSG_PID_P " E2", &Kp[1], 1, 9990);
-      // i is typically a small value so allows values below 1
-      MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I " E2", &raw_Ki, 0.01, 9990, copy_and_scalePID_i);
-      MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D " E2", &raw_Kd, 1, 9990, copy_and_scalePID_d);
-    #endif //HOTENDS > 1
-    #if HOTENDS > 2
-      // set up temp variables - undo the default scaling
-      raw_Ki = unscalePID_i(Ki[2]);
-      raw_Kd = unscalePID_d(Kd[2]);
-      MENU_ITEM_EDIT(float52, MSG_PID_P " E3", &Kp[2], 1, 9990);
-      // i is typically a small value so allows values below 1
-      MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I " E3", &raw_Ki, 0.01, 9990, copy_and_scalePID_i);
-      MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D " E3", &raw_Kd, 1, 9990, copy_and_scalePID_d);
-    #endif //HOTENDS > 2
-    #if HOTENDS > 3
-      // set up temp variables - undo the default scaling
-      raw_Ki = unscalePID_i(Ki[3]);
-      raw_Kd = unscalePID_d(Kd[3]);
-      MENU_ITEM_EDIT(float52, MSG_PID_P " E4", &Kp[3], 1, 9990);
-      // i is typically a small value so allows values below 1
-      MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I " E4", &raw_Ki, 0.01, 9990, copy_and_scalePID_i);
-      MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D " E4", &raw_Kd, 1, 9990, copy_and_scalePID_d);
-    #endif //HOTENDS > 2
-=======
     raw_Ki = unscalePID_i(PID_PARAM(Ki,0));
     raw_Kd = unscalePID_d(PID_PARAM(Kd,0));
     MENU_ITEM_EDIT(float52, MSG_PID_P, &PID_PARAM(Kp,0), 1, 9990);
@@ -1093,7 +1054,6 @@ static void lcd_control_temperature_menu() {
         #endif //HOTENDS > 3
       #endif //HOTENDS > 2
     #endif //HOTENDS > 1
->>>>>>> origin/master
   #endif //PIDTEMP
   MENU_ITEM(submenu, MSG_PREHEAT_PLA_SETTINGS, lcd_control_temperature_preheat_pla_settings_menu);
   MENU_ITEM(submenu, MSG_PREHEAT_ABS_SETTINGS, lcd_control_temperature_preheat_abs_settings_menu);

MarlinKimbra/ultralcd_implementation_hitachi_HD44780.h

@@ -382,7 +382,7 @@ static void lcd_set_custom_characters(
 
 static void lcd_implementation_init (
   #if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT)
-    bool progress_bar_set=true
+    bool progress_bar_set = true
   #endif
 ) {
 
@@ -470,24 +470,10 @@ static void lcd_implementation_status_screen()
     lcd.print('/');
     lcd.print(itostr3left(tTarget));
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     #if HOTENDS > 1 || TEMP_SENSOR_BED != 0
       //If we have an 2nd extruder or heated bed, show that in the top right corner
       lcd.setCursor(8, 0);
       #if HOTENDS > 1
-=======
-    #if (EXTRUDERS > 1 && !defined(SINGLENOZZLE)) || TEMP_SENSOR_BED != 0
-      //If we have an 2nd extruder or heated bed, show that in the top right corner
-      lcd.setCursor(8, 0);
-      #if EXTRUDERS > 1 && !defined(SINGLENOZZLE)
->>>>>>> origin/master
-=======
-    #if HOTENDS > 1 || TEMP_SENSOR_BED != 0
-      //If we have an 2nd extruder or heated bed, show that in the top right corner
-      lcd.setCursor(8, 0);
-      #if HOTENDS > 1
->>>>>>> origin/master
         tHotend = int(degHotend(1) + 0.5);
         tTarget = int(degTargetHotend(1) + 0.5);
         lcd.print(LCD_STR_THERMOMETER[0]);
@@ -499,15 +485,7 @@ static void lcd_implementation_status_screen()
       lcd.print(itostr3(tHotend));
       lcd.print('/');
       lcd.print(itostr3left(tTarget));
-<<<<<<< HEAD
-<<<<<<< HEAD
     #endif //HOTENDS > 1 || TEMP_SENSOR_BED != 0
-=======
-    #endif //(EXTRUDERS > 1 && !defined(SINGLENOZZLE)) || TEMP_SENSOR_BED != 0
->>>>>>> origin/master
-=======
-    #endif //HOTENDS > 1 || TEMP_SENSOR_BED != 0
->>>>>>> origin/master
 
   #else//LCD_WIDTH > 19
     lcd.setCursor(0, 0);
@@ -518,24 +496,10 @@ static void lcd_implementation_status_screen()
     lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
     if (tTarget < 10) lcd.print(' ');
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-    #if HOTENDS > 1 || TEMP_SENSOR_BED != 0
-      //If we have an 2nd extruder or heated bed, show that in the top right corner
-      lcd.setCursor(10, 0);
-      #if HOTENDS > 1
-=======
-    #if (EXTRUDERS > 1 && !defined(SINGLENOZZLE)) || TEMP_SENSOR_BED != 0
-      //If we have an 2nd extruder or heated bed, show that in the top right corner
-      lcd.setCursor(10, 0);
-      #if EXTRUDERS > 1 && !defined(SINGLENOZZLE)
->>>>>>> origin/master
-=======
     #if HOTENDS > 1 || TEMP_SENSOR_BED != 0
       //If we have an 2nd extruder or heated bed, show that in the top right corner
       lcd.setCursor(10, 0);
       #if HOTENDS > 1
->>>>>>> origin/master
         tHotend = int(degHotend(1) + 0.5);
         tTarget = int(degTargetHotend(1) + 0.5);
         lcd.print(LCD_STR_THERMOMETER[0]);
@@ -549,110 +513,6 @@ static void lcd_implementation_status_screen()
       lcd.print(itostr3left(tTarget));
       lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
       if (tTarget < 10) lcd.print(' ');
-<<<<<<< HEAD
-<<<<<<< HEAD
-    #endif//HOTENDS > 1 || TEMP_SENSOR_BED != 0
-  #endif//LCD_WIDTH > 19
-
-  #if LCD_HEIGHT > 2
-    //Lines 2 for 4 line LCD
-    #if LCD_WIDTH < 20
-      #ifdef SDSUPPORT
-        lcd.setCursor(0, 2);
-        lcd_printPGM(PSTR("SD"));
-        if (IS_SD_PRINTING)
-          lcd.print(itostr3(card.percentDone()));
-        else
-          lcd_printPGM(PSTR("---"));
-        lcd.print('%');
-      #endif//SDSUPPORT
-    #else //LCD_WIDTH > 19
-      #if HOTENDS > 1 && TEMP_SENSOR_BED != 0
-        //If we both have a 2nd extruder and a heated bed, show the heated bed temp on the 2nd line on the left, as the first line is filled with extruder temps
-        tHotend=int(degBed() + 0.5);
-        tTarget=int(degTargetBed() + 0.5);
-
-        lcd.setCursor(0, 1);
-        lcd.print(LCD_STR_BEDTEMP[0]);
-        lcd.print(itostr3(tHotend));
-        lcd.print('/');
-        lcd.print(itostr3left(tTarget));
-        lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
-        if (tTarget < 10) lcd.print(' ');
-      #else
-        lcd.setCursor(0,1);
-        #ifdef DELTA
-          lcd.print('X');
-          lcd.print(ftostr30(current_position[X_AXIS]));
-          lcd_printPGM(PSTR(" Y"));
-          lcd.print(ftostr30(current_position[Y_AXIS]));
-        #else
-          lcd.print('X');
-          lcd.print(ftostr3(current_position[X_AXIS]));
-          lcd_printPGM(PSTR(" Y"));
-          lcd.print(ftostr3(current_position[Y_AXIS]));
-        #endif // DELTA
-      #endif //HOTENDS > 1 || TEMP_SENSOR_BED != 0
-    #endif //LCD_WIDTH > 19
-      lcd.setCursor(LCD_WIDTH - 8, 1);
-      lcd.print('Z');
-      lcd.print(ftostr32sp(current_position[Z_AXIS] + 0.00001));
-  #endif //LCD_HEIGHT > 2
-
-  #if LCD_HEIGHT > 3
-=======
-    #endif//(EXTRUDERS > 1 && !defined(SINGLENOZZLE)) || TEMP_SENSOR_BED != 0
-  #endif//LCD_WIDTH > 19
-
-#if LCD_HEIGHT > 2
-//Lines 2 for 4 line LCD
-# if LCD_WIDTH < 20
-#  ifdef SDSUPPORT
-    lcd.setCursor(0, 2);
-    lcd_printPGM(PSTR("SD"));
-    if (IS_SD_PRINTING)
-        lcd.print(itostr3(card.percentDone()));
-    else
-        lcd_printPGM(PSTR("---"));
-    lcd.print('%');
-#  endif//SDSUPPORT
-# else//LCD_WIDTH > 19
-#  if EXTRUDERS > 1 && TEMP_SENSOR_BED != 0 && !defined(SINGLENOZZLE)
-    //If we both have a 2nd extruder and a heated bed, show the heated bed temp on the 2nd line on the left, as the first line is filled with extruder temps
-    tHotend=int(degBed() + 0.5);
-    tTarget=int(degTargetBed() + 0.5);
-
-    lcd.setCursor(0, 1);
-    lcd.print(LCD_STR_BEDTEMP[0]);
-    lcd.print(itostr3(tHotend));
-    lcd.print('/');
-    lcd.print(itostr3left(tTarget));
-    lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
-    if (tTarget < 10)
-      lcd.print(' ');
-#   else
-      lcd.setCursor(0,1);
-#     ifdef DELTA
-        lcd.print('X');
-        lcd.print(ftostr30(current_position[X_AXIS]));
-        lcd_printPGM(PSTR(" Y"));
-        lcd.print(ftostr30(current_position[Y_AXIS]));
-#     else
-        lcd.print('X');
-        lcd.print(ftostr3(current_position[X_AXIS]));
-        lcd_printPGM(PSTR(" Y"));
-        lcd.print(ftostr3(current_position[Y_AXIS]));
-#     endif // DELTA
-#  endif//EXTRUDERS > 1 || TEMP_SENSOR_BED != 0
-# endif//LCD_WIDTH > 19
-    lcd.setCursor(LCD_WIDTH - 8, 1);
-    lcd.print('Z');
-    lcd.print(ftostr32sp(current_position[Z_AXIS] + 0.00001));
-#endif//LCD_HEIGHT > 2
-
-#if LCD_HEIGHT > 3
->>>>>>> origin/master
-=======
     #endif//HOTENDS > 1 || TEMP_SENSOR_BED != 0
   #endif//LCD_WIDTH > 19
 
@@ -702,7 +562,6 @@ static void lcd_implementation_status_screen()
   #endif //LCD_HEIGHT > 2
 
   #if LCD_HEIGHT > 3
->>>>>>> origin/master
     lcd.setCursor(0, 2);
     lcd.print(LCD_STR_FEEDRATE[0]);
     lcd.print(itostr3(feedmultiply));
@@ -760,20 +619,9 @@ static void lcd_implementation_status_screen()
   #endif //LCD_PROGRESS_BAR
 
   //Display both Status message line and Filament display on the last line
-<<<<<<< HEAD
-  #ifdef FILAMENT_LCD_DISPLAY
-    if (message_millis + 5000 <= millis()) {  //display any status for the first 5 sec after screen is initiated
-      lcd_printPGM(PSTR("Dia "));
-      lcd.print(ftostr12ns(filament_width_meas));
-      lcd_printPGM(PSTR(" V"));
-      lcd.print(itostr3(100.0*volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]));
-      lcd.print('%');
-      return;
-=======
   #if (defined(FILAMENT_SENSOR) && defined(FILWIDTH_PIN) && FILWIDTH_PIN >= 0) && defined(FILAMENT_LCD_DISPLAY) || (defined(POWER_CONSUMPTION) && defined(POWER_CONSUMPTION_PIN) && POWER_CONSUMPTION_PIN >= 0) && defined(POWER_CONSUMPTION_LCD_DISPLAY)
     if (millis() < message_millis + 5000) {  //Display both Status message line and Filament display on the last line
       lcd.print(lcd_status_message);
->>>>>>> origin/master
     }
     #if defined(POWER_CONSUMPTION) && defined(POWER_CONSUMPTION_PIN) && (POWER_CONSUMPTION_PIN >= 0) && defined(POWER_CONSUMPTION_LCD_DISPLAY)
       #if defined(FILAMENT_SENSOR) && defined(FILWIDTH_PIN) && (FILWIDTH_PIN >= 0) && defined(FILAMENT_LCD_DISPLAY)