Commit graph

229 commits

Author SHA1 Message Date
InsanityAutomation 610fb46683 Fix some ExtUI issues (#13799) 2019-04-26 09:32:01 +02:00
Scott Lahteine cf12fc8366
Expand on serial debugging (#13577) 2019-04-05 20:02:46 -05:00
Scott Lahteine 2aa35e95af More G26 arc cleanup
Followup to #13531
2019-04-03 16:03:21 -05:00
ManuelMcLure 04086fc455 Minor optimization to ARC_SUPPORT code (#13531) 2019-03-30 22:29:37 -05:00
InsanityAutomation 7240e3a68f Allow G26 with no heated bed (#13511) 2019-03-29 13:32:43 -05:00
Thomas Moore 263f8edff8 Disable volumetric extrusion during G26 (#13479) 2019-03-25 22:41:52 -05:00
InsanityAutomation 3fb8489ae3 EXTUI and UBL compilation fixes (#13420) 2019-03-17 07:57:54 -05:00
Scott Lahteine 49cf92dc36
Extended condition macros (#13419)
Allow `ENABLED`, `DISABLED`, `PIN_EXISTS`, and `BUTTON_EXISTS` to take multiple arguments. Also add:
- Alias `ANY(...)` for `!DISABLED(...)`
- Alias `ANY_PIN(...)` for `PIN_EXISTS(a) || PIN_EXISTS(b) ...`
- Alias `EITHER(A,B)` for `ANY(...)`
- Alias `ALL(...)` and `BOTH(A,B)` for `ENABLED(...)`
- `NONE(...)` for `DISABLED(...)`
2019-03-16 23:43:06 -05:00
Scott Lahteine f5bcc00570
Unify debugging output with debug_out.h (#13388) 2019-03-14 02:25:42 -05:00
Scott Lahteine 87162658c4
Fix and improve software endstops (#13386) 2019-03-13 05:48:36 -05:00
InsanityAutomation c03df89921 ExtUI Mesh Leveling Extensions (#13363) 2019-03-13 00:45:52 -05:00
Scott Lahteine e52bcc9408 Limit top bed temp to BED_MAXTEMP - 10
The chances of a 10° overshoot is pretty minimal.
2019-03-11 16:32:34 -05:00
InsanityAutomation d54741eda8 Update some G26 plausible values. Add speed control. (#13330) 2019-03-08 03:13:44 -06:00
Scott Lahteine cfdb38eda4
Allow SERIAL_ECHOPAIR to take up to 12 pairs (#13311) 2019-03-05 06:46:19 -06:00
Scott Lahteine 808b076000 Update some ABL/UBL conditionals 2019-02-25 16:01:42 -06:00
Scott Lahteine 0feeef2604 Update copyright in headers 2019-02-12 15:30:11 -06:00
Scott Lahteine 433518de74 Prevent M420 error from disconnecting OctoPrint
Just echo the error instead of labeling it `Error:`.
2019-02-04 01:54:43 -06:00
Marcio Teixeira 81e753064a Fix ExtUI compile warnings and error (#12799) 2019-01-03 08:36:43 -06:00
MasterPIC 3bb8b3529a Center ABL grid on bed with H parameter. (#12610) 2018-12-09 11:24:48 -06:00
Scott Lahteine b7e38ea249 Signal an invalid mesh for M420 enable / load 2018-12-07 16:14:11 -06:00
Scott Lahteine c986239837
A single SERIAL_ECHO macro type (#12557) 2018-11-29 16:58:58 -06:00
Scott Lahteine a4c15dc54f
Modify MBL to use IJ instead of XY (#12478) 2018-11-19 09:08:15 -06:00
Marcio Teixeira c1e17037e5 Various fixes for MarlinUI and ExtUI (#12439) 2018-11-17 22:21:44 -06:00
Giuliano Zaro 43ecdb606f Fix a compile warning (#12452) 2018-11-17 07:08:25 -06:00
Roxy-3D cda5ef08fa
Debug of G2-G3 for UBL (#12386)
Changes only affect UBL.  Everything else is left alone.
2018-11-13 11:20:21 -06:00
Scott Lahteine a163c89c6a Followup to 50af1d1 2018-11-12 20:31:53 -06:00
Scott Lahteine 50af1d1e08 Differentiate translated On/Off from Serial ON/OFF 2018-11-12 17:23:08 -06:00
Scott Lahteine a0c795b097
Encapsulate common display code in a singleton (#12395)
* Encapsulate common LCD code in a singleton
* Depend more UBL code on UBL_DEVEL_DEBUGGING
  - Since most users don't need the debugging on at all times, this helps reduce the default build size for UBL by over 2K, a little closer to fitting on 128K boards.
2018-11-11 12:16:24 -06:00
Scott Lahteine 6093df11dc
Allow G26 to use the active extruder (#12387)
* Make lcd_quick_feedback argument optional
* Add click_to_cancel option to wait_for_hotend/bed
* Have G26 use the active nozzle and wait_for_hotend/bed
* Use wait_for_release in UBL G29
* Add 'T' parameter to G26 for an initial tool-change
2018-11-10 18:07:38 -06:00
Scott Lahteine bed15fcd81 Tweak 'echo_not_entered' used by MBL's G29 2018-11-10 01:32:51 -06:00
Scott Lahteine b3b4e6dc45
Change Marlin debug flag names to fix conflicts (#12340)
In reference to #11000
2018-11-05 22:48:28 -06:00
Scott Lahteine 486f2a66a9 Fix MBL XY parameter error messages
Fix #11522
2018-11-05 04:17:37 -06:00
Scott Lahteine 2613ddf61c Fix "circle" 2018-11-05 04:17:37 -06:00
Scott Lahteine 07a0822ebe M420 support in MARLIN_DEV_MODE 2018-11-04 20:54:38 -06:00
Scott Lahteine 44fa7fb18c Cleanups for leveling-related code 2018-11-04 19:07:47 -06:00
Scott Lahteine 3583e2b449
Followup to Menu Refactor (#12275) 2018-10-30 16:34:45 -05:00
MasterPIC 6fbc87301f 'G29 H' to set a centered square probe area (linear, bilinear) (#12242) 2018-10-27 20:30:21 -05:00
Scott Lahteine d556dc1865
Fix and improve EEPROM storage (#12054)
* Clean up Temperature PID
* Improve EEPROM read/write/validate
* Group `SINGLENOZZLE` saved settings
* Group planner saved settings
* Group filament change saved settings
* Group skew saved settings
* Group `FWRETRACT` saved settings
2018-10-10 09:45:20 -05:00
Scott Lahteine 07d33849b0 Fix unused var warning, apply ENABLED 2018-10-09 21:31:28 -05:00
Scott Lahteine 1718eff54a Code changes supporting up to 6 extruders 2018-09-16 22:32:53 -05:00
Thomas Moore c437bb08f1 Overhaul of the planner (#11578)
- Move FWRETRACT to the planner
- Combine leveling, skew, etc. in a single modifier method
- Have kinematic and non-kinematic moves call one planner method
2018-09-16 21:24:15 -05:00
Scott Lahteine 2a61c9a939 Various fixups to configs, spacing, etc. 2018-09-06 06:44:31 -05:00
Scott Lahteine e05e95cf97 Clean trailing whitespace 2018-07-25 18:49:47 -05:00
Scott Lahteine 05518d6add Add newline to end of file 2018-06-29 23:54:16 -05:00
Colin Gilgenbach 0fff79c24b Fixes G29_with_retry behavior (#11045)
* Fix G29 (ABL) retry behavior
2018-06-29 20:48:11 -05:00
Scott Lahteine a2a30ff0ac Use Tool 0 for Dual X Axis G29
See https://github.com/MarlinFirmware/Marlin/issues/5597#issuecomment-397683325
2018-06-20 01:32:23 -05:00
Scott Lahteine 4832be52d7 Followup to G29 O 2018-06-11 21:57:26 -05:00
Robert Mendon 86170e6a66 [2.0.x] Add O (optional) flag to G28/G29 (#10913) 2018-06-11 21:51:48 -05:00
Eduardo José Tagle 6f330f397e [2.0.x] Buffer overflow and scroll fix, UTF8 cleanup (#10844) 2018-05-25 23:32:37 -05:00
Scott Lahteine c173a31060 Fix some compile warnings 2018-05-19 16:54:48 -05:00
Scott Lahteine eb2eb72720
Modify UBL mesh_is_valid and use in leveling_is_valid (#10746) 2018-05-14 22:36:03 -05:00
Scott Lahteine 99ecdf59af Smarter MIN, MAX, ABS macros
Use macros that explicitly avoid double-evaluation and can be used for any datatype, replacing `min`, `max`, `abs`, `fabs`, `labs`, and `FABS`.

Co-Authored-By: ejtagle <ejtagle@hotmail.com>
2018-05-13 04:52:56 -05:00
Scott Lahteine 306f0f2135
Move Stepper::synchronize to Planner (#10713)
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
2018-05-12 01:38:02 -05:00
ManuelMcLure 8679f671ed Remove dependency on PI. (#10701) 2018-05-11 17:55:56 -05:00
Scott Lahteine 6671c064cd
Use arc moves for G26 if enabled (#10696)
Co-Authored-By: ManuelMcLure <manuelmclure@users.noreply.github.com>
2018-05-11 02:15:14 -05:00
Scott Lahteine bfe223e120 Adjust usage of stepper.synchronize 2018-05-06 01:24:14 -05:00
Scott Lahteine d7b699ec34 Fewer includes of vector_3.h 2018-05-01 07:05:18 -05:00
Scott Lahteine 05c33833e7
[2.0.x] Add NO_LCD_MENUS option (#10582) 2018-04-30 21:16:31 -05:00
Scott Lahteine 59fda986ea Allow Z_AFTER_PROBING to be 0 2018-04-30 03:25:47 -05:00
Scott Lahteine 8db7fb226a Fix M420 C for UBL 2018-04-28 08:14:20 -05:00
Scott Lahteine a51ba6e3f6 Fix ABL grid bounds test for Delta/SCARA
Addressing #10538
2018-04-27 02:23:10 -05:00
Scott Lahteine eef0248a1c
Add M420 C to adjust the whole mesh (#10522) 2018-04-25 06:43:45 -05:00
Scott Lahteine cb46cb8480
Add HAS_HEATED_BED conditional (#10495) 2018-04-23 17:13:01 -05:00
Scott Lahteine 65a6a86d19 Don't report point 0 in MBL G29 2018-04-20 13:12:50 -05:00
Scott Lahteine df2f24617b Use 0 as the bed position (not Z_MIN_POS) 2018-04-17 20:32:56 -05:00
Scott Lahteine 0746aff595 Improve UBL mesh report. Add M420 T, M421 N 2018-04-17 15:52:56 -05:00
Scott Lahteine 99282a46e9 Make sure ABL (manual) starts close to the bed 2018-04-13 20:19:30 -05:00
Scott Lahteine bb7064cc30 Tweak MBL move to bed code 2018-04-12 22:43:02 -05:00
Scott Lahteine daa712455b Make sure MBL starts close to the bed
Fix #10390
2018-04-12 19:36:37 -05:00
Scott Lahteine aa20b3ef7c Fix linear/3-point manual leveling buffer overrun
Fixes #10137
2018-03-28 18:41:22 -05:00
Scott Lahteine bc45fb6b13 Tweak use of move_z_after_probing 2018-03-21 01:25:08 -05:00
Scott Lahteine c352954882 Allow no raise after run_z_probe in probe_pt 2018-03-21 01:24:51 -05:00
Scott Lahteine dd2949922b Consolidate 3-point leveling point options 2018-03-19 04:12:20 -05:00
Scott Lahteine 14c03cb6f4
[2.0.x] Make MIN_PROBE_EDGE a general option (for electronic probes) (#10069)
Some probes don't work near the edges of the bed. This change promotes MIN_PROBE_EDGE to a general setting that applies to all probing functions.
2018-03-13 01:15:22 -05:00
Scott Lahteine 28f1276286
[2.0.x] Add Z_AFTER_PROBING option (#10058)
Some "fix-mounted" probes need manual stowing. And after probing some may prefer to raise or lower the nozzle. This restores an old option but tailors it to allow raise or lower as preferred.
2018-03-11 13:07:55 -05:00
Scott Lahteine 3f89bbeab5 Drop a conditional only used once 2018-02-24 16:35:31 -06:00
Scott Lahteine 241e55ef3b Apply SERIAL_FLUSH macro 2018-02-16 17:32:12 -06:00
Scott Lahteine 6a70a4fbb3
Fix G26 circles (#9627)
Easier to configure. Catch an odd divisor.
2018-02-15 22:11:26 -06:00
Roxy-3D c78e1c0f23
Fix G26 Circles... (#9641)
* Fix G26 Circles...
2018-02-15 11:15:15 -06:00
Scott Lahteine 8d71ad37cb flush comment to match 1.1.x 2018-02-14 02:56:18 -06:00
Scott Lahteine e3043d7ac7 Fix #8744 2018-02-10 16:54:42 -06:00
Scott Lahteine ca8fdff1af Comment G26 properly 2018-02-06 00:58:28 -06:00
GMagician 338dac258b [2.0.x] Fix compiler error when G26 is enabled (#9492) 2018-02-05 14:27:39 -06:00
Scott Lahteine 03bfc0d7c8
Merge pull request #9439 from thinkyhead/bf2_fix_G26_circle_bumps
[2.0.x] Change G26 circle angles
2018-02-04 19:05:18 -06:00
Scott Lahteine 2ea4e74ed3 Misc. comments 2018-02-04 17:40:39 -06:00
Scott Lahteine e6cdc438fd Change G26 circle angles
To prevent the nozzle from colliding with the printed pattern.
2018-02-03 19:17:49 -06:00
Scott Lahteine a8764ac5d5 G26 parity with 1.1.x 2018-02-02 05:19:14 -06:00
Scott Lahteine 34160806c0 Fix broken G29 W I J 2018-02-01 21:37:35 -06:00
Scott Lahteine e5ca60acf5 Patch G29 no_action for A and Q 2018-01-23 14:00:06 -06:00
Roxy-3D bfd9728cf4
Serial buffer over run work around for v2.0.0 (#9236)
* Work around for serial buffer over run

PronterFace sends a lot of M105 commands.  During long operations such
as UBL's G29 P1, G29 P2, G29 P4 and G26 this can over run the serial
buffer.   This results (very often) in a M1 (actually a M1M105) ending
up in the command queue.

Until we figure out a better way to resolve this issue, this will keep
the UBL commands from experiencing bogus commands at thier completion.
2018-01-18 19:57:18 -06:00
Roxy-3D f5f1b069ad
Convert UBL mesh tilting to all use the same algorithm (#9204)
A number of regressions were patched also. The UBL G29 P2 and P4 Press and Hold had stopped working. It is very possible this is broken in the bugfix_v1.1.x branch also.

The main purpose of the Pull Request is to get the 3-Point mesh tilting to use the LSF algorithm just like the grid based mesh tilt. This simplifies the logic and reduces the code size some what. But the real reason to do it is the 3-Point case can be solved exactly. And by feeding these numbers into the LSF algorithm it provides a way to check all that code for 'correctness'.
2018-01-16 11:08:00 -06:00
Scott Lahteine 60d07f20e7 Make mbl.has_mesh() a method 2018-01-07 00:13:36 -06:00
Scott Lahteine 86818c9a89 Move MBL functions into the class 2018-01-07 00:13:36 -06:00
Unknown bbb8d4c802 Set has_mesh if user issues G9 S3
Prevents user from having to manually run through entire manual leveling process only to enable mesh so they can manually restore their offline mesh backup
2018-01-06 21:07:07 -08:00
Scott Lahteine 4ef965cc40 Fix compiler warnings 2017-12-25 08:53:01 -06:00
Scott Lahteine 9e8008c49c Fixes for G29, esp. 3POINT 2017-12-25 08:37:27 -06:00
Scott Lahteine f2731c9f93 Allow consecutive uses of G29 2017-12-25 06:32:33 -06:00
Scott Lahteine 4b49ea1e92 General cleanup of config-store, reset_bed_level 2017-12-25 05:16:01 -06:00
Scott Lahteine a71d2f3f40 UBL_DELTA => UBL_SEGMENTED 2017-12-11 00:27:06 -06:00
Scott Lahteine 73e32925e4 References are better for array args 2017-12-11 00:27:06 -06:00
Scott Lahteine 204199e1ce Only compare XYZ to check motion 2017-12-10 23:00:00 -06:00
Scott Lahteine 7d2e850577 Have M420 report a changed position 2017-12-10 21:39:49 -06:00
Scott Lahteine 03ba79f144 Sync and report changed position 2017-12-10 21:39:49 -06:00
Scott Lahteine 90cf6a06be Simplify G26 user_canceled 2017-12-06 22:02:54 -06:00
Scott Lahteine c846388a65 Standardize LCD interface code for UBL a little 2017-12-06 21:50:54 -06:00
Scott Lahteine 2fde60da12 Changes for parity with 1.1.x 2017-12-06 21:50:54 -06:00
Scott Lahteine f4b16a3bac
Update M49.cpp 2017-12-03 03:34:56 -06:00
Ben Lye 1f3ad461bc
Update M49.cpp
Fix M49 so that it does not hang the terminal console.
2017-11-30 20:17:44 +00:00
Scott Lahteine 0786b61ce7 Followup to #8575 2017-11-27 12:58:40 -06:00
Scott Lahteine 276271e72f Make MBL work more like PROBE_MANUALLY 2017-11-27 02:12:29 -06:00
Roxy-3D e48fcad615 change G26 and G29 bit function names to avoid HAL collision 2017-11-25 19:58:45 -06:00
Scott Lahteine 41ec449960 Fix G26 error return 2017-11-25 19:53:14 -06:00
Scott Lahteine b49acce035 Tweaks for lcd_external_control 2017-11-24 15:53:25 -06:00
Roxy-3D ec04cf27d3
Fix the G26 out of scope identifiers in the v2.0.0 branch (#8543)
These changes may need to be warmed over.  I tried to fix things with
the least amount of disruption.   I just wanted to get the bugfix_v2.0.0
branch working for people again.
2017-11-24 10:39:56 -06:00
Scott Lahteine c6b0c104bb Adapt G26 to work for all meshes 2017-11-23 22:31:37 -06:00
Scott Lahteine c19eb33408 Move G26 to gcode sub-folder 2017-11-23 21:43:23 -06:00
Scott Lahteine 0cfb936dd1 Clarify some motion code 2017-11-08 22:15:55 -06:00
Colten Edwards a6160916b0 [2.0] Fix M48 for delta printers/ABL compile issue (#8286)
* fix M48 for delta printers

fix M48 for delta printers. home printer if not already homed.

* remove ENABLED(DELTA)

remove ENABLED(DELTA) as it is not needed.

* Update M48.cpp

* abl needs queue.h

without queue.h abl will not compile since there is a script that runs at the end of it and we need to queue it up.
2017-11-07 15:36:33 -06:00
Scott Lahteine 85a62bbf46 Misc. fixes to compiler warnings, etc. 2017-11-06 22:57:05 -06:00
Scott Lahteine f8393a0908 Operate in Native Machine Space 2017-11-04 00:05:38 -05:00
Roxy-3D 72156a2029 change to better (more clear) names (#8050)
set_destination_to_current() changed to set_destination_from_current()

set_current_to_destination() changed to set_current_from_destination()
2017-10-21 11:42:26 -05:00
Roxy-3D 5439358281 Basic UBL operations working on 32-bit platforms (#8024)
* 32-bit work for UBL

* Update FT i3-2020 reference file
2017-10-19 10:44:45 -05:00
Scott Lahteine c0dddd4233 Tweaks to tool_change, GcodeSuite::T() 2017-10-14 02:53:19 -05:00
Scott Lahteine 1344ca4b2f UBL no longer needs ubl_state 2017-10-14 02:18:32 -05:00
Scott Lahteine 3e3911fb81 Use planner.leveling_active for all leveling systems 2017-10-14 02:18:31 -05:00
Scott Lahteine 9a930ebec2 Make leveling_is_active a macro 2017-10-14 02:18:31 -05:00
Scott Lahteine 90af1fe5ee Implement NO_MOTION_BEFORE_HOMING option 2017-10-01 21:58:50 -05:00
Scott Lahteine 931aa79d85 Move G42 to cpp 2017-09-21 16:26:52 -05:00
Scott Lahteine 551752eac7 Consolidate "bedlevel" code 2017-09-21 16:26:47 -05:00