45ece5afb1
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
10 years ago
ba2c7cb467
Update configs with all the latest
10 years ago
3175c70c79
Manually synching back up with MarlinFirmware/Development.
10 years ago
3be00cce6f
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Configuration.h
10 years ago
5e82ed4f30
Restore ENDSTOPPULLUPS in Configuration.h
10 years ago
80285251cc
More config cleanup work for Z_PROBE_AND_ENDSTOP.
10 years ago
fe4549cd83
Config file Z_PROBE_AND_ENDSTOP description clean up.
10 years ago
6125124d6c
Config file cleanup for Z_PROBE_AND_ENDSTOP support.
10 years ago
324c14943b
Bug fixes for Z_PROBE_AND_ENDSTOP.
...
Code cleanup for Z_PROBE_AND_ENDSTOP.
Added Z_PROBE_PIN to pins_RAMPS_13.h
10 years ago
fd823449ad
Added serial message for Z Probe trigger.
10 years ago
44b88b41a2
Added credit for code.
10 years ago
2979b40a7a
Fixed typo in Z Probe and Endstop section.
10 years ago
9f3ff14008
Enabled separate Z Probe and Z Axis endstop use at same time.
...
Typo fixes in comments in existing code.
10 years ago
bc2f249cc6
Merge pull request #1622 from AnHardt/tm-utf-minus-kanji
...
The big Language Pack
10 years ago
abfcbd793f
Merge pull request #1693 from chris-bo/rework_lcd_beeper
...
use only one implementation for beeper feedback
10 years ago
78090275a9
Fix probe range editing
...
- Increase the probe offset range to -20…20
- Apply the range limits to the menu item
10 years ago
20f909567a
Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
...
Conflicts:
README.md
Solved
10 years ago
eab5fad539
code formatting
10 years ago
5eff15c409
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
10 years ago
5261d35737
Fix custom m-code behavior
...
Don’t set CUSTOM_M_CODE_SET_Z_PROBE_OFFSET if there’s no Z probe
10 years ago
2dfd0e5ce7
Update Configuration.h
...
documentation how to disable buzzer feedback
10 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'
10 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
10 years ago
4fbb80567e
Get upstream commits
10 years ago
7717e1ce33
Fix bad insert in configuration
10 years ago
146501215f
Fix mangled probe_pt calls
...
- Address issue #1669
- Remove the TOPO_ORIGIN configuration setting
10 years ago
15eb5d35a2
Merge branch 'Development' into config_testing
...
Latest upstream commits
10 years ago
2c9bd15625
Move LCD items to `Conditionals.h`
...
- `Conditionals.h` is included twice, setting LCD values the first time
10 years ago
a7e89d4cfa
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
10 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
10 years ago
63d5d28085
Merge branch 'Development' into config_testing
...
Latest upstream changes
10 years ago
b6d381f863
Divide up Conditionals to get LCD items early
10 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
10 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>
10 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.
10 years ago
8067a985ce
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
...
Fixed conflicts:
Marlin/planner.h
10 years ago
1883e1bb60
Applied thinkyheads corrections from 2015-03-17
10 years ago
00b162a993
Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji
...
Conflicts:
Marlin/language.h
Conflict cleaned
10 years ago
8a739b6fba
Merge branch 'Development' into delta_auto_bed_level
...
Conflicts:
Marlin/Marlin_main.cpp
10 years ago
e983a5ab92
Disable option. Enable for use/test.
10 years ago
f34b9c83d1
Added comment about MESH_NUM axis points.
10 years ago
a686c9878f
Move TOPO_ORIGIN define to Configuration.h
...
- Addressing issue #1608
10 years ago
8005d22c81
Added menu option for bed leveling.
10 years ago
0e51e53813
WIP. Adding bed leveling code.
10 years ago
2f374f1465
Removed Kanji.
10 years ago
4b50205f11
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
10 years ago
96f8d20f2f
Change selection logic another time
...
Automatic selection was to unflexible.
Updated documentation
Updated language files to new logic and documentation.
Updated bdf2u8g.exe
10 years ago
08694339eb
Merge branch 'Development' into marlin_configurator
...
Conflicts:
Marlin/Configuration.h
10 years ago
b373826428
Merge pull request #2 from MarlinFirmware/Development
...
update
10 years ago
5bafb1fe1f
Add user test to language_test.h and make it default.
...
Improve description in Configuration.h
10 years ago
Chris Roadfeldt