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

279 commits

Author SHA1 Message Date
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
c613a1ed38 Fix indentation, stepper.h dependency, etc. 2017-11-22 14:55:30 -06:00
Scott Lahteine
3269d8dd62 Tweak M42 var 2017-11-21 16:12:08 -06:00
Scott Lahteine
3066655727 Try port*100+pin, fix config dependency 2017-11-20 13:58:23 -06:00
Bob-the-Kuhn
a28ccabe2a M42 P1.20 fix 2017-11-20 13:58:02 -06:00
Scott Lahteine
c0000a0cdc Move servo code to modules/servo.* 2017-11-19 14:23:02 -06:00
Bob-the-Kuhn
c14000775b PWM fixes, slow down fan update 
include LPC1768 syntax for M42

couple more pin_t changes

consistency

change M42 to R, P format

Revert "change M42 to R, P format"

This reverts commit 01f12f579ec9ccc1bb9126e68d2c86449e9b7edf.
 2017-11-18 07:05:50 -06:00
Scott Lahteine
60adc6ff02 Display filwidth ratio in terms of E mm 2017-11-18 07:01:49 -06:00
Scott Lahteine
485abb023b
Merge pull request #8456 from thinkyhead/bf2_wednesday_tweaks 
[2.0] No retroactive adjustment with M851 Z
 2017-11-18 04:49:53 -06:00
Scott Lahteine
3bba7d60f3 No retroactive changes with M851 Z 
If using babystep to adjust the Z probe offset, the axis will move and the mesh will be updated at the same time, causing a doubling of the Z offset over the rest of the print.

To correct for this, the current Z position would need to be modified in the opposite direction, canceling out the additional Z offset added to the mesh. This would be confusing to users, and moreover it would not be accurate without also taking the current Z fade level and current Z height into account.

It might make sense to change the mesh in the case where no babystepping is taking place, but this could be considered an undesirable side-effect of changing the `zprobe_zoffset`.

One way to remedy this would be to return to storing the mesh with `zprobe_zoffset` included, then subtracting `zprobe_zoffset` from the returned Z value. Thus, a babystep moving the Z axis up 1mm would subtract 1 from `zprobe_zoffset` while adding 1 to all mesh Z values.

Without including the `zprobe_zoffset` in the `z_values` there is no safe way to alter the mesh in conjunction with babystepping, although it's fine without it.
 2017-11-18 03:36:39 -06:00
Scott Lahteine
32512332df Apply some formatting 2017-11-18 03:12:30 -06:00
Scott Lahteine
50f09cc029 Miscellaneous cleanup 2017-11-16 00:47:16 -06:00
Scott Lahteine
9c3761047e
Merge pull request #8434 from thinkyhead/bf2_fix_M32_subroutines 
[2.0] Fix 'M32 P' subroutines
 2017-11-15 01:15:02 -06:00
Scott Lahteine
e0d367f1fb Fix M32 P subroutine handling 2017-11-15 00:44:21 -06:00
Scott Lahteine
2c8c30437e Fix parser parameter value handling 2017-11-14 23:20:33 -06:00
Scott Lahteine
e70b44dc0b Make sure leveled[] is defined for later use 2017-11-14 02:13:38 -06:00
Scott Lahteine
54774841ba
Merge pull request #8416 from thinkyhead/bf2_M114_DETAIL 
[2.0] Add M114_DETAIL to Configuration_adv.h
 2017-11-14 00:28:55 -06:00
Scott Lahteine
009e3a7aa7 Add M114_DETAIL to Configuration_adv.h 2017-11-14 00:03:17 -06:00
Scott Lahteine
91baca6abb Patches for compiler warnings/errors 2017-11-13 04:43:47 -06:00
Scott Lahteine
2f73dec077 Apply native workspace fixes for G92, G53-59 2017-11-13 02:09:12 -06:00
Scott Lahteine
04abd8d459 Improve and clarify M428 code 2017-11-13 02:09:11 -06:00
Scott Lahteine
e8e92f8969 No leveling data in M114 if no leveling is enabled 2017-11-12 23:03:38 -06:00
Scott Lahteine
c938273bd5 Coding standard patch of M290 2017-11-11 22:14:21 -06:00
Scott Lahteine
98c1265e3b Disable laser power when PWM goes to 0 2017-11-11 22:00:22 -06:00
Scott Lahteine
36426af564
Merge pull request #8356 from tcm0116/2.0.x-M600 
[2.0.x] Normalize load/unload length in M600
 2017-11-10 19:44:08 -06:00
