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

6962 commits

Author SHA1 Message Date
GMagician b94a1c6b9f Code reduction this some configurations 
When switching noozle and extruder but these operations are done by the same servo in 'setup' function there is a unnecessary call
 2017-08-18 11:11:00 +02:00
GMagician 405a2132f3 #7529 compile fix 
I made an error in previous fix
 2017-08-17 22:04:28 +02:00
GMagician 869d7f3703 #7504 missing part 
#7504 integration has missed this part.
When more than 1 servo is used with bltouch it's impossible to predefine default servo delay for it.
In my original fix I completely removed this part but maybe this is a better compromise
 2017-08-17 21:43:47 +02:00
Scott Lahteine 101ba70517 Merge pull request #7505 from thinkyhead/bf1_anet_1_pio 
Add Anet 1.0 to Platformio.ini
 2017-08-17 00:33:20 -05:00
Vben 4817b39d98 Added new feature for AutoParking Extruder (APE) 2017-08-16 17:33:11 -05:00
Scott Lahteine 6772e33ef6 Use [XY]_CENTER for error correction 
Followup to #7512
 2017-08-16 16:13:09 -05:00
Scott Lahteine 385f1bb9e5 Merge pull request #7504 from thinkyhead/bf1_servo_delays 
Individual servo delays
 2017-08-16 16:05:22 -05:00
Scott Lahteine 2a31c9f2ce Merge pull request #7515 from cdedwards/bugfix-1.1.x 
Fix for G26 spam output
 2017-08-16 16:01:10 -05:00
MTrab 5fa61c0ad3 Add Anet 1.0 to Platformio.ini 
Added env:anet10 to platformio.ini for easy compile and upload to this board
 2017-08-16 15:59:20 -05:00
Scott Lahteine b3f59ec945 Merge pull request #7519 from thinkyhead/bf1_cleanups_aug_16 
Add "Level Corners" menu item
 2017-08-16 15:58:15 -05:00
