AnHardt
6a514f3dc9
Aplied HAS_LCD_CONTRAST also to Marlin_main.cpp
...
and cleaned typo.
10 years ago
Scott Lahteine
3162971cd6
current_position not static
10 years ago
Scott Lahteine
27cb90da8b
IsStopped / IsRunning inline
10 years ago
Scott Lahteine
e03da4805b
Merge pull request #1774 from epatel/Development
...
Mesh bed leveling: Added G29 S3 + finer display steps during manual input + bug fix
10 years ago
Scott Lahteine
f7c4e7e19f
Fix G29 not deploying in some instances
10 years ago
Edward Patel
002340f32c
Merge branch 'Development-Marlin' into Development
10 years ago
Scott Lahteine
c379f17117
Encapsulate setting of homing_bump_feedrate
10 years ago
Scott Lahteine
d20f42c883
Don't stow the probe until the last grid point!
...
- Address Issue #1682 at hash #issuecomment-89756858
10 years ago
Scott Lahteine
6d084c017f
Fix typo in FWRETRACT handler
...
Should be `retracting` and not `retract`
10 years ago
Edward Patel
2f0081bbb5
Compile error fix! Fix for merge artifacts.
10 years ago
Edward Patel
ea10601406
Merge branch 'Development-Marlin' into Development
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
10 years ago
Scott Lahteine
61f8394361
Compare indices instead of floats for probe actions
10 years ago
Scott Lahteine
0935084141
Fix manage_inactivity
...
- Document `manage_inactivity` function
- Allow `EXTRUDER_RUNOUT_PREVENT` to work with all extruders
- Use faster `memcpy` for copying coordinates
10 years ago
Scott Lahteine
c065da52ec
Spacing and spelling
10 years ago
Scott Lahteine
8680b515b0
Fix missing tmp_extruder -> target_extruder
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
84e4edaea7
Add M48 comment for #1794
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
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
92119d0f7d
Static delta[] for SCARA
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
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
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
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
10 years ago
Chris Roadfeldt
26dc80bf2d
Typo fixed...
10 years ago
Chris Roadfeldt
a57862e29f
Cleaning up code in prep for merge with upstream.
10 years ago
Chris Roadfeldt
745d9fe1a4
Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
...
Conflicts:
Marlin/Marlin_main.cpp
10 years ago
Scott Lahteine
9593f09b99
Merge pull request #1764 from thinkyhead/probe_leveling
...
Fix homing and leveling
10 years ago
Scott Lahteine
72c7de3570
Cleanup M48
10 years ago
Scott Lahteine
97a258b0b0
Clean up, document home_axis
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
Scott Lahteine
1c7391717e
Include sync_plan_position_delta for SCARA also
10 years ago
Scott Lahteine
0b57a2ab8b
Merge pull request #1757 from bq/Translation-strings
...
Added new trasnslatable labels.
10 years ago
Scott Lahteine
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
10 years ago
Chris Roadfeldt
c89b8368ee
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
10 years ago
Ivan Galvez Junquera
d08782386b
Added new trasnslatable labels.
...
* Added MSG_END_HOUR and MSG_END_MINUTE labels to all language files.
* Available translations:
EN, FR, DE, ES, IT, PT, PT-BR.
10 years ago