Scott Lahteine
b23aef5b8d
Merge pull request #6190 from Bob-the-Kuhn/Stop-and-Kill-prints---round-2
...
Message for every KILL and STOP (also need delays)
2017-04-06 20:40:12 -05:00
Roxy-3D
1451b7eacf
UBL's Grid Based Leveling code
...
Pretty much... The code is in place. Still more work to do. But it
has a lot of hooks and variables in other code, so commit and merge
before I pick up a million 'Conflicts'.
2017-04-06 19:55:41 -05:00
Bob-the-Kuhn
a44b3432c1
add BLTouch retry to a second place & add/update delays
...
=================================================
implement requested changes
=================================================
remove delays (they're in another PR) & move return
2017-04-06 16:13:07 -05:00
Bob-the-Kuhn
f9686a108c
add Z servo test and toggle pins to M43
2017-04-06 15:59:38 -05:00
Scott Lahteine
f5c5c1f771
Rename all UBL files with a ubl_ prefix
2017-04-06 05:33:27 -05:00
benlye
f1d50ac1dc
Fixing bilinear Z offset and G29 Z
...
The fix in #6251 for bilinear Z offset was flawed and broke the Z parameter of G29 for bilinear levelling. This is reverted and a different fix is used for the double-addition of the Z-probe offset to the bilinear correction grid.
2017-04-06 07:41:46 +01:00
Scott Lahteine
eb1e6aa29b
Use same config name for all mesh dimensions
2017-04-06 00:42:52 -05:00
Scott Lahteine
c961dd084d
Add hidden option to output Bilinear grids in JSON
2017-04-05 23:43:17 -05:00
Scott Lahteine
df7b4252fd
Reduce M420 code for UBL slightly
2017-04-05 22:30:29 -05:00
Scott Lahteine
8866158d03
Add LEVELING_DATA as a capability
2017-04-05 22:30:28 -05:00
benlye
0a2b4f3486
Fix bilinear levelling z offset
...
Since run_probe was altered to return the probe Z position rather than the nozzle Z position bilinear levelling has been broken because the Z-offset has been applied twice - once in the run_probe function, and then again in the G29 code for bilinear levelling.
2017-04-05 22:01:40 -05:00
Scott Lahteine
44a849bdce
Fix broken M206/M428/G92 offsets
2017-04-05 22:01:37 -05:00
Roxy-3D
0423e93c42
Fix M421 AUTO_BED_LEVELING_BILINEAR and AUTO_BED_LEVELING_UBL
...
M421 was not connected up for AUTO_BED_LEVELING_BILINEAR.
M421 needed to migrate mesh data to new UBL EEPROM layout.
2017-04-02 16:46:37 -05:00
Scott Lahteine
c56eec29f0
Configurable delay for BLTouch servo emulation
2017-04-02 11:14:53 -05:00
Scott Lahteine
deaad78df9
Merge pull request #5678 from Bob-the-Kuhn/G38-optional-double-tap
...
G38 bug fix, made double touch optional & reverted to Z_MIN_PROBE
2017-04-02 10:32:04 -05:00
Scott Lahteine
4c72167af3
Prevent a warning on echo_command
2017-04-02 08:36:58 -05:00
Scott Lahteine
9b5fd9522e
Fix formatting, order for a UBL change
2017-04-02 07:15:40 -05:00
Scott Lahteine
2cbc7b4b73
Relocate serial macros and functions
2017-04-02 01:05:25 -05:00
Scott Lahteine
7a7a80e6c5
status_printf => lcd_status_printf_P
2017-04-02 01:05:25 -05:00
Scott Lahteine
790a3e9a8c
Remove extraneous check of UBL_G26_MESH_EDITING
2017-04-01 23:03:40 -05:00
Scott Lahteine
7310110ec0
Fix logic of UBL::fade_scaling_factor_for_z
2017-04-01 22:52:48 -05:00
Scott Lahteine
1a775cecac
Revert behavior of enqueue_and_echo_commands_P
2017-04-01 21:53:46 -05:00
Bob-the-Kuhn
185337e787
add delays to allow stop & kill messages to get out
2017-04-01 00:23:14 -05:00
Scott Lahteine
73e193da1d
Implement LCD_BED_LEVELING for PROBE_MANUALLY
2017-03-31 11:50:18 -05:00
Scott Lahteine
fcadc7bb1a
Implement the "manual" option for ABL
2017-03-31 11:50:18 -05:00
Scott Lahteine
342ee458ae
Additional UBL fixes, optimizations
2017-03-31 11:12:57 -05:00
Scott Lahteine
a5e085cbea
Have run_probe() return probe Z, not nozzle Z
2017-03-31 09:27:49 -05:00
Scott Lahteine
4487d22d56
Apply FIXFLOAT macro
2017-03-31 09:27:48 -05:00
Scott Lahteine
6cac0f43eb
MBL fiddle
2017-03-31 09:27:48 -05:00
Scott Lahteine
25a6bfa7ed
Add and apply WITHIN macro
2017-03-31 09:27:48 -05:00
Scott Lahteine
93aad54dc1
Clean up code, remove _now command function
2017-03-31 04:17:31 -05:00
Scott Lahteine
4902fd4e95
More data in UBL class, make it a static class
...
- Make all `unified_bed_leveling` data/methods static
- Move some UBL-related variables into the class
- Replace `map_[xy]_index_to_bed_location` with `mesh_index_to_[xy]pos`
2017-03-31 02:20:20 -05:00
Scott Lahteine
edbc024d76
Disable UBL_G26_MESH_EDITING by default
2017-03-31 02:20:20 -05:00
Scott Lahteine
9e4bd6b3b5
Further repairs to UBL, comments, spacing
2017-03-31 02:20:20 -05:00
Bob-the-Kuhn
f3618c3337
Reduce UBL RAM usage by making G26/G29 optional
2017-03-31 02:20:19 -05:00
Scott Lahteine
c9eb1d6ab7
Make MBL a static class, use lookup for index-to-point conversion
2017-03-31 01:28:07 -05:00
Scott Lahteine
de9d2cddc3
Merge pull request #6152 from thinkyhead/rc_cleanup_6150_etc
...
UBL cleanup, optimization
2017-03-30 17:40:29 -05:00
Scott Lahteine
9217e4b8ec
Various UBL cleanups and bug fixes
2017-03-30 17:09:49 -05:00
Scott Lahteine
9924199802
Merge pull request #5908 from thinkyhead/rc_fix_slowdown
...
General minor cleanup
2017-03-29 21:43:33 -05:00
Scott Lahteine
f105cad43c
Marlin: Slight cleanup to Marlin_main.cpp
2017-03-29 06:40:29 -05:00
Scott Lahteine
e3459ec178
Merge pull request #5989 from MagoKimbra/rc_fix_delta_angles
...
Fix delta_angles
2017-03-29 03:35:18 -05:00
Scott Lahteine
0a23a1bb3b
Dynamic feedrate on SCARA, converting target mm/s to deg/s
2017-03-28 17:21:07 -05:00
Scott Lahteine
a9fc30ae2e
Use safe_delay to ensure watchdog reset
2017-03-26 23:49:56 -05:00
Scott Lahteine
34d1c41b5f
Merge pull request #6111 from benlye/benlye-patch-echo_command
...
Fix type conversion issue with echo_command
2017-03-24 17:57:28 -05:00
benlye
6a601aca35
Fix type conversion issue with echo_command
...
With the the current definition of echo_command I cannot compile RCBugFix (Arduino IDE 1.8.1) with the error "invalid conversion from 'const char*' to 'char*'". This change resolves that.
2017-03-24 17:23:02 +00:00
Scott Lahteine
009a6ddd39
Adjust bilinear grid in M851
2017-03-24 06:28:59 -05:00
Scott Lahteine
eab7854a73
Merge pull request #6074 from thinkyhead/rc_immediate_shove
...
Immediate commands take precedence
2017-03-24 05:52:27 -05:00
Scott Lahteine
b5711a99a2
Patches to bring UBL closer to compliance
2017-03-24 01:37:52 -05:00
Scott Lahteine
d076c1b604
Apply some general cleanup to code
2017-03-24 01:37:51 -05:00
Roxy-3D
b8e4a6970b
Get UBL up and running again
...
All the changes to get the code into compliance with Marlin coding
standards made UBL sick. This pretty much gets UBL back up and
running.
2017-03-23 16:08:37 -05:00
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
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
b904b5ae8d
Audible feedback for settings store/load/reset
2017-03-22 02:15:21 -05:00
rafaljot
6da949bbf0
Update Marlin_main.cpp
...
Sometimes after killing heaters are still on.
2017-03-21 15:06:01 +01:00
Scott Lahteine
48c6284c91
Immediate commands take precedence
2017-03-19 21:50:48 -05:00
Scott Lahteine
ff0dd162b7
PARK_HEAD_ON_PAUSE implementation
2017-03-19 07:27:35 -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
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
4bca27ab89
Fix Kelvin conversion
...
Thanks to @ospalh -- #6056
2017-03-18 13:23:08 -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
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
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
1e57b0c269
Remove delta interpolation concept
2017-03-17 06:32:11 -05:00
Scott Lahteine
e46898f8e5
Remove kinematic optimizations
2017-03-17 06:30:22 -05:00
Scott Lahteine
0e410c9dfd
Software endstop options as simple switches
2017-03-17 06:05:17 -05:00
Scott Lahteine
d01b915085
Implement soft_endstops_enabled for clamping
2017-03-17 06:05:17 -05:00
Scott Lahteine
e4649c9044
Add HAS_SOFTWARE_ENDSTOPS macro
2017-03-17 06:05:17 -05:00
Scott Lahteine
3e927ff204
Replace MBL Z hacking
2017-03-17 06:05:17 -05:00
Scott Lahteine
4e53124681
Merge pull request #6039 from Bob-the-Kuhn/M114-sync-with-stepper
...
M114 - wait for move completion before reporting position
2017-03-17 05:22:46 -05:00
Scott Lahteine
672e45652e
Improved solution to tool-change bug
2017-03-16 23:59:10 -05:00
Scott Lahteine
23f1cfb46f
Fix stuck CHDK pin as suggested in #6041
2017-03-16 21:49:39 -05:00
Bob-the-Kuhn
34ff0c3439
M114 - wait for move completion before reporting position
2017-03-16 15:10:45 -05:00
Bob-the-Kuhn
b31604a492
Message for every KILL and STOP
...
No more mystery halts & resets
Moved messages to language.h
Added current command to inactive timeout message
2017-03-15 21:05:11 -05:00
Bob-the-Kuhn
685ed5393a
Bug Fix: Switching extruder tool change leaves Z in wrong position
...
The tool_change function saves the current_position to the destination
array soon after starting. Later in the switching extruder section, the
destination array is modified when moving the Z axis up & down. A later
section of tool_change moves the head back to the “original location”
using the destination array. This later section assumes that the
destination array hasn’t been modified.
The fix is to save the destination Z position and then restore it after
the Z movements have completed.
Going back to using the current_position array for the switching
extruder Z axis moves (and leaving the destination array untouched)
doesn’t fix the problem.
This bug was introduced by the “Make tool_change kinematic compatible”
commit # 847429eff4
which was merged on 10
Oct 2016 as part of PR 4982.
This bug was discovered in Issue 5966.
2017-03-14 02:36:24 -05:00
Scott Lahteine
51353f8fea
Merge pull request #6000 from trivalik/NoWorkspaceWarning
...
prevent warning with define of NO_WORKSPACE_OFFSETS
2017-03-12 00:00:51 -06:00
Trivalik
71ac6f9d42
prevent warning with define of NO_WORKSPACE_OFFSETS
2017-03-09 23:49:57 +01:00
MagoKimbra
37a26dfc09
Fix delta_angles
2017-03-08 09:23:30 +01:00
Scott Lahteine
2defb1d748
Use SET_INPUT_PULLUP where appropriate
2017-03-07 23:43:33 -06:00
Scott Lahteine
58b3e98878
Use arrays for delta tower parameters
2017-03-07 19:00:22 -06:00
Scott Lahteine
47242a40bb
Apply updated changes for delta_tower_angle_trim
2017-03-07 18:15:11 -06:00
Jimmy Envall
00b6b3da79
Added support for delta tower angle corrections.
2017-03-07 16:35:58 -06:00
Scott Lahteine
45f949d833
TMC2130 Library: @teemuatlut replaces @makertum
2017-03-07 04:22:06 -06:00
Scott Lahteine
33f8a8a344
Merge pull request #5973 from thinkyhead/rc_circle_pattern
...
Add circle pattern to nozzle clean
2017-03-06 04:47:01 -06:00
Scott Lahteine
94b3e0a483
Merge pull request #5959 from benlye/benlye-fixm48
...
Remove extra carriage return in M48 V1 output
2017-03-06 04:24:28 -06:00
Marek Pikuła
6836b94eea
Added circle pattern for nozzle cleaning feature
2017-03-06 03:03:00 -06:00
Scott Lahteine
be98016674
Merge pull request #5963 from thinkyhead/rc_no_offsets_optim
...
New option: NO_WORKSPACE_OFFSETS
2017-03-05 21:46:49 -06:00
Scott Lahteine
87b03b16bd
Use a macro for array copies
2017-03-05 04:43:46 -06:00
Scott Lahteine
e141f3a03f
Optimize coordinate transformation
...
Pre-compute the combined position shift and home offset to save a
single float fetch-and-add per conversion. Great for delta/scara and
bed leveling.
2017-03-05 04:43:16 -06:00
Scott Lahteine
5f7e85398b
Implement NO_WORKSPACE_OFFSETS
2017-03-05 04:43:15 -06:00
benlye
dead89062a
Update Marlin_main.cpp
...
Remove unnecessary line break from M48 V1 output.
2017-03-04 17:58:10 +00:00
Scott Lahteine
1ef6ccd919
Merge pull request #5951 from thinkyhead/rc_print_2d_array
...
Reduce code size (40b, or 166b with bilinear subdivision)
2017-03-03 21:27:44 -06:00
Scott Lahteine
98c7b682ca
General cleanup, const usage, var naming
2017-03-03 20:57:49 -06:00