417 Commits (666d95285bb3d3b2113cf722645657db36067c9c)

Author	SHA1	Message	Date
Scott Lahteine	bc2f249cc6	Merge pull request #1622 from AnHardt/tm-utf-minus-kanji ... The big Language Pack	9 years ago
AnHardt	20f909567a	Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji ... Conflicts: README.md Solved	9 years ago
Scott Lahteine	5eff15c409	Merge branch 'Development' into fixup_leveling ... Latest upstream commits	9 years ago
Scott Lahteine	5261d35737	Fix custom m-code behavior ... Don’t set CUSTOM_M_CODE_SET_Z_PROBE_OFFSET if there’s no Z probe	9 years ago
AnHardt	94330705c7	Move definition of PIDdT back to temperature.h ... make it unconditional remove all definitions in the 'Configuration.h's remove form 'Conditionals.h'	9 years ago
AnHardt	9d589cbb2a	Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji ... Conflicts: Marlin/example_configurations/delta/generic/Configuration.h Marlin/example_configurations/delta/kossel_mini/Configuration.h Marlin/language.h Conflicts solved	9 years ago
Scott Lahteine	8db4fd7177	Merge branch 'Development' into planner_oh_planner ... Latest upstream commits	9 years ago
Scott Lahteine	88e81a4804	Latest upstream commits, plus fixes ... - Also add Manual Bed Leveling to the rest of the configs	9 years ago
Scott Lahteine	2c9bd15625	Move LCD items to `Conditionals.h` ... - `Conditionals.h` is included twice, setting LCD values the first time	9 years ago
AnHardt	e72cb3e45d	Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji ... Conflicts: Marlin/dogm_lcd_implementation.h Marlin/ultralcd_implementation_hitachi_HD44780.h Fix merge conflicts 2	9 years ago
Scott Lahteine	63d5d28085	Merge branch 'Development' into config_testing ... Latest upstream changes	9 years ago
Scott Lahteine	b6d381f863	Divide up Conditionals to get LCD items early	9 years ago
Scott Lahteine	670006b919	Remove invariant code from Configurations ... - Add `Conditionals.h` with calculated configuration values - Add `SanityCheck.h` with checks for configuration errors - Remove equivalent code from all configurations - Move error checks from some sources to `SanityCheck.h` also - Fix initialization of count_direction in stepper.cpp	9 years ago
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>	9 years ago
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.	9 years ago
maverikou	8a739b6fba	Merge branch 'Development' into delta_auto_bed_level ... Conflicts: Marlin/Marlin_main.cpp	9 years ago
maverikou	39d255608d	Test an extra delta configuration with auto bed leveling code paths	9 years ago