Bug introduced in version 6beb42cd.
Robert did a good job of simplifying but messed up this chunk of code.

Looking at working version: 839bef6d
it seems there is no case where encrot3 should be defined as 2
because if ULTICONTROLLER is defined then NEWPANEL is also defined.

Fix the example delta configuration by adding DELTA_DIAGONAL_ROD_2

add command M666 for adjusting delta printer endstop position

Add duplication and auto-park mode for dual x-carriage support.

RAMBo LCD Support, Additional Pins, and Arduino add ons

Improvment for delta, Honeywell thermistor table and move from panel

Conflicts:
	Marlin/Marlin_main.cpp

Detect OS in Makefile to use the correct avrdude.conf path

separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)

convert PROTOCOL macros from statements to (multiple, comma separated) expressions

renamed ArduinoAddons/Arduino_1.x.x/sanguino to Sanguino. Now make works...

The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.

Use LIQUID_TWI2=1 as make argument to enable this support

Report temperatures for all extruders in reply to M105

Fix for Viki LCD issues printing from SD card

Fixed move from panel for delta bot #557

Add Panelolu2 pins for RAMPS1.3

Update French translation in language.h

Add support of LiquidTWI2-based panels to Makefile