7dc64efe67
Added sanity check for MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS
9 years ago
4788b59300
Thermistor values for configurator
9 years ago
7431ef7e2d
Merge branch 'Development' into dev_version
...
Latest upstream commits
9 years ago
eb6e3886f4
Set version to "1.0.3 dev"
9 years ago
a9ed39b12d
Moved checks into SanityCheck.h + removed previous added checks.
9 years ago
002340f32c
Merge branch 'Development-Marlin' into Development
9 years ago
967db181d0
Latest upstream commits
9 years ago
d27c82a450
Added check for Delta printers in Mesh, #error not yet supported.
9 years ago
9a093b2e8f
Added #error + mention not to enable ABL and Mesh at the same time
9 years ago
46474cf2f2
Incorporate @section headers from configurator
9 years ago
d24ea7c03f
Added Comment in hope of github seeing these updates
9 years ago
ea10601406
Merge branch 'Development-Marlin' into Development
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
9 years ago
b02a55e60f
Fixed scara directions
...
Config said for a delta instead of for a scara
9 years ago
c065da52ec
Spacing and spelling
9 years ago
e0d4368cb5
Minor code cleanup, move NUM_AXIS out of config
9 years ago
a469d796e1
Add cleanups needed for #1772
9 years ago
c0ca26cd50
Merge branch 'Development' into fixup_probing
...
Latest upstream commits
9 years ago
0e8182bbf2
Additional pin tests, cleanup
9 years ago
6b91b7b411
Mesh bed leveling: Added G29 S3 + finer steps in manual probing.
...
* Use "G29 S3 Xn Yn Zn.nn" to modify bad probed point manually
* Changed manual Z steps from 0.05 to 0.025 and made brought it to Configuration.h
9 years ago
a57862e29f
Cleaning up code in prep for merge with upstream.
9 years ago
a508d835db
Changed Z_PROBE_AND_ENDSTOP to Z_PROBE_ENDSTOP.
...
Updated documentation in Configuration.h.
Cleaned up and commented some code relating to Z_PROBE_ENDSTOP.
Separated Z_MIN_ENDSTOP and Z_PROBE_ENDSTOP completely.
9 years ago
c89b8368ee
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
9 years ago
6ff1620fcb
Merge pull request #1753 from thinkyhead/fix_extruder_offset
...
Fix EXTRUDER_OFFSET compiler error
9 years ago
cda4bd4ad9
Correct the comment about M206
9 years ago
935592cf6a
offsets off by default
9 years ago
2a45922afe
Restore extruder_offset, init more simply
9 years ago
45ece5afb1
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
9 years ago
ba2c7cb467
Update configs with all the latest
9 years ago
3175c70c79
Manually synching back up with MarlinFirmware/Development.
9 years ago
3be00cce6f
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Configuration.h
9 years ago
5e82ed4f30
Restore ENDSTOPPULLUPS in Configuration.h
9 years ago
80285251cc
More config cleanup work for Z_PROBE_AND_ENDSTOP.
9 years ago
fe4549cd83
Config file Z_PROBE_AND_ENDSTOP description clean up.
9 years ago
6125124d6c
Config file cleanup for Z_PROBE_AND_ENDSTOP support.
9 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
9 years ago
fd823449ad
Added serial message for Z Probe trigger.
9 years ago
44b88b41a2
Added credit for code.
9 years ago
2979b40a7a
Fixed typo in Z Probe and Endstop section.
9 years ago
9f3ff14008
Enabled separate Z Probe and Z Axis endstop use at same time.
...
Typo fixes in comments in existing code.
9 years ago
bc2f249cc6
Merge pull request #1622 from AnHardt/tm-utf-minus-kanji
...
The big Language Pack
9 years ago
abfcbd793f
Merge pull request #1693 from chris-bo/rework_lcd_beeper
...
use only one implementation for beeper feedback
9 years ago
78090275a9
Fix probe range editing
...
- Increase the probe offset range to -20…20
- Apply the range limits to the menu item
9 years ago
20f909567a
Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
...
Conflicts:
README.md
Solved
9 years ago
eab5fad539
code formatting
9 years ago
5eff15c409
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
9 years ago
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
2dfd0e5ce7
Update Configuration.h
...
documentation how to disable buzzer feedback
9 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'
9 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
9 years ago
4fbb80567e
Get upstream commits
9 years ago
Edward Patel