7431ef7e2d
Merge branch 'Development' into dev_version
...
Latest upstream commits
11 years ago
eb6e3886f4
Set version to "1.0.3 dev"
11 years ago
a9ed39b12d
Moved checks into SanityCheck.h + removed previous added checks.
11 years ago
002340f32c
Merge branch 'Development-Marlin' into Development
11 years ago
7d2c2f1790
Updates for the configurator
...
- Sections in all `Configuration_adv.h`
- Recognize JAPANESE/WESTERN/CYRILLIC options
- Better capturing of comments for tooltips
11 years ago
967db181d0
Latest upstream commits
11 years ago
d27c82a450
Added check for Delta printers in Mesh, #error not yet supported.
11 years ago
9a093b2e8f
Added #error + mention not to enable ABL and Mesh at the same time
11 years ago
61de6ecd54
Added change to example Configuration.h's
11 years ago
c065da52ec
Spacing and spelling
11 years ago
e0d4368cb5
Minor code cleanup, move NUM_AXIS out of config
11 years ago
a469d796e1
Add cleanups needed for #1772
11 years ago
0e8182bbf2
Additional pin tests, cleanup
11 years ago
cda4bd4ad9
Correct the comment about M206
11 years ago
82794fa5f7
Add delta generic not renaming
11 years ago
ba2c7cb467
Update configs with all the latest
11 years ago
edb67ea165
Patch generic delta config
...
- Addressing issue mentioned at #1699
11 years ago
bc2f249cc6
Merge pull request #1622 from AnHardt/tm-utf-minus-kanji
...
The big Language Pack
11 years ago
20f909567a
Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
...
Conflicts:
README.md
Solved
11 years ago
5eff15c409
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
11 years ago
5261d35737
Fix custom m-code behavior
...
Don’t set CUSTOM_M_CODE_SET_Z_PROBE_OFFSET if there’s no Z probe
11 years ago
94330705c7
Move definition of PIDdT back to temperature.h
...
make it unconditional
remove all definitions in the 'Configuration.h's
remove form 'Conditionals.h'
11 years ago
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
11 years ago
8db4fd7177
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
11 years ago
88e81a4804
Latest upstream commits, plus fixes
...
- Also add Manual Bed Leveling to the rest of the configs
11 years ago
2c9bd15625
Move LCD items to `Conditionals.h`
...
- `Conditionals.h` is included twice, setting LCD values the first time
11 years ago
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
11 years ago
63d5d28085
Merge branch 'Development' into config_testing
...
Latest upstream changes
11 years ago
b6d381f863
Divide up Conditionals to get LCD items early
11 years ago
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
11 years ago
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>
11 years ago
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.
11 years ago
8a739b6fba
Merge branch 'Development' into delta_auto_bed_level
...
Conflicts:
Marlin/Marlin_main.cpp
11 years ago
39d255608d
Test an extra delta configuration with auto bed leveling code paths
11 years ago
Scott Lahteine