c0ca26cd50
Merge branch 'Development' into fixup_probing
Latest upstream commits
9 years ago
5c1f08a35f
Merge pull request #1772 from croadfeldt/Merge_cleanup
Z_PROBE_ENDSTOP
9 years ago
db7b0ea0cf
Merge pull request #1569 from Wackerbarth/Development
Incorporating Build Numbers
9 years ago
92119d0f7d
Static delta[] for SCARA
9 years ago
6b919e14c1
Group all universal variables
9 years ago
21cd2e4fae
Merge branch 'Development' into fixup_probing
Latest upstream commits
9 years ago
0e8182bbf2
Additional pin tests, cleanup
9 years ago
e8700bd1e2
Merge pull request #1788 from AnHardt/iss1786
Fix typo in Marlin_main.cpp
9 years ago
8f620de0ff
Actually activate Automatic Versioning
10 years ago
ccdaea51ba
Add KosselPro
9 years ago
f4599143eb
Allow M115 to better reflect the build
10 years ago
a33e20b27d
Adjust per-project .gitignore
Refer to http://git-scm.com/docs/gitignore
to see why this is appropriate
10 years ago
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.
10 years ago
23cd54755f
Fix typo in Marlin_main.cpp
related to current_position[Z_AXIS] and retract_zlift.
'+ =' -> '+='
Fix for #1786
9 years ago
93fdc2951b
Update README.md
9 years ago
79b56b083f
Merge branch 'Development' into Merge_cleanup
9 years ago
0afe6696f0
Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
9 years ago
9e603920c2
Merge branch 'Merge_cleanup' into Development
9 years ago
59994bd519
Not doing network admin work, pin not ping... :)
9 years ago
916f59e35f
Spaces not tabs in language.h.
Catch unlikely but possible error and head crash when using
Z_PROBE_REPEATABILITY_TEST
9 years ago
66b3b53e76
Merge pull request #1762 from AnHardt/MiMa
Fix MIN&MAX temperatures again
9 years ago
56633da44f
Merge pull request #1773 from Wurstnase/cartesian_old_bump
old bump_divisor for cartesian/corexy-printer
9 years ago
ae2ebc6951
Update README.md
9 years ago
26dc80bf2d
Typo fixed...
9 years ago
b84db7ff5b
Merge branch 'Merge_cleanup' into Development
9 years ago
2966ae2022
Fix Z_PROBE_PING not declared, allows code to compile if Z_PROBE_ENDSTOP
is not used.
9 years ago
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.
9 years ago
fb74995fe3
Merge branch 'Merge_cleanup' into Development
9 years ago
bb41edc2ef
Fixed extra #endif
9 years ago
f53e951462
Merge branch 'Merge_cleanup' into Development
9 years ago
a57862e29f
Cleaning up code in prep for merge with upstream.
9 years ago
ca40921bf1
Merge branch 'Merge_cleanup' into Development
9 years ago
745d9fe1a4
Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
Conflicts:
Marlin/Marlin_main.cpp
9 years ago
488666832b
Remove the previously introduced ()
9 years ago
443468df8d
Merge pull request #1771 from AnHardt/iss1770
Added new - changed entries from Fix up LCD_PROGRESS_BAR
9 years ago
9593f09b99
Merge pull request #1764 from thinkyhead/probe_leveling
Fix homing and leveling
9 years ago
7bf31cc8a1
Merge pull request #1768 from atfield90/atfield90-patch-1
Added support for Atmega 1281 chip
9 years ago
72c7de3570
Cleanup M48
9 years ago
97a258b0b0
Clean up, document home_axis
9 years ago
831016b09f
Added new - changed entries from Fix up LCD_PROGRESS_BAR
for when no LCD is defined.
Fix for #1770 .
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
fdb4ddbdea
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
9 years ago
d273c90d53
Added support for Atmega 1281 chip
9 years ago
1c7391717e
Include sync_plan_position_delta for SCARA also
9 years ago
8231fb166d
Merge pull request #1758 from AnHardt/MENU_MULTIPLIER_ITEM
Fix: Audio feedback for MENU_MILTIPLIER_ITEM click
9 years ago
0b57a2ab8b
Merge pull request #1757 from bq/Translation-strings
Added new trasnslatable labels.
9 years ago
18bb6be80e
Fix homing and leveling
- Include the current Z when raising the axis after and between probing
- Add `sync_plan_position_delta` for parity with `sync_plan_position`
- Clean up and clarify `M48`, `dock_sled`, and others
9 years ago
3f2e863206
Improve conditions for HAS_TEMP
and use them in temperuture.h
Flattened the if structure - the preprocessor is doing the work - not the Arduino. Arduino.
9 years ago
85f8a26ba4
Fix MIN&MAX temperatures again
replaced GE0 with th matching GEX in the second row.
added some ()
9 years ago
19b11dfdd7
Fix can't enter MENU_MULTIPLIER_ITEM
9 years ago
Scott Lahteine
Scott Lahteine
Richard Wackerbarth
AnHardt
Bo Herrmannsen
Chris Roadfeldt
alexborro
Wurstnase
atfield90