bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
9,592 Commits 1 Branch 4 Tags 151 MiB
34160806c0
Commit Graph

9592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Moore
3279337f47 Move BLTouch LCD menu from Main to Main/Control 2017-05-08 15:21:01 +00:00
bgort
83b6bc8e05 Merge pull request #6638 from bgort/silentprobing2 
Cleanup previous implementation of new quiet probing
 2017-05-08 10:21:36 -04:00
Brian
6cb0fa4128 Cleanup previous implementation of new quiet probing 
Saves a few lines of code.
 2017-05-08 08:13:46 -04:00
bgort
4b7f8ad9c6 Merge pull request #6610 from bgort/pio-improvements2 
PlatformIO-related changes
 2017-05-08 07:52:42 -04:00
Scott Lahteine
232e8682d1 Merge pull request #6633 from thinkyhead/bf_temp_units 
Minor patches and cleanup
 2017-05-07 21:56:52 -05:00
Scott Lahteine
56ca47ab9d Patch configuration temp units 2017-05-07 21:32:01 -05:00
Scott Lahteine
421dd62800 Adjust spacing of "spaces" 2017-05-07 21:28:54 -05:00
Scott Lahteine
26dba44cd3 Patch redundant lcd settings 2017-05-07 21:28:54 -05:00
Scott Lahteine
34b5041576 Spacing adjustment, ubl_G29 2017-05-07 21:28:54 -05:00
Scott Lahteine
6c2e6ea38e Patch mfqp for use directly with MarlinDocumentation 2017-05-07 21:28:54 -05:00
Scott Lahteine
1c4ed8b106 Note 5 extruders in config comments 2017-05-07 21:28:54 -05:00
Scott Lahteine
6e4a5cc8c6 Patch missing const in temp_abs 2017-05-07 21:13:44 -05:00
bgort
d35e2fda10 Merge pull request #6622 from bgort/silentprobing 
Improve BLTOUCH_HEATERS_OFF functionality
 2017-05-07 21:33:44 -04:00