Scott Lahteine
1ed86adf9c Cleanup around updatePID 2017-11-10 19:27:34 -06:00
LVD-AC
e334efb2a7 PROBE_MANUALLY etc. 2017-11-10 19:27:33 -06:00
Scott Lahteine
cba9c1cf9e Add pre-calculated planner.e_factor 2017-11-10 03:14:24 -06:00
Scott Lahteine
c66696c507
Merge pull request #8344 from tcm0116/2.0.x-delta_height 
[2.0.x] Add delta_height variable in lieu of using home_offset
 2017-11-09 01:21:53 -06:00
Scott Lahteine
0cfb936dd1 Clarify some motion code 2017-11-08 22:15:55 -06:00
Thomas Moore
f34c3597dc Add delta_height variable in lieu of using home_offset 2017-11-08 22:10:08 -06:00
Scott Lahteine
e6788bb6ae Fix get_destination_from_command for E 2017-11-08 12:54:00 -06:00
Scott Lahteine
82f45c3e6a Patch G33 misuse of PROBE_MANUALLY 2017-11-08 00:36:06 -06:00
Scott Lahteine
96c9d715f3 Patch abuse of sprintf_P in G33 2017-11-07 17:33:50 -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
17ef0a513b Update G92 for native workspace 2017-11-07 13:07:16 -06:00
Scott Lahteine
85a62bbf46 Misc. fixes to compiler warnings, etc. 2017-11-06 22:57:05 -06:00
Scott Lahteine
e6aba99f16 Fix M118 parameters, with strict guideline 2017-11-06 22:57:01 -06:00
Scott Lahteine
1b40e9c464 Implement CNC_COORDINATE_SYSTEMS 2017-11-04 22:28:46 -05:00
Scott Lahteine
a22434508f Match tweaks to G33 from 1.1 2017-11-04 22:28:46 -05:00
Scott Lahteine
d6aa127c76 Remove I2CPEM workspace offset 2017-11-04 22:28:46 -05:00
Scott Lahteine
79772219ae Fix Fan Multiplexer init 2017-11-04 22:28:46 -05:00
Colten Edwards
e0a6ee8da5 [2.0] Fix up G33, LPC1768 + SDCARD_SORT_ALPHA (#8250) 
* Update Conditionals_post.h

* Add a cast to round() to convert to a unsigned int

Add's a cast to round() so that it will compile properly. round() returns a float which must be cast to a integer for the following % operation. Use a unsigned int as a negative index to an array is wrong. Should never be more than 255 points allowing us to use a 8 bit cast.

* Update G33.cpp
 2017-11-04 18:04:18 -05:00
Scott Lahteine
f8393a0908 Operate in Native Machine Space 2017-11-04 00:05:38 -05:00
Scott Lahteine
31f112cf58 Cleanup trailing whitespace 2017-11-03 04:07:45 -05:00
Luc Van Daele
6827e243a0 [2.0.x] G33 magic numbers (#8171) 
* [2.0.x] G33 magic numbers

* oops

* Comments

* oops

* warning

* better comment section

* remarks

* extra grids
 2017-11-03 03:36:16 -05:00
Scott Lahteine
0108d5181f Allow asterisks in G-Code commands 
Addressing #6655
 2017-10-31 21:20:41 -05:00
GMagician
727a403ba1 [2.0.x] Fix NO_MOTION_BEFORE_HOMING unwanted behaviour (#8176) 
* [2.0.x] Fix NO_MOTION_BEFORE_HOMING unwanted behaviour

NO_MOTION_BEFORE_HOMING should prevent XYZ movements only when homing is not done.
E axes should be allowed

* Update G0_G1.cpp

* Update G0_G1.cpp
 2017-10-30 22:50:22 -05:00
Scott Lahteine
817175613a
Merge pull request #8157 from thinkyhead/bf2_anet_10_servo 
[2.0.x] Define a default SERVO0_PIN for Anet 1.0
 2017-10-29 19:55:00 -05:00
Scott Lahteine
723f2a77f6 Implement support for Dual X and Y endstops 2017-10-29 18:56:04 -05:00
Scott Lahteine
3e8754a38a Add/correct time units on planner vars / M205 B 2017-10-29 18:47:21 -05:00
Luc Van Daele
a1a4fc277e (2.0.x) serious bug G33 (#8136) 
* (2.0.x) serious bug G33

* Revert config changes

This reverts commit 74b5a98223b7b7fb970d05b8541f4a079c3cfe56.
 2017-10-29 04:12:33 -05:00
LVD-AC
dcfc2503c2 G33 Autotune calibration update #10 2017-10-27 02:11:24 -05:00
Scott Lahteine
bd78ca0ee3 Add M290 Babystepping 2017-10-26 20:44:43 -05:00
Scott Lahteine
c45514f811 Merge pull request #8094 from thinkyhead/bf2_neopixel_led_parity 
[2.0.x] Bring NEOPIXEL_LED into parity with 1.1.x
 2017-10-26 17:24:38 -05:00
Thomas Moore
9e699811d2 Make LPC1768 pinmapping not specific to Re-ARM (#8063) 
* Merging early because of build failures.  See #8105

* Make LPC1768 pinmapping not specific to Re-ARM

* Add HAL_PIN_TYPE and LPC1768 pin features

* M43 Updates

* Move pin map into pinsDebug_LPC1768.h

* Incorporate comments and M226

* Fix persistent store compilation issues

* Update pin features

* Update MKS SBASE pins

* Use native LPC1768 pin numbers in M42, M43, and M226
 2017-10-26 13:37:26 -05:00
Scott Lahteine
3ac581eac9 Neopixel changes for parity with 1.1.x 2017-10-25 18:40:04 -05:00
Thomas Moore
51fafccc16 [2.0.x] Enable hardware serial ports on LPC1768 (#8004) 
* Enable hardware serial ports on LPC1768

* Fix compilation errors with other HALs

* FIx order of includes in LPC1768 HAL main.cpp

* Add support for RX_BUFFER_SIZE and TX_BUFFER_SIZE options in Configuration_adv.h
 2017-10-24 17:28:33 -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
Luc Van Daele
3986a84f77 boolval revisited (#8016) 2017-10-18 14:03:17 -05:00
Scott Lahteine
ce48403a0b Add EXTRA_FAN_SPEED feature 
Based on #7883 by @studiodyne
 2017-10-16 02:34:13 -05:00
Scott Lahteine
5c4f3e0107 Add LCD_SET_PROGRESS_MANUALLY 2017-10-15 03:05:29 -05:00
Scott Lahteine
497f86453e Merge pull request #7964 from gallynero/patch-2 
fix 'axis_unhomed_error' not defined error
 2017-10-14 05:00:58 -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
gallynero
3619a4cbea fix 'axis_unhomed_error' not defined error 
Fix 'axis_unhomed_error' not defined error when pause with unhomed status
 2017-10-13 09:08:02 +02:00
Slawomir Ciunczyk
a11e6a1022 Different NEOPIXEL types 
Same as #7728 but for 2.0.x,
Lot of cleanup and remove references in whole code to other "LED files" than leds.h. Now will be much easier to add next drivers/libraries. e.g. FastLED. But bad news, currently FastLED is suporting only RGB devices (no RGBW)
 2017-10-10 02:17:36 -05:00
Scott Lahteine
8315a8a716 Apply fixes for DUE 
Alternative to #7882. If F_CPU is greater than 1000 it can be evenly divided by 8. Over 10000, 16; over 100000, 32; over 1 million, 64; etc.
 2017-10-07 14:31:18 -05:00
Scott Lahteine
b220bc7521 Apply G33 updates 
Adapted from #7865
 2017-10-06 15:47:51 -05:00
Scott Lahteine
508d764d63 Add serial XON/XOFF handshaking 
From @ejtagle, originally #7459
 2017-10-02 04:12:30 -05:00
Scott Lahteine
33c4d45f2f Merge pull request #7812 from thinkyhead/bf2_fix_resume_print 
[2.0.x] Fix broken M600 resume_print
 2017-10-01 22:55:28 -05:00
Scott Lahteine
2d41c59320 Tweak some spacing 2017-10-01 21:59:42 -05:00
Scott Lahteine
90af1fe5ee Implement NO_MOTION_BEFORE_HOMING option 2017-10-01 21:58:50 -05:00
Scott Lahteine
ac41eb5871 Merge pull request #7722 from tcm0116/2.0.x-warnings 
Cleanup 2.0.x compiler warnings
 2017-10-01 21:56:54 -05:00
Thomas Moore
ae2173cd52 Synchronize retractions 2017-09-30 17:28:46 -05:00
Thomas Moore
0cb00f52d9 Cleanup warnings 2017-09-30 16:47:17 -05:00
Christopher Pepper
bea3ec2724 M355 S0, S1 fixes & faster LCD, SD card 
fix Travis error
 2017-09-27 19:26:00 -05:00
Scott Lahteine
dff2904c0f Marlin code whitespace cleanup 2017-09-27 10:55:36 -05:00
Phr3d13
10c1b442ca Fixes for Anet10 and gt2560 
Fixes for 2 "... not declared in this scope" compiler errors.
 2017-09-27 07:34:02 -05:00
Scott Lahteine
6d5fcac54a G33 changes from 1.1.x 2017-09-24 14:16:23 -05:00
Scott Lahteine
1587962547 Combine G-code files into fewer units 
Addressing #7707
 2017-09-23 18:12:04 -05:00
Scott Lahteine
64dfb46461 Move z_endstop_adj to Endstops 2017-09-21 16:27:11 -05:00
Scott Lahteine
2e20c53c9d Move endstop debug to Endstops 2017-09-21 16:27:11 -05:00
Scott Lahteine
a10451ceed Move Volumetric methods to Planner 2017-09-21 16:27:11 -05:00
Scott Lahteine
07cf75883f Move T (tool change) to cpp 2017-09-21 16:27:10 -05:00
Scott Lahteine
927524af6b Move M999 to cpp 2017-09-21 16:27:10 -05:00
Scott Lahteine
1a37ebc76d Move M163-M165 MIXING_EXTRUDER to cpp 2017-09-21 16:27:10 -05:00
Scott Lahteine
8ca0b2fd68 Move M355 caselight to cpp 2017-09-21 16:27:09 -05:00
Scott Lahteine
59608086e6 Move M350_M351 to cpp 2017-09-21 16:27:09 -05:00
Scott Lahteine
6e0503eab2 Move M907-M910 to cpp 2017-09-21 16:27:09 -05:00
Scott Lahteine
2e89685154 Move TMC2130 g-codes to cpp 2017-09-21 16:27:09 -05:00
Scott Lahteine
19dde5be03 Move M900 to cpp 2017-09-21 16:27:08 -05:00
Scott Lahteine
1b0acbff72 Move M605 to cpp 2017-09-21 16:27:08 -05:00
Scott Lahteine
75cf17d816 Move M702 MK2_MULTIPLEXER to cpp 2017-09-21 16:27:08 -05:00
Scott Lahteine
7ba2ab4fb3 Move M540 to cpp 2017-09-21 16:27:07 -05:00
Scott Lahteine
a90c7dbf64 Move M500-M503 to cpp 2017-09-21 16:27:07 -05:00
Scott Lahteine
aab5489962 Move M428 to cpp 2017-09-21 16:27:07 -05:00
Scott Lahteine
1fe25271e4 Move M401_M402 to cpp 2017-09-21 16:27:07 -05:00
Scott Lahteine
0589884d26 Move M400 to cpp 2017-09-21 16:27:06 -05:00
Scott Lahteine
4a220a8b79 Move M380_M381 to cpp, solenoid feature 2017-09-21 16:27:06 -05:00
Scott Lahteine
9be8cb0ac9 Move M360-M364 to cpp 2017-09-21 16:27:06 -05:00
Scott Lahteine
828405cac8 Move M302 to cpp 2017-09-21 16:27:06 -05:00
Scott Lahteine
8584f7e390 Move M250 to cpp 2017-09-21 16:27:05 -05:00
Scott Lahteine
ebb9bd5419 Move M240 to cpp 2017-09-21 16:27:05 -05:00
Scott Lahteine
d4aaa0f1c8 Move M304 to cpp 2017-09-21 16:27:05 -05:00
Scott Lahteine
609c4eea32 Move M301 to cpp 2017-09-21 16:27:04 -05:00
Scott Lahteine
4f14849675 Move M300 to cpp 2017-09-21 16:27:04 -05:00
Scott Lahteine
6ed5252884 Move M280 to cpp 2017-09-21 16:27:04 -05:00
Scott Lahteine
d4d3d92f8a Move M260_M261 to cpp 2017-09-21 16:27:04 -05:00
Scott Lahteine
3e761696a0 Move M226 to cpp 2017-09-21 16:27:03 -05:00
Scott Lahteine
0e319104c2 Move M220 to cpp 2017-09-21 16:27:03 -05:00
Scott Lahteine
234de3547c Move M211 to cpp 2017-09-21 16:27:03 -05:00
Scott Lahteine
6c7bad8bc3 Move M666 to cpp 2017-09-21 16:27:03 -05:00
Scott Lahteine
f5877aa93e Move M665 to cpp 2017-09-21 16:27:02 -05:00
Scott Lahteine
33861d4e04 Move M206 to cpp 2017-09-21 16:27:02 -05:00
Scott Lahteine
7aca9fe2f7 Move M203-M205 to cpp 2017-09-21 16:27:02 -05:00
Scott Lahteine
b3822b9242 M202 is unused 2017-09-21 16:27:02 -05:00
Scott Lahteine
5e63efc1d9 Move M201 to cpp 2017-09-21 16:27:01 -05:00
Scott Lahteine
92c15f5578 Move M150 to cpp 2017-09-21 16:27:01 -05:00
Scott Lahteine
eef4a54778 Move M119-M121 to cpp 2017-09-21 16:27:01 -05:00
Scott Lahteine
379f16558e Move M118 to cpp 2017-09-21 16:27:00 -05:00
Scott Lahteine
811c32b85a Move M117 to cpp 2017-09-21 16:27:00 -05:00
Scott Lahteine
1d2061c935 Move M115 to cpp 2017-09-21 16:27:00 -05:00
Scott Lahteine
81b8fbf4d6 Move M114 to cpp 2017-09-21 16:27:00 -05:00
Scott Lahteine
5d2681a105 Move M100 to cpp 2017-09-21 16:26:59 -05:00
Scott Lahteine
beb346e49f Move M92 to cpp 2017-09-21 16:26:59 -05:00
Scott Lahteine
381b17e6a9 Move M18_M84, M85 to cpp 2017-09-21 16:26:59 -05:00
Scott Lahteine
a911215b0e Move M82_M83 to cpp 2017-09-21 16:26:59 -05:00
Scott Lahteine
4b9d1b9f26 Move M80-M81 to cpp 2017-09-21 16:26:58 -05:00
Scott Lahteine
0c7ba52451 Move M149 to cpp 2017-09-21 16:26:58 -05:00
Scott Lahteine
cbf40f7ee9 Move M145 to cpp 2017-09-21 16:26:58 -05:00
Scott Lahteine
b464887ea1 Make BARICUDA a feature 2017-09-21 16:26:57 -05:00
Scott Lahteine
14a5d2a273 Move M113 to cpp 2017-09-21 16:26:57 -05:00
Scott Lahteine
06f3c8029e Move M111 to cpp 2017-09-21 16:26:57 -05:00
Scott Lahteine
a831977dee Move M110 to cpp 2017-09-21 16:26:57 -05:00
Scott Lahteine
7479ff98b7 Move M140, M190 to cpp 2017-09-21 16:26:56 -05:00
Scott Lahteine
5b3e49babd Move M108, M112, M410 to cpp 2017-09-21 16:26:56 -05:00
Scott Lahteine
df0432c7c8 Move M155 to cpp, auto-report to Temperature 2017-09-21 16:26:56 -05:00
Scott Lahteine
df031ab100 Move M106_M107 to cpp 2017-09-21 16:26:56 -05:00
Scott Lahteine
99c4b9050a Move M105 to cpp 2017-09-21 16:26:55 -05:00
Scott Lahteine
2c1eda9e00 Move M75-M78 to cpp 2017-09-21 16:26:55 -05:00
Scott Lahteine
fc52fc72ac Move M48 to cpp 2017-09-21 16:26:54 -05:00
Scott Lahteine
be8d913484 Move M43 to cpp 2017-09-21 16:26:54 -05:00
Scott Lahteine
10fab24e50 Move M42 to cpp 2017-09-21 16:26:54 -05:00
Scott Lahteine
69b664b6fe Move M31 to cpp 2017-09-21 16:26:54 -05:00
Scott Lahteine
a442c34a1a Move SD commands to cpp 2017-09-21 16:26:53 -05:00