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

6861 commits

Author SHA1 Message Date
Kai ffe3013bb5 Fix for #7395 
Filament change causes freeze during paused print. This PR disables Filament change in the prepare menu when a print from SD Card is paused. See #7395
 2017-08-01 21:45:41 +02:00
Øystein Krog e948f77cf9 Fix DUAL_X_CARRIAGE not moving at all 
Axis would only move when homing.
Bug introduced in 91841d75c9.
Fixes #6956, fixes #7050 and fixes #7291
 2017-07-31 18:44:26 +02:00
Scott Lahteine 08b0456d91 Merge pull request #7379 from thinkyhead/bf_manual_bed_level_floor 
Manual Bed Leveling: Goto previous Z height at each probe point
 2017-07-30 05:41:12 -05:00
teemuatlut 936d00dda8 Implement probing delay for piezo sensors 2017-07-29 21:46:40 -05:00
Scott Lahteine 29eef360d0 Merge pull request #7308 from thinkyhead/bf_cleanup_config_adv 
Fixes for FWRETRACT
 2017-07-29 21:20:19 -05:00
Wilfried Chauveau 894608f8a3 Manual Bed Leveling: Goto previous Z height at each probe point 2017-07-29 21:15:37 -05:00
Scott Lahteine ff06e1a030 Merge pull request #7372 from tcm0116/delta_calib_menu 
Move Delta Calibration menu to the Prepare menu
 2017-07-29 21:05:03 -05:00
Thomas Moore 15e009b6ca Move Delta Calibration menu to the Prepare menu 2017-07-28 08:33:18 -05:00
Scott Lahteine bfd396c13a Patch to fix some compiler warnings 2017-07-28 02:27:16 -05:00
Scott Lahteine 48c5f3dddf Tweak kill action #ifdef 2017-07-27 23:42:01 -05:00
Scott Lahteine be7a9a07c5 Don't reset grid with G29 Q + PROBE_MANUALLY 2017-07-27 22:47:43 -05:00
Scott Lahteine dfe670247d Merge pull request #7363 from marcio-ao/bugfix-1.1.x 
Makefile fixes and U8G support.
 2017-07-27 21:31:56 -05:00
Marcio Teixeira af83c512b8 Added support for U8G. 2017-07-27 07:49:25 -06:00
Scott Lahteine 4eff18854b Rename options with swap_ prefix 2017-07-27 04:14:29 -05:00
Scott Lahteine 14482d2f2a Strip auto-retract for impossible M(IN|AX)_AUTORETRACT combo 2017-07-27 04:14:29 -05:00
Scott Lahteine 9fc72422e4 Don't let the flow multiplier affect retract/recover length 2017-07-27 04:14:29 -05:00
Scott Lahteine fee696db5d Improve retract() for G10/G11/autoretract 2017-07-27 04:14:29 -05:00
Scott Lahteine 423b0f3a1e Replace MIN_RETRACT with MIN_AUTORETRACT, MAX_AUTORETRACT 2017-07-27 04:14:29 -05:00
Scott Lahteine 51864fd365 Add bed size as a configuration option 2017-07-26 23:04:54 -05:00
Scott Lahteine dc7c95e07b Remove @ section fwretract 2017-07-26 22:46:16 -05:00
Dave Johnson 4718c09c48 Remove extraneous USBCON defines for AT90USB boards 
USBCON is definied by serial.h pullikng in MarlinConfig.h which in turn pulls in Arduino.h.  Defining in later includes has shown to cause compile issues so removing all extraneous calls for and potentially easier future linker troubleshooting.
more USBCON unification
 2017-07-23 16:41:48 -07:00
C. Scott Ananian 890e7a16a9 Add support for Printrbot Neopixel RGBW strip. 
Connected as described at http://printrbot.com/shop/led-strip/

Based on patch by Kelly Anderson <kelly@xilka.com> at
http://www.xilka.com/printrbot/marlin/1.1.4/20170707/
 2017-07-22 16:07:55 -05:00
Scott Lahteine a059e95463 Bring Infitary i3 config up to date 2017-07-21 20:49:19 -05:00
Scott Lahteine d6d6043548 Merge pull request #7338 from thinkyhead/bf_mks_ps_on_pin 
MKS 1.3+: Add pin mapping for PS_ON
 2017-07-21 20:00:26 -05:00
Alexey Shvetsov 851f9f5399 Update Russian translation - Part 1 
Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
 2017-07-21 19:32:37 -05:00
