AnHardt
20f909567a
Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
...
Conflicts:
README.md
Solved
2015-03-26 10:05:00 +01:00
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'
2015-03-25 11:51:41 +01:00
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
2015-03-24 16:59:15 +01:00
Scott Lahteine
8db4fd7177
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
2015-03-23 22:08:50 -07:00
Scott Lahteine
88e81a4804
Latest upstream commits, plus fixes
...
- Also add Manual Bed Leveling to the rest of the configs
2015-03-21 16:12:57 -07:00
Scott Lahteine
2c9bd15625
Move LCD items to Conditionals.h
...
- `Conditionals.h` is included twice, setting LCD values the first time
2015-03-21 15:24:57 -07:00
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
2015-03-20 13:35:47 +01:00
Scott Lahteine
63d5d28085
Merge branch 'Development' into config_testing
...
Latest upstream changes
2015-03-20 04:15:18 -07:00
Scott Lahteine
b6d381f863
Divide up Conditionals to get LCD items early
2015-03-20 02:50:28 -07:00
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
2015-03-19 22:22:23 -07:00
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
