SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
11031 commits 1 branch 0 tags 119 MiB
Commit graph

327 commits

Author SHA1 Message Date
Scott Lahteine
023385ca59
Merge pull request #10479 from thinkyhead/bf2_creality_power_loss_resume 
[2.0.x] Creality3D Power-Loss Recovery
 2018-04-22 00:17:44 -05:00
Scott Lahteine
3396671011
[2.0.x] Reset LCD status to fallbacks (#10470) 
* Remove obsolete strings
* Tweak some static consts
* Reset LCD status to fallbacks
 2018-04-22 00:16:30 -05:00
Scott Lahteine
11ab017dd0 Creality3D Power-Loss Recovery 2018-04-21 21:56:50 -05:00
Roxy-3D
23635c2b64
Update ubl_motion.cpp 
Restore necessary and needed loop termination logic.
 2018-04-19 12:04:35 -05:00
Scott Lahteine
ad6baa5c9d Fix for UBL set_bed_leveling_enabled 2018-04-18 00:14:48 -05:00
Scott Lahteine
f57a008c58
Merge pull request #10443 from thinkyhead/bf2_fix_and_improve 
[2.0.x] Improve UBL mesh report, M420 V T, M421 N, and…
 2018-04-17 16:59:31 -05:00
Scott Lahteine
89b1580587 Fix compile error in tmc_status 2018-04-17 16:13:28 -05:00
Scott Lahteine
01b01f6dfd Tweak fwretract.retract debug, comments 2018-04-17 16:05:25 -05:00
Scott Lahteine
e05c825a05 Update position for UBL non-segmented activate/deactivate 2018-04-17 16:02:02 -05:00
Scott Lahteine
0746aff595 Improve UBL mesh report. Add M420 T, M421 N 2018-04-17 15:52:56 -05:00
Scott Lahteine
3c826e5d05 Prevent delay when power is already on 
Fix #10410
 2018-04-17 04:34:31 -05:00
Scott Lahteine
0945674ba2
Use H0 by default with UBL_MESH_EDIT_MOVES_Z (#10428) 2018-04-15 20:49:14 -05:00
Roxy-3D
21f13f9e57
Stow Probe at end of G29 J3 2018-04-13 14:46:47 -05:00
Scott Lahteine
3bc179a16f Compress/update comments ubl_motion 
…to fit more code on the screen and correct outdated commentary contrasting ABL.
 2018-04-12 18:07:19 -05:00
Luc Van Daele
646aa20b43 Overhaul of G33 Delta Calibration (#8822) 2018-04-11 21:14:48 -05:00
Sean
2d9b0a66fe Add Filament Change accelerations 2018-04-09 23:57:27 -05:00
Roxy-3D
26cc12eaa4 Resolve corruption of Max7219 Debug LED Matrix 2018-04-08 21:26:36 -05:00
Sean
2fa0a73c2c Implement filament change continuous purge 2018-04-04 20:57:51 -05:00
Scott Lahteine
241996d5d6
Merge pull request #10257 from thinkyhead/bf2_tool_change_debug 2018-04-02 19:33:45 -05:00
Scott Lahteine
9ec2c03c5b Fix likely error in retract/recover 
Addressing #10200
 2018-03-31 23:01:13 -05:00
Scott Lahteine
1a75165f35 For set_z_fade_height use set_bed_leveling_enabled 2018-03-31 22:43:05 -05:00
Scott Lahteine
53f0c7522a Symmetrical FWRETRACT Z Hop 
Do the Z lift normally before setting Z back to its prior value. But do the Z lower using spoofing. This should produce proper symmetrical movement.
 2018-03-30 15:54:01 -05:00
Scott Lahteine
ea1a83ce41 Use pgm_read_ptr for tables of pointers 2018-03-23 02:16:35 -04:00
teemuatlut
daf643e1ce [2.0.x] TMC: Match axis label order (#10188) 2018-03-23 01:04:12 -05:00
Scott Lahteine
1cb810ff1c
[2.0.x] Automatically reset stepper timeout (#10179) 
* Automatically reset stepper timeout in manage_inactivity

Any code that adds moves to the planner can skip resetting the stepper timeout. We can let `idle` / `manage_inactivity` reset the timer whenever it detects any moves in the planner.

* blocks_queued => has_blocks_queued
 2018-03-21 19:30:06 -05:00
Roxy-3D
c3c264978f
correct truncated comment 2018-03-21 16:54:45 -05:00
Scott Lahteine
9fd1016bb1 Trust the bootloader to clear globals 2018-03-21 05:49:39 -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
ae39fbd646 Also suppress keepalive with suspend_auto_report 2018-03-21 00:29:09 -05:00
Scott Lahteine
8dfaf1539e
Merge pull request #10102 from thinkyhead/bf2_eeprom_M913 
[2.0.x] More complete Trinamic driver options
 2018-03-20 23:14:19 -05:00
teemuatlut
b5b39af531 [2.0.x] TMC: Fix CURRENT_STEP_DOWN (#10170) 2018-03-20 15:16:05 -05:00
Scott Lahteine
cfc13ed7f3 Quiet M906/M913/M914 with axes. Patch for DISTINCT_E_FACTORS. 2018-03-19 22:05:16 -05:00
Scott Lahteine
c95450016b Improve Trinamic support in the EEPROM 2018-03-19 22:05:16 -05:00
Scott Lahteine
48d7036874 Consolidate smart stepper driver initialization 2018-03-19 22:05:16 -05:00
Scott Lahteine
dd2949922b Consolidate 3-point leveling point options 2018-03-19 04:12:20 -05:00
Scott Lahteine
1d22609473 MIN_PROBE_EDGE replaces DELTA_PROBEABLE_RADIUS 2018-03-19 04:11:46 -05:00
Scott Lahteine
978f342392 Reduce some tmc_util strings 2018-03-18 18:58:10 -05:00
Scott Lahteine
c0d694d5d3 Squash UBL postscript comment 2018-03-18 18:58:10 -05:00
Scott Lahteine
1e946d681d Update Marlin for newest TMC libraries 
- TMC2130Stepper v2.2.0
- TMC2208Stepper v0.0.4
 2018-03-15 22:23:31 -05:00
teemuatlut
e6dcfa64b0 Cast SERIAL_CHAR to void in M122 (#10086) 2018-03-14 07:09:06 -05:00
Studiodyne
e7a61de8af [2.0] FWRetract Reset (Best way) (#10083) 2018-03-14 01:35:30 -05:00
Scott Lahteine
34f656decd Add TMC2208 include in tmc_util.h 2018-03-14 00:18:40 -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
d0ac0151b6 Fix typo in ubl.prepare_segmented_line_to 2018-03-11 10:20:50 -05:00
Scott Lahteine
239902f861 Fix E2END and add EEPROM to Smart RAMPS 
Reference #9983
 2018-03-10 06:57:31 -06:00
Roxy-3D
26dc594ebb prevent steppers from turning off during manual probes 2018-03-10 00:15:41 -06:00
Scott Lahteine
cc59ac4603 Fix _tmc_say_axis string address 
Fixes #10003
 2018-03-09 06:10:11 -06:00
Scott Lahteine
3c2bfa5e53
Update powersupply_on in power_on/off (#10015) 
Fix #10004
 2018-03-08 18:56:47 -06:00
Scott Lahteine
ca577c1638 Fix up various spacing, comments, and typos 2018-03-07 21:09:08 -06:00
Scott Lahteine
9515e5aefb Fix LA_active_extruder (static) 2018-03-07 05:49:20 -06:00
Scott Lahteine
1d604be671 Suspend auto-report during UBL map output 2018-03-07 02:00:19 -06:00
Scott Lahteine
2057177184 Make enums into implicit char 2018-03-06 23:39:56 -06:00
Scott Lahteine
e28e3bb532 Move extended_axis_codes to PROGMEM 2018-03-06 22:21:24 -06:00
Scott Lahteine
b08ec22fe1
Show E0-E4 in monitor_tmc_driver output (#9969) 
Fix #9966
 2018-03-06 19:01:07 -06:00
Scott Lahteine
eb867817b5
Prevent filament runout false positives (#9946) 2018-03-05 01:49:30 -06:00
Scott Lahteine
beeed580b8
Implement digipots for MKS SBASE (#9927) 
Fix #9477
 2018-03-04 15:14:47 -06:00
Scott Lahteine
24b9c1923f ubl G29 tweaks 2018-02-28 03:40:06 -06:00
Scott Lahteine
7bdb98c946 Fix #9826. Solution by @gloomyandy 2018-02-26 15:02:19 -06:00
Roxy-3D
306f44198e Prevent serial buffer overrun in Pronterface 
75ms might  be excessive...    But I know people are seeing problems with PronterFace as the client...
 2018-02-25 23:50:44 -06:00
Scott Lahteine
966d9af98a Mesh export in Bilinear + UBL M503 2018-02-25 23:25:39 -06:00
Scott Lahteine
2228dff3ea ubl.h compile flags from 1.1.x 2018-02-25 23:03:08 -06:00
Scott Lahteine
f3dbe19669 Tweaks to HAL codestyle 2018-02-25 04:38:17 -06:00
teemuatlut
5968a3e60e Add ADVANCED_PAUSE_FEATURE include 2018-02-22 20:28:46 +02:00
teemuatlut
93cc3a8492 Make used methods public 2018-02-22 20:26:14 +02:00
Roxy-3D
d504bbbfa4 Fix botched check for being off the mesh... 2018-02-21 14:28:58 -06:00
Studiodyne
d3ca82d8c2 Support for multiple filament runout sensors 2018-02-19 07:02:50 -06:00
Scott Lahteine
bd54ce830a Include utility.h in neopixel.cpp 2018-02-16 22:19:34 -06:00
Scott Lahteine
241e55ef3b Apply SERIAL_FLUSH macro 2018-02-16 17:32:12 -06:00
teemuatlut
749bc42aa9 TMC SGT is int8 (#9651) 2018-02-16 02:19:33 -06:00
Bob-the-Kuhn
2d749d490b Fix / complete USE_CONTROLLER_FAN (#9666) 2018-02-16 02:18:50 -06:00
Scott Lahteine
c49844df66 !ENABLED => DISABLED 2018-02-16 01:51:34 -06:00
Scott Lahteine
304e0f8945 Followup to 21e60fd 
`ENABLED` only works for flag-type options. Floats must use `#ifdef`.
 2018-02-15 22:24:23 -06:00
Roxy-3D
21e60fd3ed
Allow user to control Z-Height correction for off mesh movements (#9661) 2018-02-15 15:07:42 -06:00
Scott Lahteine
8d71ad37cb flush comment to match 1.1.x 2018-02-14 02:56:18 -06:00
Scott Lahteine
89165326b4 Cleanup after vim and vigor 2018-02-11 06:07:30 -06:00
Scott Lahteine
38c7d53bf7 Repair some spacing 2018-02-10 19:33:26 -06:00
Scott Lahteine
7280fa1e31 Patch Power class 2018-02-10 15:41:18 -06:00
teemuatlut
5990266724 Init CS pins before loading settings (#9566) 2018-02-10 14:08:53 -06:00
Scott Lahteine
cc9cef7f7a Fix HAS_CONTROLLER_FAN in is_power_needed 2018-02-09 05:19:33 -06:00
Scott Lahteine
b639f1ad4b
Correct some retract() comments 2018-02-08 17:57:48 -06:00
Thomas Moore
1541224a81 Enable Z axis and delta sensorless homing (#9516) 2018-02-08 04:20:44 -06:00
Scott Lahteine
b2f8b4ada5
I2C position encoders update (#9533) 
Updating I2C position encoders to enable babystepping and Babystep XY when using the ecm microstep correction method. Also changed default method to ECM microstep.
 2018-02-08 03:57:11 -06:00
Scott Lahteine
b5e92f4f90
[2.0.x] Enable / disable PSU automatically (#9503) 2018-02-06 00:22:30 -06:00
Scott Lahteine
8a6feab1c4 Num-to-string functions for DEBUG_LEVELING_FEATURE 2018-02-05 19:08:27 -06:00
Scott Lahteine
e5ee0b6f6c Implement MALYAN_LCD 2018-02-04 18:52:44 -06:00
Scott Lahteine
c46de340b7 Clean up trailing whitespace 2018-02-03 20:05:23 -06:00
Thomas Moore
e1fd9c08b3 [2.0.x] Add support for LPC1769 at 120 MHz (#9423) 2018-02-03 19:33:26 -06:00
Scott Lahteine
ea5f91737f
Merge pull request #9392 from studiodyne/studiodyne-pause 
[2.0.x] Pause resuming fix
 2018-02-01 23:32:24 -06:00
Scott Lahteine
6339b506c0 Make sure binary.h is included as needed 2018-02-01 21:37:35 -06:00
studiodyne
51d080d2c1
Update Pause 2018-01-29 21:57:37 +01:00
Scott Lahteine
2bea1bda56 Move more strings to PROGMEM 2018-01-24 00:06:06 -06:00
Scott Lahteine
45cfb16424
Merge pull request #8355 from tcm0116/2.0.x-TwoWire 
[2.0.x] Master-only TwoWire (I2C) class for LPC1768
 2018-01-23 20:14:02 -06:00
Scott Lahteine
1dcfe193ac Optimize some serial strings 2018-01-23 19:14:00 -06:00
Thomas Moore
3db35ba9be [2.0.x] Fix change filament for delta machines (#9295) 2018-01-22 10:21:42 -06:00
Scott Lahteine
b1cd012aa6 Clean up and document load/unload/pause/resume 2018-01-22 05:45:46 -06:00
Scott Lahteine
266086670b Better LCD message when heating needed 2018-01-22 04:38:37 -06:00
Scott Lahteine
61bf8478a2 Add hotEnough methods 2018-01-22 04:38:37 -06:00
Scott Lahteine
8190fdb260
[2.0.x] Option to use Neopixel as case light (#9270) 
* Add option to use Neopixel as case light

* Apply CASE_LIGHT_USE_NEOPIXEL to example configs
 2018-01-20 16:58:41 -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
af9b32e3b9
Give PronterFace time to print the UBL What information... 
Give PronterFace time to print the UBL What information...
 2018-01-16 18:00:57 -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
Thomas Moore
6856eccc77 Master-only TwoWire class for LPC1768 2018-01-15 05:22:03 -06:00
Scott Lahteine
43d3d024ac
Update tmc_util.cpp 2018-01-15 04:51:59 -06:00
Panayiotis Savva
ad500b01e0 Fixes TMC compilation error 2018-01-15 12:43:22 +02:00
Scott Lahteine
6a043eee55 Various updates for TMC support 2018-01-10 23:04:48 -06:00
Thomas Moore
f7efac57b7 Multi-host support 2018-01-10 00:14:47 -06:00
teemuatlut
9d923c6c03 Fix TMC gcode commands 2018-01-08 18:45:05 +02: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
Scott Lahteine
e89f1453ab UBL G29 works without settings.load() 2018-01-05 15:48:34 -06:00
Scott Lahteine
7541316bb4 Add M701/M702 Filament Load/Unload, M603 2018-01-04 15:07:37 -06:00
studiodyne
31582caa07 2.0 Fix for bad Pause extruder position resuming (#9029) 2018-01-03 23:18:27 -06:00
Thomas Moore
8afc4f8d9d Fix UBL compilation warnings 2018-01-02 21:00:06 -06:00
Scott Lahteine
9686ffedef Single pause flag also indicates SD print pause 2017-12-30 04:44:59 -06:00
Scott Lahteine
b259bb4670 Fix tmc_util global vars 2017-12-25 09:05:31 -06:00
Scott Lahteine
4ef965cc40 Fix compiler warnings 2017-12-25 08:53:01 -06:00
Scott Lahteine
4b49ea1e92 General cleanup of config-store, reset_bed_level 2017-12-25 05:16:01 -06:00
Scott Lahteine
f704f405af Add pause/resume actions on M600, M125 2017-12-25 01:39:18 -06:00
Thomas Moore
f0a8a1a853 [2.0.x] Use NOZZLE_PARK_FEATURE for ADVANCED_PAUSE_FEATURE (#8866) 
* Use NOZZLE_PARK_FEATURE for ADVANCED_PAUSE_FEATURE
 2017-12-25 01:38:06 -06:00
Scott Lahteine
705ea98fd3 Comment return false in motion functions 2017-12-24 22:57:15 -06:00
Scott Lahteine
caa5093498 General DELTA_IK macro 2017-12-21 22:41:57 -06:00
Scott Lahteine
913d9e9a59 Matching sign across filwidth vars 2017-12-20 00:17:19 -06:00
teemuatlut
0cd1e91056 [2.0.x] TMC driver update (#8769) 2017-12-15 15:03:14 -06:00
Scott Lahteine
d568e586b7 Fix up ubl_motion indentation 2017-12-11 03:08:45 -06:00
Scott Lahteine
6d0678d963 Omit unused UBL motion code 2017-12-11 03:08:18 -06:00
Scott Lahteine
3255712343 Skew Correction for UBL 
Also remove unused grid slicing function when using UBL segmented.
 2017-12-11 03:08:15 -06:00
Scott Lahteine
3d796d8040 Move debug code 2017-12-11 00:27:06 -06:00
Scott Lahteine
3db5303bfe _buffer_line => buffer_segment 2017-12-11 00:27:06 -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
03ba79f144 Sync and report changed position 2017-12-10 21:39:49 -06:00
Roxy-3D
f58eb391aa [2.0.0] Better off mesh behavior for UBL (#8714) 
* Better off mesh behaviour for UBL

* Suggested ubl.h changes
 2017-12-08 19:00:59 -06:00
Scott Lahteine
cdfabbc507 Shorten error text in G29 2017-12-06 21:50: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
24437de591 Use custom segment length for UBL Cartesian 2017-12-03 00:10:54 -06:00
Roxy-3D
48fb4e0932
Get Bi-Linear to work with G26 
More corrections to make that happen...
 2017-12-02 14:14:24 -06:00
Roxy-3D
0850b38b45
Get Bi-Linear working with G26 
G26 uses logic that looks like:
```
ex = _GET_MESH_X(i + 1) - (SIZE_OF_INTERSECTION_CIRCLES - (SIZE_OF_CROSSHAIRS));
```
The Bi-Linear macros need parenthesis to work correctly.
 2017-12-02 14:10:30 -06:00
Scott Lahteine
000b3b3117 Comment/cleanup of motion code 2017-12-02 01:09:55 -06:00
Scott Lahteine
e37dd64548 Apply LEDColor, language fixes 2017-11-29 23:58:12 -06:00
Tannoo
cf0f78336b New Feature: LED_CONTROL_MENU 2017-11-29 21:02:55 -06:00
Scott Lahteine
ef2531558c Add an option to segment leveled moves 2017-11-29 16:57:30 -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
e34c6827ea Init MIXING virtual tools as switching 2017-11-24 18:02:09 -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