54 Commits

Author	SHA1	Message	Date
AnHardt	47c1ea72af	Merge https://github.com/kieranc/Marlin into PIDdebug ... Conflicts: Marlin/temperature.cpp Cleaned merge conflict. Codeposition had changed. Variable pid_input had vanished. Signed-off-by: AnHardt <github@kitelab.de>	2015-03-20 00:07:36 +01:00
AnHardt	e917477fec	Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji ... 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.	2015-03-19 12:35:43 +01:00
maverikou	8a739b6fba	Merge branch 'Development' into delta_auto_bed_level ... Conflicts: Marlin/Marlin_main.cpp	2015-03-16 08:24:26 +02:00
maverikou	39d255608d	Test an extra delta configuration with auto bed leveling code paths	2015-03-07 20:53:23 +02:00