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

9659 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine
e82e9073d6 Merge pull request #7530 from GMagician/Code-reduction 
Code reduction with some configurations
 2017-08-18 13:57:59 -05:00
Scott Lahteine
69d1052010 Merge pull request #7529 from GMagician/My-bugfix-1.1.x 
#7528 fix
 2017-08-18 13:57:22 -05:00
GMagician
6127154af3 Fix identation by tab 
There was a tab instead of spaces
 2017-08-18 11:34:55 +02:00
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
Scott Lahteine
5e14bb61de Merge pull request #7506 from thinkyhead/bf1_dual_parking_extruder 
AutoParking Extruder (APE)
 2017-08-17 00:32: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
6172f150c2 Merge pull request #7471 from thinkyhead/bf1_cleanups_aug9 
Miscellaneous style tweaks
 2017-08-15 00:12:37 -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
Scott Lahteine
6440904c1c Merge pull request #7442 from thinkyhead/bf1_geeetech_gt2560_revs 
Support for Geeetech GT2560 Rev.A/Rev.A+
 2017-08-06 00:45:12 -05:00
Jozsef Kiraly
97c21e9007 Support for Geeetech GT2560 Rev.A/Rev.A+ 2017-08-06 00:42:54 -05:00
Scott Lahteine
82cfdd4d8f Merge pull request #7437 from thinkyhead/bf1_geeetech_config 
Geeetech I3 Pro X + GT2560 Config
 2017-08-05 03:58:47 -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
Scott Lahteine
8b97da0e3d Merge pull request #7420 from benlye/patch-1 
Add VScode directory to .gitignore
 2017-08-05 02:57:07 -05:00