Update

MarlinKimbra/Marlin_main.cpp

@@ -5618,19 +5618,6 @@ inline void gcode_M503() {
     current_position[E_AXIS] = destination[E_AXIS]; //the long retract of L is compensated by manual filament feeding
     plan_set_e_position(current_position[E_AXIS]);
 
-<<<<<<< HEAD
-    // HOME X & Y & Z(only Delta)
-    //gcode_G28(true,true); //Trovare un'altra soluzione
-
-    #ifdef DELTA
-      calculate_delta(lastpos);
-      plan_buffer_line(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], target[E_AXIS], fr60, active_extruder, active_driver); //move xyz back
-      plan_buffer_line(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], lastpos[E_AXIS], fr60, active_extruder, active_driver); //final unretract
-    #else
-      plan_buffer_line(lastpos[X_AXIS], lastpos[Y_AXIS], target[Z_AXIS], target[E_AXIS], fr60, active_extruder, active_driver); //move xy back
-      plan_buffer_line(lastpos[X_AXIS], lastpos[Y_AXIS], lastpos[Z_AXIS], target[E_AXIS], fr60, active_extruder, active_driver); //move z back
-      plan_buffer_line(lastpos[X_AXIS], lastpos[Y_AXIS], lastpos[Z_AXIS], lastpos[E_AXIS], fr60, active_extruder, active_driver); //final unretract
-=======
     RUNPLAN; // should do nothing
 
     lcd_reset_alert_level();
