Scott Lahteine
c065da52ec
Spacing and spelling
10 years ago
Scott Lahteine
a3e129e091
Merge pull request #1801 from thinkyhead/fixup_probing
Minor optimizations
10 years ago
Scott Lahteine
e8a711994a
Merge pull request #1802 from Natealus/Development
Compiling error temperature.cpp with multiple extruders defined
10 years ago
Natealus
ab11f90da0
Z_PROBE_ENDSTOP Pin for Azteeg X3 Pro
Just a simple #ifdef Z_PROBE_ENDSTOP to define the pin for it. Also has
a couple commented lines for switching Z_MIN_PIN if needed.
10 years ago
Scott Lahteine
8680b515b0
Fix missing tmp_extruder -> target_extruder
10 years ago
Natealus
a6ba40ae48
Compiling error temperature.cpp with multiple extruders defined
It wouldn't compile because of this line in temperature.cpp it turns out
it was just a stray ( that didn't line up with the previous lines so I
just made it in line with the rest and it compiled fine.
10 years ago
Scott Lahteine
fc3c76fc16
Fix #1800
10 years ago
Scott Lahteine
c185912c19
Latest upstream commits, mostly
10 years ago
Scott Lahteine
1e5c18bb14
Add code_value_short and SERIAL_CHAR
10 years ago
Scott Lahteine
e0d4368cb5
Minor code cleanup, move NUM_AXIS out of config
10 years ago
Scott Lahteine
4c7af484f8
Merge pull request #1787 from thinkyhead/fixup_tr
Fix: thermal_runaway_protection triggered by target temperature increase
10 years ago
Scott Lahteine
c747becec1
Merge pull request #1796 from thinkyhead/pidbed_temp_eeprom
Add PIDTEMPBED to EEPROM
10 years ago
Scott Lahteine
369a497300
Merge pull request #1797 from quillford/Development
Fixed README typos
10 years ago
Scott Lahteine
84e4edaea7
Add M48 comment for #1794
10 years ago
Scott Lahteine
9ba55baa5b
Track target temperature separately for each heater
10 years ago
Scott Lahteine
528e32a1d4
Fix timeout in thermal_runaway when temperature is set higher
10 years ago
Scott Lahteine
b98ebd517e
disable / enable_all_steppers functions
10 years ago
Scott Lahteine
713953d8c1
Upstream commits, allow no extruder in M105
10 years ago
Scott Lahteine
8f893eb8df
Merge pull request #1798 from thinkyhead/fixup_probing
Fix probe height at G28 start
10 years ago
Scott Lahteine
dde7e11f8e
Merge branch 'Development' into fixup_tr
Latest upstream commits
10 years ago
Scott Lahteine
abd7fc36b6
Fix probe height at G28 start
10 years ago
Scott Lahteine
610c8c5471
Merge pull request #1795 from thinkyhead/fixup_probing
Finish pin tests
10 years ago
quillford
1ad5fb1178
Fixed README typos
10 years ago
Scott Lahteine
e4934164e4
Merge pull request #1790 from Wurstnase/fix_home_z
fix feedrate for homing z
10 years ago
Scott Lahteine
a469d796e1
Add cleanups needed for #1772
10 years ago
Scott Lahteine
c0ca26cd50
Merge branch 'Development' into fixup_probing
Latest upstream commits
10 years ago
Scott Lahteine
5c1f08a35f
Merge pull request #1772 from croadfeldt/Merge_cleanup
Z_PROBE_ENDSTOP
10 years ago
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
Edward Patel
48b1c3822f
Merge branch 'Development-Marlin' into Development
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