Conflicts:
	Marlin/temperature.cpp

Cleaned merge conflict.

Codeposition had changed.
Variable pid_input had vanished.

Signed-off-by: AnHardt <github@kitelab.de>

Conflicts:
	Marlin/dogm_lcd_implementation.h

solved merge conflict.

Reduce size of menu code

by shifting things some pixels around

In the new method we pass the character that should be used for
selected state, not the character to print always.

- Pass selected state directly to lcd_implementation_mark_as_selected
- Rename sel function parameter
- Include a minor fix for SdBaseFile.h

Get upstream changes

When one hit "Stop Print" option in LCD menu, the command buffer was not
cleared. The printer keep moving until the buffer has been emptied.
Actually I could not clear the command buffer as well.. I don't know
why, it doesnt work as expected.
I need to implement a routine inside Stepper ISR to handle such
situation.

in ultralcd_implementation_hitachi_HD44780.h lcd_print( about array index.

Conflicts:
	Marlin/dogm_lcd_implementation.h
	Marlin/fonts/make_fonts.bat

Claerd conflicts with my own #1621. (His was easy. :-) )

corrected typo in fonts/README.fonts

Applied changes to the new delta-configurations
 and deletet there some extra whitespace at the line-endings.

Saves one addition.
Needs one pointer on the stack.

Don't know if this is a go trade.

Remove 6x9 font

Decrease KILL_DELAY

Negative times are unlikly

optional parameters must be named when ignoring order

lcd_control_retract_menu() is conditional.

lcd_autostart_sd() has two conditions.

delta[3] not used when DELTA not defined.

G4 could wait for an undefined time

Tried to make it a little intelligent.

Shoot in the dark.

Got:
Marlin_main.cpp:2567: warning: unused variable 'codepos'

Needs revision.
Don't now how this should look like.

Got:
Marlin_main.cpp:1689: warning: 'codenum' may be used uninitialized in this function

And indeed codenum is undefined when no parameter is given.

got:
Marlin_main.cpp:387: warning: 'delta' defined but not used

Compiles cleaner when definition is removed.

got:
ultralcd.cpp:408: warning: 'void lcd_autostart_sd()' defined but not used

Got:
ultralcd.cpp:64: warning: 'void lcd_control_retract_menu()' declared 'static' but never defined

While bunting an other bug I stumbled across:
ultralcd.cpp:1250: warning: comparison between signed and unsigned
integer expressions
Changed to the type of lcd_next_update_millis.

Users hat to press kill-button for unexpexted lon times.
See #1593

Fixed conflicts:
	Marlin/planner.h

fix macro

with sources in /fonts

Delta auto bed level (Updated PR)

The Check Endstop logic must be:

if (current_block->steps_x != current_block->steps_y || (TEST(out_bits,
X_AXIS) == TEST(out_bits, Y_AXIS)))
if (TEST(out_bits, X_HEAD))

not

if (TEST(out_bits, X_HEAD) && (current_block->steps_x !=
current_block->steps_y || (TEST(out_bits, X_AXIS) == TEST(out_bits,
Y_AXIS))))

Same applies for Y axis.

Conflicts:
	Marlin/language.h
Conflict cleaned

Thank you @Nprod.