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

7731 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian
ae676490c9 M421: Add 'adjust closest point' capability 
- Split M421 into separate versions for bilinear and ubl
- Fix minor issue in G26
 2017-05-11 12:10:38 -04:00
Scott Lahteine
2819228d4f Merge pull request #6681 from thinkyhead/bf_better_mfpub 
Better mfpub
 2017-05-10 23:05:47 -05:00
Scott Lahteine
9a688d1456 Merge pull request #6682 from thinkyhead/bf_M80_s_arg 
"M80 S" to report the state of the PSU pin
 2017-05-10 20:29:01 -05:00
Roxy-3D
b63e82f309 M421 Mesh Point Offset and misc. UBL clean up (#6685) 
* M421 Mesh Point Offset and misc. UBL clean up

Allow M421 to accept an offset as well as absolute value for a specified
mesh point.
And misc. UBL clean up to reduce redundent code.

* Better error checking for M421

* Fix M421 Y index bug

I just noticed....  We've had a Y index bug for who knows how long?
 2017-05-10 18:54:10 -05:00
Pablo Ventura
539e0c2f31 "M80 S" to report the state of the PSU pin 2017-05-10 17:58:58 -05:00
Scott Lahteine
60a4ca1182 Better mfpub 2017-05-10 17:45:58 -05:00
bgort
df42428281 Merge pull request #6665 from bgort/font 
Add proportional font adjustment ratio
 2017-05-10 17:30:51 -04:00
Brian
2604742191 Add proportional font adjustment ratio 
- update example configs
 2017-05-10 17:19:03 -04:00
bgort
b3407a371b Merge pull request #6676 from bgort/g26zhop 
G26: Add 0.5mm Z-bump between circles to minimize pattern scraping
 2017-05-10 17:12:05 -04:00
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
9c5957fc77 G26: Add 0.5mm Z-bump between circles to minimize pattern scraping 2017-05-10 16:11:59 -04:00
bgort
bbb2b86c34 Merge pull request #6672 from bgort/ublmotion 
UBL Cleanup/Bugfix
 2017-05-10 14:23:07 -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
bgort
efd93169e5 Merge pull request #6668 from bgort/pio3 
PIO Cleanup
 2017-05-10 07:25:19 -04:00
Brian
f1cccd65c2 platformio.ini env_default=xxxxx has to match one of the labels in the env:xxxxx, otherwise nothing happens when you pio run 2017-05-10 07:11:13 -04:00
bgort
192db2ab1b Merge pull request #6666 from bgort/M100fix 
Fix compiler complaint related to M100
 2017-05-10 07:03:59 -04:00
Brian
3b0127cf8e Fix compiler complaint related to M100 2017-05-09 21:45:44 -04:00
Scott Lahteine
59ab971f81 Merge pull request #6658 from thinkyhead/bf_cleanup_tuesday 
Patch spacing, const, .gitignore
 2017-05-09 16:22:48 -05: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
9a364990d9 Update .gitignore 2017-05-09 12:37:22 -05:00
Scott Lahteine
e1e043d0d0 Merge pull request #6657 from thinkyhead/bf_cleanup_tuesday 
Fix M100 compiler warnings, general patches
 2017-05-09 12:05:01 -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
Scott Lahteine
fe1fce5f56 DevIoT patch 2 2017-05-09 11:28:39 -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
5402eaf9bd Merge pull request #6647 from thinkyhead/bf_pwm_cleanup 
Rename software PWM variables for clarity
 2017-05-08 18:53:23 -05:00
Scott Lahteine
911a87e006 Disable SCARA feedrate scaling by default 2017-05-08 14:41:03 -05:00
Scott Lahteine
f04d1096d4 Link to users in README.md 2017-05-08 14:23:01 -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
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