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