Scott Lahteine
7431ef7e2d
Merge branch 'Development' into dev_version
...
Latest upstream commits
2015-04-07 21:14:00 -07:00
Scott Lahteine
eb6e3886f4
Set version to "1.0.3 dev"
2015-04-07 20:38:43 -07:00
Edward Patel
a9ed39b12d
Moved checks into SanityCheck.h + removed previous added checks.
2015-04-07 22:58:08 +02:00
Edward Patel
002340f32c
Merge branch 'Development-Marlin' into Development
2015-04-07 22:49:12 +02:00
Scott Lahteine
967db181d0
Latest upstream commits
2015-04-06 21:46:18 -07:00
Edward Patel
d27c82a450
Added check for Delta printers in Mesh, #error not yet supported.
2015-04-06 23:03:06 +02:00
Edward Patel
9a093b2e8f
Added #error + mention not to enable ABL and Mesh at the same time
2015-04-06 19:38:59 +02:00
Richard Wackerbarth
46474cf2f2
Incorporate @section headers from configurator
2015-04-05 22:39:40 -05:00
Edward Patel
d24ea7c03f
Added Comment in hope of github seeing these updates
2015-04-05 05:14:06 +02:00
Edward Patel
ea10601406
Merge branch 'Development-Marlin' into Development
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
2015-04-05 04:06:02 +02:00
quillford
b02a55e60f
Fixed scara directions
...
Config said for a delta instead of for a scara
2015-04-04 15:26:35 -07:00
Scott Lahteine
c065da52ec
Spacing and spelling
2015-04-03 22:54:48 -07:00
Scott Lahteine
e0d4368cb5
Minor code cleanup, move NUM_AXIS out of config
2015-04-03 20:45:24 -07:00
Scott Lahteine
a469d796e1
Add cleanups needed for #1772
2015-04-03 18:14:57 -07:00
Scott Lahteine
c0ca26cd50
Merge branch 'Development' into fixup_probing
...
Latest upstream commits
2015-04-03 18:05:17 -07:00
Scott Lahteine
0e8182bbf2
Additional pin tests, cleanup
2015-04-03 15:31:35 -07:00
Edward Patel
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
2015-04-01 21:18:51 +02:00
Chris Roadfeldt
a57862e29f
Cleaning up code in prep for merge with upstream.
2015-04-01 11:40:24 -05:00
Chris Roadfeldt
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.
2015-04-01 02:14:55 -05:00
Chris Roadfeldt
c89b8368ee
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
2015-03-31 11:08:36 -05:00
Scott Lahteine
6ff1620fcb
Merge pull request #1753 from thinkyhead/fix_extruder_offset
...
Fix EXTRUDER_OFFSET compiler error
2015-03-31 03:21:45 -07:00
Scott Lahteine
cda4bd4ad9
Correct the comment about M206
2015-03-31 03:20:15 -07:00
Scott Lahteine
935592cf6a
offsets off by default
2015-03-31 02:50:52 -07:00
Scott Lahteine
2a45922afe
Restore extruder_offset, init more simply
2015-03-31 02:49:47 -07:00
Chris Roadfeldt
45ece5afb1
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
2015-03-31 03:07:57 -05:00
Scott Lahteine
ba2c7cb467
Update configs with all the latest
2015-03-30 23:24:33 -07:00
Chris Roadfeldt
3175c70c79
Manually synching back up with MarlinFirmware/Development.
2015-03-31 00:11:11 -05:00
Chris Roadfeldt
3be00cce6f
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Configuration.h
2015-03-30 23:59:01 -05:00
Scott Lahteine
5e82ed4f30
Restore ENDSTOPPULLUPS in Configuration.h
2015-03-30 21:15:16 -07:00
Chris Roadfeldt
80285251cc
More config cleanup work for Z_PROBE_AND_ENDSTOP.
2015-03-29 03:06:20 -05:00
Chris Roadfeldt
fe4549cd83
Config file Z_PROBE_AND_ENDSTOP description clean up.
2015-03-29 03:04:59 -05:00
Chris Roadfeldt
6125124d6c
Config file cleanup for Z_PROBE_AND_ENDSTOP support.
2015-03-29 02:29:16 -05:00
Chris Roadfeldt
324c14943b
Bug fixes for Z_PROBE_AND_ENDSTOP.
...
Code cleanup for Z_PROBE_AND_ENDSTOP.
Added Z_PROBE_PIN to pins_RAMPS_13.h
2015-03-29 02:16:09 -05:00
Chris Roadfeldt
fd823449ad
Added serial message for Z Probe trigger.
2015-03-28 05:42:38 -05:00
Chris Roadfeldt
44b88b41a2
Added credit for code.
2015-03-28 05:01:04 -05:00
Chris Roadfeldt
2979b40a7a
Fixed typo in Z Probe and Endstop section.
2015-03-28 04:41:03 -05:00
Chris Roadfeldt
9f3ff14008
Enabled separate Z Probe and Z Axis endstop use at same time.
...
Typo fixes in comments in existing code.
2015-03-28 04:31:51 -05:00
Scott Lahteine
bc2f249cc6
Merge pull request #1622 from AnHardt/tm-utf-minus-kanji
...
The big Language Pack
2015-03-27 18:24:19 -07:00
Scott Lahteine
abfcbd793f
Merge pull request #1693 from chris-bo/rework_lcd_beeper
...
use only one implementation for beeper feedback
2015-03-27 17:03:38 -07:00
Scott Lahteine
78090275a9
Fix probe range editing
...
- Increase the probe offset range to -20…20
- Apply the range limits to the menu item
2015-03-26 13:52:48 -07:00
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
Christian Bohn
eab5fad539
code formatting
2015-03-26 09:00:34 +01:00
Scott Lahteine
5eff15c409
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
2015-03-25 21:24:38 -07:00
Scott Lahteine
5261d35737
Fix custom m-code behavior
...
Don’t set CUSTOM_M_CODE_SET_Z_PROBE_OFFSET if there’s no Z probe
2015-03-25 21:20:50 -07:00
chris-bo
2dfd0e5ce7
Update Configuration.h
...
documentation how to disable buzzer feedback
2015-03-25 12:44:29 +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
4fbb80567e
Get upstream commits
2015-03-22 23:07:22 -07:00
Scott Lahteine
7717e1ce33
Fix bad insert in configuration
2015-03-22 21:48:46 -07:00
Scott Lahteine
146501215f
Fix mangled probe_pt calls
...
- Address issue #1669
- Remove the TOPO_ORIGIN configuration setting
2015-03-22 21:45:20 -07:00