Tannoo b33739d493 UBL_Language_Update (#7520) 
* UBL_Language_Update

Translatable strings

* Use slightly better wording...

* Use slightly better wording...
 2017-08-16 09:49:04 -05:00
Scott Lahteine a1878cd1c0 Add "Level Corners" menu option 2017-08-16 02:54:33 -05:00
Scott Lahteine 0a18fb735e Use "PSU" label to fit on screen 2017-08-16 02:51:00 -05:00
Scott Lahteine 30887feae3 Tweak some formatting in ABL G29 2017-08-16 02:51:00 -05:00
Thomas Moore 257b693ab0 Advanced pause fixes (#7518) 
* Disallow filament change while paused

* Use kinematic movemements in pause_print and resume_print
 2017-08-15 22:57:13 -05:00
Tannoo ab2ac1af71 UBL_LCD_storage_corrections (#7517) 
Correcting the storage selection.
Also EEPROM error handling on the LCD.
 2017-08-15 21:01:11 -05:00
cdedwards f1843211e6 Fix for G26 spam output 
while heating, G26 will continuously spam the heater states instead of printing it out every 5000ms.
 2017-08-15 17:04:53 -06:00
Roxy-3D be5ca34215 Allow G29 to work correctly even if nozzle is off the mesh. (#7512) 
* work around previous regressions...
 2017-08-15 17:04:52 -05:00
Scott Lahteine 06541ec885 Merge pull request #7448 from thinkyhead/bf1_delta_fixes 
Prevent damage if DELTA_HEIGHT is set badly
 2017-08-15 16:35:09 -05:00
GMagician e9c72978c7 Implement SERVO_DELAY as array 
This modify give SERVO_DELAY x servo basis
 2017-08-15 00:28:47 -05:00
Scott Lahteine 96ae53cf41 Use MOVE_SERVO macro where possible 2017-08-15 00:28:39 -05:00
Scott Lahteine 3be9c19f12 Hold on move axis screens 2017-08-14 22:51:47 -05:00
Scott Lahteine 8fd58cd6dc Patch goto labels for consistency 2017-08-14 22:51:47 -05:00
Scott Lahteine 75e6f72c89 Fix hexadecimal number formatting 2017-08-14 22:50:44 -05:00
Scott Lahteine ac76101ec3 Eliminate goto in gcode_M48 2017-08-11 17:00:40 -05:00
Scott Lahteine 75e6ead5fd Eliminate goto in gcode_G33 2017-08-11 17:00:40 -05:00
Scott Lahteine 6bd63d27b5 Updates to G29 for probe error handling 2017-08-11 17:00:40 -05:00
Thomas Moore f54e0fc90f Prevent damage if DELTA_HEIGHT is incorrect 2017-08-11 16:09:14 -05:00
Scott Lahteine 0938c62b48 Neater position_is_reachable call 2017-08-11 15:55:32 -05:00
Scott Lahteine 9d95b1b4df Tweak Conditionals_post.h 2017-08-11 15:55:32 -05:00
Scott Lahteine 35d5a7bdff Tweak CR-10 config/pins 2017-08-11 15:55:31 -05:00
Scott Lahteine 419c8969a7 Merge pull request #7479 from thinkyhead/bf1_fix_italian 
Fix Italian string length
 2017-08-10 18:42:35 -05:00
Frederik Kemner 25a11cd485 Use bed size and inset instead of travel limits to define mesh area\n\nAs proposed in #7435 (#7480) 2017-08-10 16:53:04 -05:00
Scott Lahteine 7f3406d47b Fix Italian string length 
Addressing #7264
 2017-08-10 15:41:35 -05:00
Jozsef Kiraly 97c21e9007 Support for Geeetech GT2560 Rev.A/Rev.A+ 2017-08-06 00:42:54 -05:00
Scott Lahteine b2822a59f9 Add a sanity check for valid bed size 2017-08-05 03:49:04 -05:00
Scott Lahteine a7e5c1bf19 Use float to init TMC2133 steps-per-mm 2017-08-05 03:48:52 -05:00
Scott Lahteine dd66d21749 Extend DEACTIVATE_SERVOS_AFTER_MOVE sanity-check 
As proposed in #7429
 2017-08-05 03:48:52 -05:00
richarddeweerd b370906031 Example config for Geeetech I3 Pro X with GT2560 controller 2017-08-05 03:48:52 -05:00
Scott Lahteine 804818b4d9 Bring configs up to date 2017-08-05 03:48:52 -05:00
Scott Lahteine dd841a3675 Merge pull request #7410 from benlye/user-script-feedback 
Make audible user script feedback optional
 2017-08-05 02:59:56 -05:00
Florian Heilmann 0fd2923a9f Fix compilation with ADVANCED_PAUSE_FEATURE without SDSUPPORT (#7412) 
* Fix compilation of ADVANCED_PAUSE_FEATURE without SDSUPPORT

* Fix Identation

* Make use of IS_SD_PRINTING macro

as per @MagoKimbra
 2017-08-05 02:58:38 -05:00
benlye 24af9e1bf4 Make audible user script feedback optional 
Add a parameter to enable/disable audible user script feedback
 2017-08-04 17:24:10 +01:00
Florian Heilmann 6827a162bb Update language_de.h 
Add
MSG_BLTOUCH                    
MSG_DELTA_SETTINGS            
MSG_UBL_MESH_EDIT                
MSG_UBL_OUTPUT_MAP_BACKUP        
MSG_UBL_STEP_BY_STEP_MENU       
MSG_Z_FADE_HEIGHT
 2017-08-04 09:35:21 +02:00
Scott Lahteine 3497153cf1 Followup cleanup patch 
Fix regression in #7428
 2017-08-03 14:55:22 -05:00
Scott Lahteine 16f8c4865a Merge pull request #7409 from FHeilmann/bf_update_ru_translation 
Update Russian Translation
 2017-08-03 14:54:40 -05:00
Scott Lahteine 622048ffb0 Clean up whitespace, trailing space, bad tab conversion, etc. 2017-08-03 11:20:03 -05:00
Roxy-3D 2cbdc0ebb6 Fix large Z corrections when nozzle moves off of UBL mesh (#7415) 2017-08-02 16:51:04 -05:00
Florian Heilmann 650e5274c4 Update Russian Translation 2017-08-02 21:19:15 +02:00
Scott Lahteine ce65c13a97 Merge pull request #7398 from fiveangle/bf_lcd_bed_level_requirements 
Clarify LCD_BED_LEVELING requirements
 2017-08-01 17:46:07 -05:00
Dave Johnson 936dfb965c Clarify LCD_BED_LEVELING requirements 
LCD_BED_LEVELING requires PROBE_MANUALLY with auto bed leveling enabled.  See #7396
 2017-08-01 14:13:54 -07:00
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