Scott Lahteine b7a16e4468 Merge pull request #7315 from fixoid/patch-1 
Fixing SWITCHING_EXTRUDER feature to work with HOTENDS > 1
 2017-07-21 19:10:54 -05:00
Alexey Shvetsov f38b8c5bf8 MKS 1.3+: Add pin mapping for PS_ON 
This allows the use of D4 as PS_ON since MKS Gen doesn't have a PS_ON pin. However this effectively allows only 3 servos (instead of 4).

Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
 2017-07-21 18:50:05 -05:00
Scott Lahteine 8a3bc6be4d Improve FWRETRACT config options and commentary 
Add more details as requested in #7198
 2017-07-20 22:57:50 -05:00
Scott Lahteine b0173ccdb9 Drop extra initializers for vars initialized by EEPROM code 2017-07-20 22:57:49 -05:00
Scott Lahteine 7afafb05b8 Split G10/G11 into separate functions 2017-07-20 02:24:13 -05:00
Scott Lahteine c45798694f Add some more requirements to the G-code list 2017-07-20 02:24:13 -05:00
Scott Lahteine 72de280c1e BARICUDA valve pressure consistently uint8_t 2017-07-20 02:21:40 -05:00
Scott Lahteine 4d98e3f0a7 General cleanup 2017-07-20 02:21:40 -05:00
fixoid e530c67349 Fixing SWITCHING_EXTRUDER feature 2017-07-19 21:15:26 +03:00
Tannoo 2ad3ca5d8a Bugfix (#7310) 2017-07-18 22:55:14 -05:00
Roxy-3D 37a6833d7e Allow the sampled point to be added into the Least Squares Best Fit (#7289) 
Without this...  The LSF won't work because none of the sampled points
in this code block get added.
 2017-07-13 16:33:02 -05:00
C. Scott Ananian a519b093b9 Fix build by replacing qr_solve by least_squares_fit. (#7285) 
This was broken by 9af67e2446.
 2017-07-13 12:02:15 -05:00
Scott Lahteine 0873c667fa Apply coding standards to recent merges 2017-07-13 00:46:16 -05:00
Scott Lahteine 8c2907d10f Fix ABL broken by recent change 2017-07-12 22:56:18 -05:00
Roxy-3D 9af67e2446 Save 7714 bytes of program memory when doing AUTO_BED_LEVELING_LINEAR (#7276) 
We can save more and a pile of RAM by eleminating the eqnBVector and
EqnAMatrix arrays next.
 2017-07-10 19:05:11 -05:00
Scott Lahteine 76e90b93b7 Volatile keyword not needed for parser.seen 2017-07-10 15:38:54 -05:00
Jamie Bainbridge 00e4ced58e Stay in User Menu after command. Add feedback. 
When a user executes a User Menu command, the LCD returns to the main menu. If the user has multiple menu items they want to run, such as one menu item per bed leveling corner, then it's better to stay in the User Menu rather than return to the main menu.

This PR modifies Marlin to stay in the User Menu after a command.
 2017-07-10 13:47:12 -05:00
Scott Lahteine 1066b17457 Merge pull request #7260 from thinkyhead/bf_G33_update_27 
Updates to G33 and its LCD code
 2017-07-10 13:39:36 -05:00
Tannoo e927941c06 Bugfix (#7265) 
Fix compile error when UBL is enabled but there is no LCD Panel.
 2017-07-08 09:44:50 -05:00
Scott Lahteine 68aea9c01d Merge pull request #7261 from thinkyhead/bf_configs_by_vendor 
Arrange more example configs by vendor
 2017-07-07 15:46:22 -05:00
Tannoo aaacef9441 Corrections (#7231) 
20x4 map integration.    Also some minor changes to the UBL Menu layout.     Both 20x4 LCD's and Graphical LCD panels should have similar functionality now.
 2017-07-07 11:05:08 -05:00
LVD-AC 4bc79ec877 Updates for G33-LCD interface 2017-07-07 05:00:59 -05:00
Scott Lahteine 186580b55f Arrange example configurations by vendor 2017-07-07 04:48:23 -05:00
Scott Lahteine 6be369f3ea Add some config names to AUTHOR 2017-07-07 04:46:33 -05:00
Scott Lahteine 7fc31a7940 Merge pull request #7258 from thinkyhead/bf_cleanups_jbrazio 
Add support for BQ heated bed kit with Hephestos 2
 2017-07-07 04:11:07 -05:00