@@ -5648,7 +5635,6 @@ inline void gcode_M503() {
       line_to_destination();
       destination[E_AXIS] = lastpos[E_AXIS];
       line_to_destination();
->>>>>>> origin/Development
     #endif
 
     #if HAS_FILRUNOUT

MarlinKimbra/comunication.h

@@ -39,17 +39,6 @@
   #endif
 #endif
 
-<<<<<<< HEAD
-#define START       "start"                //start for host
-#define OK          "ok"                   //ok answer for host
-#define ER          "Error:"               //error for host
-#define WT          "wait"                 //wait for host
-#define DB          "echo: "               //message for user
-#define RS          "Resend:"              //resend for host
-#define PAUSE       "//action:pause"       //command for host that support action
-#define RESUME      "//action:resume"      //command for host that support action
-#define DISCONNECT  "//action:disconnect"  //command for host that support action
-=======
 #define START       "start"               //start for host
 #define OK          "ok "                 //ok answer for host
 #define ER          "Error: "             //error for host
@@ -59,7 +48,6 @@
 #define PAUSE       "//action:pause"      //command for host that support action
 #define RESUME      "//action:resume"     //command for host that support action
 #define DISCONNECT  "//action:disconnect" //command for host that support action
->>>>>>> origin/Development
 
 #define SERIAL_INIT(baud) MYSERIAL.begin(baud), delay(1)
 #define SERIAL_WRITE(x) MYSERIAL.write(x)

MarlinKimbra/conditionals.h

@@ -373,173 +373,6 @@
     #ifdef Z_PROBE_SLED
       #define Z_SAFE_HOMING
     #endif
-<<<<<<< HEAD
-  #endif
-
-  #ifdef DOGLCD
-    /* Custom characters defined in font font_6x10_marlin_symbols */
-    // \x00 intentionally skipped to avoid problems in strings
-    #define LCD_STR_REFRESH     "\x01"
-    #define LCD_STR_FOLDER      "\x02"
-    #define LCD_STR_ARROW_RIGHT "\x03"
-    #define LCD_STR_UPLEVEL     "\x04"
-    #define LCD_STR_CLOCK       "\x05"
-    #define LCD_STR_FEEDRATE    "\x06"
-    #define LCD_STR_BEDTEMP     "\x07"
-    #define LCD_STR_THERMOMETER "\x08"
-    #define LCD_STR_DEGREE      "\x09"
-
-    #define LCD_STR_SPECIAL_MAX '\x09'
-    // Maximum here is 0x1f because 0x20 is ' ' (space) and the normal charsets begin.
-    // Better stay below 0x10 because DISPLAY_CHARSET_HD44780_WESTERN begins here.
-  #else
-    /* Custom characters defined in the first 8 characters of the LCD */
-    #define LCD_STR_BEDTEMP     "\x00"  // this will have 'unexpected' results when used in a string!
-    #define LCD_STR_DEGREE      "\x01"
-    #define LCD_STR_THERMOMETER "\x02"
-    #define LCD_STR_UPLEVEL     "\x03"
-    #define LCD_STR_REFRESH     "\x04"
-    #define LCD_STR_FOLDER      "\x05"
-    #define LCD_STR_FEEDRATE    "\x06"
-    #define LCD_STR_CLOCK       "\x07"
-    #define LCD_STR_ARROW_RIGHT ">"  /* from the default character set */
-  #endif
-
-  /**
-   * Default LCD contrast for dogm-like LCD displays
-   */
-  #if defined(DOGLCD) && !defined(DEFAULT_LCD_CONTRAST)
-    #define DEFAULT_LCD_CONTRAST 32
-  #endif
-
-  #ifdef DOGLCD
-    #define HAS_LCD_CONTRAST
-    #ifdef U8GLIB_ST7920
-      #undef HAS_LCD_CONTRAST
-    #endif
-  #endif
-
-  /**
-   * LCD BUZZ
-   */
-  #define HAS_LCD_BUZZ (defined(ULTRALCD) || (defined(BEEPER) && BEEPER >= 0) || defined(LCD_USE_I2C_BUZZER))
-  
-  /**
-   * SPLASH_SCREEN_DURATION for no DOGLCD display
-   */
-  #ifndef DOGLCD
-    #undef SPLASH_SCREEN_DURATION
-    #define SPLASH_SCREEN_DURATION 500
-  #endif
-
-#else // CONFIGURATION_LCD
-
-  #define CONDITIONALS_H
-
-  /**
-   * SINGLENOZZLE
-   */
-  #ifdef SINGLENOZZLE
-    #define HOTENDS 1
-    #undef TEMP_SENSOR_1_AS_REDUNDANT
-  #else
-    #define HOTENDS EXTRUDERS
-  #endif
-
-  /**
-   * DRIVER_EXTRUDERS
-   */
-  #if !defined(MKR4) && !defined(NPR2)
-    #define DRIVER_EXTRUDERS EXTRUDERS // This defines the number of Driver extruder
-  #endif
-
-  #ifndef __SAM3X8E__
-    #ifndef AT90USB
-      #define HardwareSerial_h // trick to disable the standard HWserial
-    #endif
-  #endif
-
-  #if (ARDUINO >= 100)
-    #include "Arduino.h"
-  #else
-    #include "WProgram.h"
-  #endif
-
-  #include "pins.h"
-
-  /**
-   * ENDSTOPPULLUPS
-   */
-  #ifdef ENDSTOPPULLUPS
-    #define ENDSTOPPULLUP_XMAX
-    #define ENDSTOPPULLUP_YMAX
-    #define ENDSTOPPULLUP_ZMAX
-    #define ENDSTOPPULLUP_XMIN
-    #define ENDSTOPPULLUP_YMIN
-    #define ENDSTOPPULLUP_ZMIN
-    #define ENDSTOPPULLUP_EMIN
-    #define ENDSTOPPULLUP_ZPROBE
-  #endif
-
-  /**
-   * ENDSTOP LOGICAL
-   */
-  #if MB(ALLIGATOR)
-    #define X_MIN_ENDSTOP_INVERTING   !X_MIN_ENDSTOP_LOGIC
-    #define Y_MIN_ENDSTOP_INVERTING   !Y_MIN_ENDSTOP_LOGIC
-    #define Z_MIN_ENDSTOP_INVERTING   !Z_MIN_ENDSTOP_LOGIC
-    #define E_MIN_ENDSTOP_INVERTING   !E_MIN_ENDSTOP_LOGIC
-    #define X_MAX_ENDSTOP_INVERTING   !X_MAX_ENDSTOP_LOGIC
-    #define Y_MAX_ENDSTOP_INVERTING   !Y_MAX_ENDSTOP_LOGIC
-    #define Z_MAX_ENDSTOP_INVERTING   !Z_MAX_ENDSTOP_LOGIC
-    #define Z_PROBE_ENDSTOP_INVERTING !Z_PROBE_ENDSTOP_LOGIC
-  #else
-    #define X_MIN_ENDSTOP_INVERTING   X_MIN_ENDSTOP_LOGIC
-    #define Y_MIN_ENDSTOP_INVERTING   Y_MIN_ENDSTOP_LOGIC
-    #define Z_MIN_ENDSTOP_INVERTING   Z_MIN_ENDSTOP_LOGIC
-    #define E_MIN_ENDSTOP_INVERTING   E_MIN_ENDSTOP_LOGIC
-    #define X_MAX_ENDSTOP_INVERTING   X_MAX_ENDSTOP_LOGIC
-    #define Y_MAX_ENDSTOP_INVERTING   Y_MAX_ENDSTOP_LOGIC
-    #define Z_MAX_ENDSTOP_INVERTING   Z_MAX_ENDSTOP_LOGIC
-    #define Z_PROBE_ENDSTOP_INVERTING Z_PROBE_ENDSTOP_LOGIC
-  #endif
-
-  /**
-   * Firmware Test
-   */
-  #ifdef FIRMWARE_TEST
-    #undef BAUDRATE
-    #define BAUDRATE 115200  // Baudrate setting to 115200 because serial monitor arduino function at max 115200 baudrate.
-  #endif
-
-  /**
-   * Axis lengths
-   */
-  #define X_MAX_LENGTH (X_MAX_POS - X_MIN_POS)
-  #define Y_MAX_LENGTH (Y_MAX_POS - Y_MIN_POS)
-  #define Z_MAX_LENGTH (Z_MAX_POS - Z_MIN_POS)
-
-  /**
-   * SCARA
-   */
-  #ifdef SCARA
-    #undef SLOWDOWN
-    #define QUICK_HOME //SCARA needs Quickhome
-  #endif
-
-  /**
-   * DELTA
-   */
-  #ifdef DELTA
-    #undef SLOWDOWN //DELTA not needs SLOWDOWN
-    // DELTA must have same valour for 3 axis endstop hits
-    #undef Y_HOME_BUMP_MM
-    #undef Z_HOME_BUMP_MM
-    #define Y_HOME_BUMP_MM X_HOME_BUMP_MM
-    #define Z_HOME_BUMP_MM X_HOME_BUMP_MM
-  #endif
-=======
->>>>>>> origin/Development
     
     /**
      * Servo Leveling