CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,675 Commits 1 Branch 0 Tags 107 MiB
71df1f7f57
Commit Graph

10675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Scott Lahteine
db188934d1 Merge pull request #7432 from FHeilmann/bf_update_de_translation 
Update language_de.h v2
 2017-08-05 02:53:32 -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
Ben Lye
8443872d10 Ignore VScode directory 
PlatformIO can be used with VSCode.  VSCode creates a .vscode directory which should be ignored.
 2017-08-04 08:50:03 +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
43d298a324 Merge pull request #7430 from thinkyhead/bf1_fix_dualx 
Followup cleanup patch
 2017-08-03 16:41:49 -05: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
50bfcf4c3e Merge pull request #7428 from thinkyhead/bf1_cleanup_aug_3 
Clean up whitespace, trailing space, bad tab conversion, etc.
 2017-08-03 14:30:33 -05:00
Scott Lahteine
622048ffb0 Clean up whitespace, trailing space, bad tab conversion, etc. 2017-08-03 11:20:03 -05:00
Dave Johnson
65a36948c0 Support travis new build environment (#7425) 
move from legacy precise to trusty build image
fix PATH not including buildroot/bin
remove symolic link to ~/bin
enable sudo

trusty travis image doesn't source ~/bin by default
avr requires sude
 2017-08-03 10:33:53 -05:00
Dave Johnson
c6509076c4 Force legacy "precise" build dist for TravisCI (#7422) 
TravisCI "trusty" build dist isn't picking up build path causing travis checks to fail.  Reverting to legacy "precise" dist while we investigate

pristine != precise
 2017-08-03 09:06:59 -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
Scott Lahteine
6ef71c3d5f Merge pull request #7397 from Kaibob2/patch-4 
Fix for #7395
 2017-08-01 17:40:59 -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
Scott Lahteine
7ef0650504 Merge pull request #7386 from oysteinkrog/fix/DualX 
Fix DUAL_X_CARRIAGE movement
 2017-07-31 20:30:06 -05: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
Scott Lahteine
850e404838 Merge pull request #7380 from thinkyhead/bf_touchy_probe_delay 
Implement probing delay for piezo sensors
 2017-07-30 05:39:45 -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
8b0bd44b1e Merge pull request #7368 from thinkyhead/bf_fix_warnings 
Patch to fix some compiler warnings
 2017-07-28 02:53:13 -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