Scott Lahteine
6ed52fb765 Adjust spacing in LSF 2017-05-07 19:11:52 -05:00
Roxy-3D
110afff415 More misc UBL fixes and update gMax examples (#6632) 
I think I forgot to Sync before I committed last time.   Some UBL
changes did not stick.

Also, update the gMax configuaration.h file so other than unique numbers
and settings, it exactly matches the default configuration.h file.
 2017-05-07 19:02:24 -05:00
Roxy-3D
d92fa40c62 misc. UBL fixes (#6631) 
* Restore LSF functionality

Some of the typo's persisted...   Hopefully this gets them all fixed.

* Restore user's expectations of how G28 should behave

* Allow Nozzle size control with ornery host programs
 2017-05-07 18:23:48 -05:00
Brian
faa270071d Improve BLTOUCH_HEATERS_OFF functionality 
- rename to PROBING_HEATERS_OFF
 - move heater pausing functionality into thermalManager
   - add variables, pause(), ispaused(), other functions
 - add fan pausing functionality -> PROBING_FANS_OFF
 - add probing_pause() wrapper
 - move pausing into do_homing_move() and do_probe_move() to minimize quiet time and so other probe types can benefit
 - example configs
 2017-05-07 16:22:08 -04:00
bgort
787fdc95bb Merge pull request #6623 from lrpirlet/AllowUBLG29ToWork 
G29 P1 stops reporting Invalid location with this patch
 2017-05-07 09:42:42 -04:00
lrpirlet
d66e9efac5 G29 P1 stops reporting Invalid location with this patch 2017-05-07 15:07:26 +02:00
Scott Lahteine
8908b15471 Merge pull request #6614 from thinkyhead/bf_temp_units 
Support temperature units in M503
 2017-05-06 20:41:04 -05:00
Scott Lahteine
ce507deb9f Support temperature units in M503 2017-05-06 20:24:51 -05:00
bgort
a59066bca9 Various improvements - mostly UBL-related (#6607) 
UBL Clean up.
 2017-05-06 18:59:16 -05:00
Brian
0446dd3ad8 PlatformIO-related changes 
- move platformio.ini out of source directory to be more consistent with 'normal' PlatformIO usage
  - facilitates IDE integration
- add related .gitignores
 2017-05-06 06:22:10 -04:00
Scott Lahteine
bef9791ea3 Fix mfrb and mfpub 2017-05-05 14:32:16 -05:00
Scott Lahteine
66bedc1a24 Merge pull request #6600 from thinkyhead/bugfix_first_fixes 
Update git helper scripts, config comments
 2017-05-05 13:48:16 -05:00
Scott Lahteine
77769e284f Edit configuration comments 2017-05-05 13:32:31 -05:00
Scott Lahteine
d14b068147 Tweak git helper scripts 2017-05-05 13:32:31 -05:00
Scott Lahteine
6876e79d42 Tweak command index increment 2017-05-05 13:32:31 -05:00
Scott Lahteine
7fcb5c1424 Minor fix in K8200 readme 2017-05-05 11:25:11 -05:00
Scott Lahteine
0cc4b08b93 Merge pull request #6587 from zlowred/bugfix-1.1.x 
Fixed USE_CONTROLLER_FAN #define usage
 2017-05-05 01:02:09 -05:00
Max Matveev
267f3a03d9 Fixed USE_CONTROLLER_FAN #define usage 2017-05-04 23:38:29 +02:00
bgort
ae7c602031 fix error in M105 output -- use SERIAL_PROTOCOL for ints instead of SERIAL_PROTOCOL_F (#6584) 
also removed wayward 'address of' ampersand in setTargetHotend and setTargetBed parameters
 2017-05-04 16:09:45 -05:00
Scott Lahteine
3cd9af2409 bugfix-1.1.x ReadMe, Version, helper scripts 2017-05-04 07:17:10 -05:00
Scott Lahteine
c095ee9ce9 Readme Version 1.1.0 2017-05-04 07:17:10 -05:00
Scott Lahteine
28e597f945 Merge pull request #6570 from FHeilmann/patch-2 
Fix broken fwretract recovery extruder feedrate
 2017-05-04 07:15:19 -05:00
Florian Heilmann
15268770f5 Fix broken fwretract recovery extruder feedrate 
When both lowering and recovery are performed using the same "prepare_move_to_destination()" the extruder recovery feedrate ends up being ignored and, instead, is only capped by either the maximum e-speed or the time it takes to perform the z-lowering. 
Performing the two moves separately from each other ensures a correct recovery feedrate.
 2017-05-04 11:34:28 +02:00
Scott Lahteine
58210c3a19 Merge pull request #6568 from thinkyhead/rc_bilinear_extension 
Add EXTRAPOLATE_BEYOND_GRID option to bilinear leveling
 2017-05-04 00:46:05 -05:00
Scott Lahteine
da08e11acd Add EXTRAPOLATE_BEYOND_GRID option to bilinear leveling 2017-05-04 00:19:07 -05:00
Scott Lahteine
6834e36871 Merge pull request #6567 from thinkyhead/rc_sdcard_stop 
Shutdown heaters, autotemp on SD Cancel
 2017-05-03 23:54:29 -05:00
Scott Lahteine
399efd66ed Click to resume 2017-05-03 22:26:06 -05:00
Scott Lahteine
1196e3ca59 SDCard print completion can use "M0" 2017-05-03 22:24:03 -05:00
Scott Lahteine
6854f08d22 Shut down autotemp in disable_all_heaters 2017-05-03 20:54:26 -05:00
Thomas Moore
acec237092 Shutdown heaters and fan after canceling a print from the SD card 2017-05-03 20:43:09 -05:00
Scott Lahteine
11b6a3cbb6 Fix regression in least_squares_fit.cpp 2017-05-03 19:21:44 -05:00
Scott Lahteine
e1b85ff67b Merge pull request #6559 from thinkyhead/rc_more_optimal 
Compact smart_fill_mesh slightly
 2017-05-03 19:07:36 -05:00
Scott Lahteine
9890141f7b M100 tweak 2017-05-03 17:28:09 -05:00
Scott Lahteine
2658cc707a Treat temperature as integer, when possible 2017-05-03 17:27:25 -05:00
Scott Lahteine
1b2c7ec20a Make G26 compatible with inches and thermal unit modes 2017-05-03 17:12:48 -05:00
Scott Lahteine
241bdffe65 Dress up Bilinear Leveling code 2017-05-03 17:12:35 -05:00
Scott Lahteine
67ecf06cc4 Patch issue in gcode_M900 
Noted in #6550
 2017-05-03 15:26:00 -05:00