zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
7521 commits 1 branch 0 tags 156 MiB
Commit graph

7521 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine 8f9face956 Merge pull request #6088 from rafaljot/patch-3 
Update Marlin_main.cpp
 2017-03-23 01:51:51 -05:00
Scott Lahteine 782634b6c9 Merge pull request #6081 from Sebastianv650/MIN_STEPPER_PULSE_for_Babystepping 
Add MINIMUM_STEPPER_PULSE ability to babystepping
 2017-03-22 21:57:36 -05:00
Scott Lahteine d29ab8f2a6 Merge pull request #6075 from thinkyhead/rc_cleanup_ubl_1 
Additional cleanup of UBL code
 2017-03-22 21:45:59 -05:00
Scott Lahteine af2ea23e9c EXTRUDER_RUNOUT_PREVENT uses buffer_line_kinematic 2017-03-22 20:51:12 -05:00
Scott Lahteine cd882b88db #if defined => #ifdef / PIN_EXISTS 2017-03-22 20:51:11 -05:00
Scott Lahteine e244399766 Additional cleanup of UBL code 2017-03-22 20:51:10 -05:00
Bob-the-Kuhn 0934563b97 G38 optional double touch 
Made the double touch portion a conditional compile based on the
PROBE_DOUBLE_TOUCH flag.

==============================================

Bugfix

The current G38 only stopped a move if it involved the Z axis.

Moved all the G38 code to it's own section and put it where it would
always be executed no matter what axis was moving or if the endstop was
enabled.

Also added a comment to configuration_adv to alert the user the double
tap had to be turned on.

==============================================

Change G38 back to using Z_MIN_PROBE

There's no Z_MIN endstop if Z_DUAL_ENDSTOPS is enabled and you have them
set to the top of the gantry.

G38 started out as using the Z_MIN_PROBE pin.  I don't remember why we
changed it to the Z_MIN endstop.
 2017-03-22 15:08:49 -05:00
Scott Lahteine cc3204509c UBL patch from Bob-the-Kuhn 2017-03-22 07:54:20 -05:00
Scott Lahteine 100c9bc52d Merge pull request #6079 from thinkyhead/rc_audio_feedback 
Standard audio feedback. Use for settings store/load/reset
 2017-03-22 07:35:57 -05:00
Scott Lahteine b904b5ae8d Audible feedback for settings store/load/reset 2017-03-22 02:15:21 -05:00
Sebastianv650 bf57eb2447 Protect Babystepping against other ISRs 
Especialy against stepper ISR.
This is even more important when a minimum pulse width is set,
increasing the runtime of a babystep.
 2017-03-21 18:05:44 +01:00
Sebastianv650 80830919dc Add MINIMUM_STEPPER_PULSE ability to babystepping 2017-03-21 17:50:38 +01:00
rafaljot 6da949bbf0 Update Marlin_main.cpp 
Sometimes after killing heaters are still on.
 2017-03-21 15:06:01 +01:00
Roxy-3D 72f7b14e66 Make G29's Interactive Mesh Editor Work 2017-03-20 12:52:51 -05:00
Roxy-3D 3fd74b121f Get G29's Interactive Mesh Editor running 
G29 P4 R O  should work now.
 2017-03-20 12:52:51 -05:00
Roxy-3D 1d58558bec Spelling fix 2017-03-20 12:52:51 -05:00
Scott Lahteine 2573f4dd05 Merge pull request #6052 from thinkyhead/rc_lift_on_pause 
Add PARK_HEAD_ON_PAUSE feature / M125
 2017-03-20 03:36:31 -05:00
Scott Lahteine 48c6284c91 Immediate commands take precedence 2017-03-19 21:50:48 -05:00
Scott Lahteine 786fe2ba2a Include PARK_HEAD_ON_PAUSE in Travis testing 2017-03-19 18:34:58 -05:00
Roxy-3D b3c4f71c6f Merge pull request #6071 from Roxy-3D/RCBugFix 
Allow FWRETRACT with UBL Enabled
 2017-03-19 16:54:57 -05:00
Roxy-3D 76c270fdf2 Allow FWRETRACT with UBL Enabled 
The retraction flag in UBL's G26 was conflicting with the FWRETRACT option.

All fixed!
 2017-03-19 15:43:12 -06:00
