Scott Lahteine
dde7e11f8e
Merge branch 'Development' into fixup_tr
...
Latest upstream commits
2015-04-03 18:56:52 -07:00
Scott Lahteine
abd7fc36b6
Fix probe height at G28 start
2015-04-03 18:54:55 -07:00
Scott Lahteine
610c8c5471
Merge pull request #1795 from thinkyhead/fixup_probing
...
Finish pin tests
2015-04-03 18:44:44 -07:00
quillford
1ad5fb1178
Fixed README typos
2015-04-03 18:36:01 -07:00
Scott Lahteine
e4934164e4
Merge pull request #1790 from Wurstnase/fix_home_z
...
fix feedrate for homing z
2015-04-03 18:35:09 -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
5c1f08a35f
Merge pull request #1772 from croadfeldt/Merge_cleanup
...
Z_PROBE_ENDSTOP
2015-04-03 18:04:31 -07:00
Scott Lahteine
db7b0ea0cf
Merge pull request #1569 from Wackerbarth/Development
...
Incorporating Build Numbers
2015-04-03 16:56:31 -07:00
Scott Lahteine
92119d0f7d
Static delta[] for SCARA
2015-04-03 16:46:56 -07:00
Scott Lahteine
007a4bd421
Adjust spacing in view function
2015-04-03 16:41:58 -07:00
Scott Lahteine
424d5495e4
Add PIDTEMPBED to EEPROM
2015-04-03 16:38:05 -07:00
Scott Lahteine
6b919e14c1
Group all universal variables
2015-04-03 15:45:41 -07:00
Scott Lahteine
21cd2e4fae
Merge branch 'Development' into fixup_probing
...
Latest upstream commits
2015-04-03 15:32:15 -07:00
Scott Lahteine
0e8182bbf2
Additional pin tests, cleanup
2015-04-03 15:31:35 -07:00
Scott Lahteine
e8700bd1e2
Merge pull request #1788 from AnHardt/iss1786
...
Fix typo in Marlin_main.cpp
2015-04-03 15:14:58 -07:00
Wurstnase
45565b680d
second wrong feedrate
2015-04-03 18:01:28 +02:00
Wurstnase
581b2aae04
fix feedrate for homing z
...
max_feedrate is in mm/s. line_to_destination needs a feedrate in mm/min because there is feedrate/60.
2015-04-03 16:11:32 +02:00
Edward Patel
48b1c3822f
Merge branch 'Development-Marlin' into Development
2015-04-03 00:46:30 +02:00
Richard Wackerbarth
8f620de0ff
Actually activate Automatic Versioning
2015-04-02 09:20:24 -05:00
Richard Wackerbarth
ccdaea51ba
Add KosselPro
2015-04-02 09:20:24 -05:00
Richard Wackerbarth
f4599143eb
Allow M115 to better reflect the build
2015-04-02 09:20:24 -05:00
Richard Wackerbarth
a33e20b27d
Adjust per-project .gitignore
...
Refer to http://git-scm.com/docs/gitignore
to see why this is appropriate
2015-04-02 09:20:24 -05:00
Richard Wackerbarth
34c7d45879
Hook for Auto-generated Build Version
...
The automatic versioning system extracts a
build version number from the SCM system
That versioning information is written to the file
_Version.h, a file that is NOT preserved in the SCM.
If such a file will be present,
we include it here to utilize the parameters
that are defined therein.
2015-04-02 09:20:24 -05:00
Scott Lahteine
c756b4cf07
Comment tweak
2015-04-02 06:11:03 -07:00
AnHardt
23cd54755f
Fix typo in Marlin_main.cpp
...
related to current_position[Z_AXIS] and retract_zlift.
'+ =' -> '+='
Fix for #1786
2015-04-02 14:50:31 +02:00
Scott Lahteine
e96df67630
Clarify thermal_runaway_protection
...
- Add comments documenting `thermal_runaway_protection`
- Add an enum for the thermal runaway states
- Add macros for temperature helper functions
- Fix a glitch with the z probe sled in homeaxis
2015-04-02 05:10:14 -07:00
Bo Herrmannsen
93fdc2951b
Update README.md
2015-04-02 07:22:01 +02:00
Chris Roadfeldt
79b56b083f
Merge branch 'Development' into Merge_cleanup
2015-04-01 19:33:11 -05:00
Chris Roadfeldt
0afe6696f0
Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
2015-04-01 19:31:20 -05:00
Chris Roadfeldt
9e603920c2
Merge branch 'Merge_cleanup' into Development
2015-04-01 19:31:14 -05:00
Chris Roadfeldt
59994bd519
Not doing network admin work, pin not ping... :)
2015-04-01 19:24:42 -05:00
Chris Roadfeldt
916f59e35f
Spaces not tabs in language.h.
...
Catch unlikely but possible error and head crash when using
Z_PROBE_REPEATABILITY_TEST
2015-04-01 19:22:05 -05:00
Scott Lahteine
66b3b53e76
Merge pull request #1762 from AnHardt/MiMa
...
Fix MIN&MAX temperatures again
2015-04-01 16:52:07 -07:00
alexborro
56633da44f
Merge pull request #1773 from Wurstnase/cartesian_old_bump
...
old bump_divisor for cartesian/corexy-printer
2015-04-01 20:39:04 -03:00
Bo Herrmannsen
ae2ebc6951
Update README.md
2015-04-01 23:18:51 +02:00
Edward Patel
6bdebede27
Added description in the documentation for the new parts.
2015-04-01 21:32:28 +02: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
26dc80bf2d
Typo fixed...
2015-04-01 13:47:17 -05:00
Chris Roadfeldt
b84db7ff5b
Merge branch 'Merge_cleanup' into Development
2015-04-01 13:36:02 -05:00
Chris Roadfeldt
2966ae2022
Fix Z_PROBE_PING not declared, allows code to compile if Z_PROBE_ENDSTOP
...
is not used.
2015-04-01 13:32:25 -05:00
Wurstnase
67d5e7973e
old bump_divisor for cartesian/corexy-printer
...
some people are starting to ask why homing is so slow. this is the old standard hard-coded value.
2015-04-01 20:17:49 +02:00
Chris Roadfeldt
fb74995fe3
Merge branch 'Merge_cleanup' into Development
2015-04-01 12:15:01 -05:00
Chris Roadfeldt
bb41edc2ef
Fixed extra #endif
2015-04-01 12:13:25 -05:00
Chris Roadfeldt
f53e951462
Merge branch 'Merge_cleanup' into Development
2015-04-01 11:52:34 -05:00
Chris Roadfeldt
a57862e29f
Cleaning up code in prep for merge with upstream.
2015-04-01 11:40:24 -05:00
Chris Roadfeldt
ca40921bf1
Merge branch 'Merge_cleanup' into Development
2015-04-01 10:34:36 -05:00
Chris Roadfeldt
745d9fe1a4
Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
...
Conflicts:
Marlin/Marlin_main.cpp
2015-04-01 10:31:02 -05:00
AnHardt
488666832b
Remove the previously introduced ()
2015-04-01 13:40:05 +02:00
Scott Lahteine
443468df8d
Merge pull request #1771 from AnHardt/iss1770
...
Added new - changed entries from Fix up LCD_PROGRESS_BAR
2015-04-01 02:13:30 -07:00
