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

6398 commits

Author SHA1 Message Date
bgort
c33d99c5b2 Merge pull request #6680 from bgort/g26repeat 
G26:  Add 'Repeat' Option
 2017-05-10 17:11:34 -04:00
Bob-the-Kuhn
7325035aac Merge pull request #6637 from Tannoo/UBL_Menu_System_1.1 
UBL Menu System 1.1
 2017-05-10 15:54:48 -05:00
Brian
f7a201b0d0 G26: Add 'Repeat' Option 
- Allows for specifying number of points to print/validate, using 'R' code like with G29 P4 Rx
- Moved the code for Random to 'M' so we could be consistent with G29 P4
- G26 instructions indenting/cleanup
 2017-05-10 16:52:08 -04:00
Brian
4da14b14f4 UBL Cleanup/Bugfix 
- Fix bug in ubl_line_to_destination
- Improve/fix output of some ubl.h functions
 2017-05-10 13:56:17 -04:00
Tannoo
66db6c3acc UBL Menu System 1.1 
/**
     * UBL System submenu
     *
     *  Prepare
     * - Unified Bed Leveling
     *   - Activate UBL
     *   - Deactivate UBL
     *   - Mesh Storage
     *       Memory Slot:
     *       Load Bed Mesh
     *       Save Bed Mesh
     *   - Output Map
     *       Map Type:
     *       Output Bed Mesh Host / Output Bed Mesh CSV
     *   - UBL Tools
     *     - Build Mesh
     *         Build PLA Mesh
     *         Build ABS Mesh
     *       - Build Custom Mesh
     *           Hotend Temp:
     *           Bed Temp:
     *           Build Custom Mesh
     *         Info Screen
     *       - Build Cold Mesh
     *       - Fill-in Mesh
     *           Fill-in Mesh
     *           Smart Fill-in
     *           Manual Fill-in
     *           Info Screen
     *         Continue Bed Mesh
     *         Invalidate All
     *         Invalidate Closest
     *     - Validate Mesh
     *         PLA Mesh Validation
     *         ABS Mesh Validation
     *       - Custom Mesh Validation
     *           Hotend Temp:
     *           Bed Temp:
     *           Validate Mesh
     *         Info Screen
     *     - Edit Mesh
     *         Fine Tune All
     *         Fine Tune Closest
     *       - Adjust Mesh Height
     *           Height Amount:
     *           Adjust Mesh Height
     *         Info Screen
     *     - Mesh Leveling
     *         3-Point Mesh Leveling
     *       - Grid Mesh Leveling
     *           Side points:
     *           Level Mesh
     *         Info Screen
     *   - Output UBL Info
     */
 2017-05-10 12:14:43 -05:00
Brian
3b0127cf8e Fix compiler complaint related to M100 2017-05-09 21:45:44 -04:00
Scott Lahteine
11104f177b Apply const in BABYSTEPPING 2017-05-09 12:37:23 -05:00
Scott Lahteine
081bf1f879 Patch #else / #endif comments 2017-05-09 12:37:23 -05:00
Scott Lahteine
a9487c9443 Reduce redundancy in BLTOUCH conditionals 2017-05-09 11:52:24 -05:00
Scott Lahteine
8d961b51cc Eliminate M100 compiler warnings? 2017-05-09 11:32:15 -05:00
bgort
efb9ce24d9 Merge pull request #6645 from tcm0116/bltouch_config 
Automatically define Z_MIN_PROBE_ENDSTOP_INVERTING for BLTouch
 2017-05-09 09:49:16 -04:00
bgort
e2f07917ab Merge pull request #6644 from tcm0116/bltouch_menu 
Move BLTouch LCD menu from Main to Main/Control
 2017-05-09 09:49:02 -04:00
Scott Lahteine
47cae2929f Patch platformio.ini to fix build error in DevIoT 
For compatibility with DevIoT, until that can be solved.
 2017-05-08 20:27:14 -05:00
Scott Lahteine
911a87e006 Disable SCARA feedrate scaling by default 2017-05-08 14:41:03 -05:00
Scott Lahteine
71396f77d3 Cleanups following recent commits 2017-05-08 14:23:01 -05:00
Scott Lahteine
dca48f0e63 Move platformio.ini back to Marlin folder - it works there 2017-05-08 14:23:01 -05:00
Scott Lahteine
a6dafb058e Small reduction in error code size 2017-05-08 13:58:09 -05:00
Scott Lahteine
a1e04942a2 Cleanup to software PWM variables 2017-05-08 13:51:45 -05:00
Thomas Moore
a20d0794e6 Automatically define Z_MIN_PROBE_ENDSTOP_INVERTING for BLTouch 2017-05-08 16:28:44 +00:00
Thomas Moore
3279337f47 Move BLTouch LCD menu from Main to Main/Control 2017-05-08 15:21:01 +00: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
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
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
lrpirlet
d66e9efac5 G29 P1 stops reporting Invalid location with this patch 2017-05-07 15:07:26 +02: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
77769e284f Edit configuration comments 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
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
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