Roxy-3D 06c31daa53 Merge pull request #6070 from Roxy-3D/RCBugFix 
Allow G29 P1 R to generate the mesh
 2017-03-19 16:34:48 -05:00
Roxy-3D c377c59d47 Allow G29 P1 R to generate the mesh 
Fix the logic change that happened when UBL got merged.
 2017-03-19 15:13:33 -06:00
Scott Lahteine ff0dd162b7 PARK_HEAD_ON_PAUSE implementation 2017-03-19 07:27:35 -05:00
Scott Lahteine 26473cab6d Add PARK_HEAD_ON_PAUSE feature 2017-03-19 05:06:55 -05:00
Scott Lahteine 4cf51157b3 Use XYZE rather than NUM_AXIS 2017-03-19 01:14:39 -05:00
Scott Lahteine 4c7f14752a Add disable_e_steppers function 2017-03-19 01:14:39 -05:00
Scott Lahteine 8eb29f91e6 Patch filament change options and beep code 2017-03-19 01:14:39 -05:00
Scott Lahteine 56c9dfc83b Merge pull request #6066 from thinkyhead/rc_felix_fix 
Update Felix config for UBL
 2017-03-19 01:11:02 -05:00
Scott Lahteine 9b2b53f63a Merge pull request #6042 from thinkyhead/rc_fix_toolchange_z 
Move Z last in tool-change for SWITCHING_EXTRUDER
 2017-03-19 00:34:41 -05:00
Scott Lahteine f98fb6b38e Update Felix config for UBL 2017-03-19 00:28:48 -05:00
Scott Lahteine 7cabe81373 Merge pull request #6057 from thinkyhead/rc_followup_6054 
Followup 6054 with some cleanup
 2017-03-18 13:49:20 -05:00
Scott Lahteine 4bca27ab89 Fix Kelvin conversion 
Thanks to @ospalh -- #6056
 2017-03-18 13:23:08 -05:00
Scott Lahteine 143ab8f329 Remove Roxy's personal configurations 2017-03-18 12:35:02 -05:00
Scott Lahteine 2512871a36 Patch configs UBL followup 2017-03-18 12:32:03 -05:00
Scott Lahteine 27b5666e15 Move Allen Key probe definition to the top 2017-03-18 12:27:37 -05:00
Scott Lahteine 77cf648ed3 Move menu selection past static items in 1 screen 2017-03-18 12:26:21 -05:00
Scott Lahteine 2c630a1b5c Merge pull request #6054 from thinkyhead/rc_ubl_renewal 
UBL for RCBugFix — cleanup, rebase, patch
 2017-03-18 12:07:57 -05:00
Scott Lahteine 0492a3a8f1 Merge pull request #6027 from Bob-the-Kuhn/add_kill_info 
Message for every KILL and STOP
 2017-03-18 11:49:35 -05:00
Scott Lahteine fba22652fc Add UBL testing to Travis 2017-03-18 11:35:21 -05:00
Scott Lahteine 6618346148 Patches to work around "register spill" compiler bug 2017-03-18 11:35:21 -05:00
Scott Lahteine be7dd90382 Add Thermistor 75: MGB18 silicon pad 2017-03-18 11:35:20 -05:00
Scott Lahteine f890ceba9e Add 'tags' to .gitignore 2017-03-18 11:35:20 -05:00
Scott Lahteine b0a9c82c31 Fix single-char echo and pinMode usage 2017-03-18 11:35:20 -05:00
Scott Lahteine fb60aa3736 UBL implementation 2017-03-18 11:35:20 -05:00
Scott Lahteine 238b8fd2a3 UBL core and support files 2017-03-18 11:35:19 -05:00
Scott Lahteine cf94688925 Univeral Bed Leveling - configuration 2017-03-18 11:35:19 -05:00
Scott Lahteine 03aa424ccb Merge pull request #6053 from thinkyhead/rc_clean 
Remove extraneous whitespace
 2017-03-18 03:26:45 -05:00
Scott Lahteine af644871bf Merge pull request #6045 from thinkyhead/rc_remove_raw_kinematics 
Remove delta optimization concepts… for now
 2017-03-18 03:26:24 -05:00
Scott Lahteine 77491dd924 Remove extraneous whitespace 2017-03-18 03:17:39 -05:00