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

8344 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine 499bb85a95 Clean up, put ubl menu itemization closer at hand 2017-06-19 22:17:14 -05:00
Tannoo 90f5f82926 Step-by-Step Menu addition 2017-06-19 20:15:11 -05:00
Scott Lahteine 0c616700f3 Merge pull request #7097 from thinkyhead/bf_dac_percents_fix 
Convert DAC percent to uint8_t
 2017-06-19 17:58:55 -05:00
Florian Heilmann 6dcf42f1a7 Add Z Fade Height to M420 output if it is enabled (#7042) 
* Add Z Fade Height to M420 Output

Echo the z-fade height when M420 is called, if it is enabled.

* Fix Whitespace

* Fix Compiler complaint

* Missing semi-colon
 2017-06-19 17:53:07 -05:00
Bob-the-Kuhn a1c65fd3d5 convert DAC percent to uint8_t 
=====================

add test to Travis
 2017-06-19 17:46:41 -05:00
Scott Lahteine 7b79f443ef Merge pull request #7096 from thinkyhead/redo_DSE 
Support for two switching extruders
 2017-06-19 17:32:24 -05:00
Scott Lahteine 907cafcbfd Support for two switching extruders 2017-06-19 17:20:59 -05:00
Scott Lahteine 17f69f8ca2 Merge pull request #7094 from thinkyhead/bf_fix_advance_rate 
Fix #5699 - LIN_ADVANCE freeze when ADV_RATE returns 0
 2017-06-19 16:38:41 -05:00
Ross Allan cfcd069501 Fix #5699 - LIN_ADVANCE freeze when ADV_RATE returns 0 2017-06-19 14:02:17 -05:00
Scott Lahteine b8b7ef1902 Merge pull request #7090 from thinkyhead/bf_italian_refix 
Fix Italian language mapper
 2017-06-19 09:27:13 -05:00
Scott Lahteine 42f7f9e013 Merge pull request #7060 from bgort/i2cpefix 
I2C Position Encoders Example Configs
 2017-06-19 01:08:42 -05:00
Scott Lahteine 0b49bddec2 Fix Italian language mapper 2017-06-19 01:01:40 -05:00
Scott Lahteine 7e028ec429 Merge pull request #7089 from thinkyhead/bf_italian_update 
Added missing Italian translations
 2017-06-19 00:16:14 -05:00
Silvio Didonna 2e26a7c752 Added missing Italian translations 2017-06-18 23:37:48 -05:00
Scott Lahteine 2e1b7d3a22 Merge pull request #7079 from thinkyhead/bf_m600_fixes 
M600 fixes
 2017-06-18 23:32:07 -05:00
Scott Lahteine 4c3dc8bf07 Remove set_current_to_destination from resume_print 
Addressing #7057
 2017-06-18 23:01:13 -05:00
Scott Lahteine 4857a3ba48 Formatting and spelling 2017-06-18 23:01:12 -05:00
Thomas Moore 3d24c329af M600 fixes 2017-06-18 23:00:56 -05:00
Scott Lahteine 311f6aff72 Merge pull request #7078 from thinkyhead/bf_cleanups_fixes 
Move lcd_refresh_zprobe_zoffset definition
 2017-06-18 17:24:57 -05:00
Bob-the-Kuhn 8fb30aaed6 warn user of an invalid combination 2017-06-17 15:04:47 -05:00
Bob-the-Kuhn 6cb9bb27fe Move lcd_refresh_zprobe_zoffset definition 2017-06-16 21:46:33 -05:00
Scott Lahteine 43a95ae5ad Merge pull request #7071 from thinkyhead/bf_cleanups_fixes 
Fix status message, apply #7058
 2017-06-16 17:29:28 -05:00
Scott Lahteine dd1a84b23f Add Travis test for scrolling on DOGM 2017-06-16 14:48:01 -05:00
Scott Lahteine d4270f15a9 Spacing tweak in setup() 2017-06-16 14:21:05 -05:00
Scott Lahteine c61c0a9aeb Fix status message missing "blink" 2017-06-16 14:18:19 -05:00
Scott Lahteine 062131554f Followup to #7045 2017-06-16 14:18:19 -05:00
Jim Brown 3d043976f7 Add option to disallow filament change without homing first 2017-06-16 13:32:17 -05:00
Scott Lahteine 93da4e83f7 One more space on a short status message 2017-06-16 12:58:25 -05:00
Scott Lahteine 43c96eb31f Merge pull request #7070 from thinkyhead/bf_cleanups_fixes 
Thursday cleanup / bugfixes
 2017-06-15 15:43:46 -05:00
Scott Lahteine 7c95f762f2 Show LCD bed options even without thermal protection 2017-06-15 15:29:56 -05:00
Scott Lahteine 92eb55f246 Reject generous donation of trailing whitespace 2017-06-15 15:25:24 -05:00
Scott Lahteine 428be27893 Formatting adjustments 2017-06-15 15:25:24 -05:00
Scott Lahteine 8d5a37fb3d Support for a 5th stepper in stepper code 2017-06-15 15:25:23 -05:00
Scott Lahteine 7769a22064 Tweaks to temperature code 2017-06-15 15:25:23 -05:00
Scott Lahteine d9da126776 Cleanups for UBL / ultralcd.cpp 2017-06-15 15:22:36 -05:00
Scott Lahteine 499d5c3b24 Fix scrolling lcd message for DOGM 2017-06-15 15:07:39 -05:00
Scott Lahteine 7164fd499e Tweak to G33 P error 2017-06-15 14:43:40 -05:00
Scott Lahteine c10d763d98 Simpler prepare move conditions 2017-06-15 14:43:40 -05:00
Scott Lahteine 4ebff8eaa5 Drop fastio timer cruft 2017-06-15 14:43:40 -05:00
Scott Lahteine 09bc34f4dc Allow arbitrarily long retraction 2017-06-15 14:43:30 -05:00
Scott Lahteine 4414825e0d Merge pull request #7038 from thinkyhead/bf_PCA9632 
PCA9632 PWM color LED support
 2017-06-15 14:41:24 -05:00
Scott Lahteine 50c2702ba5 Merge pull request #7062 from Bob-the-Kuhn/AT90USB---UBL-compile-error 
Fix two UBL compile errors (one is AT90USB only and one affects all)
 2017-06-15 14:22:27 -05:00
Bob-the-Kuhn 9dda022705 fix compile errors 
================================

Changed to conditional compile for AT90USB issue
 2017-06-15 13:18:14 -05:00
Bob-the-Kuhn b3338ccb01 Merge pull request #6954 from Bob-the-Kuhn/Software-SPI-for-all-CPUs 
SD card soft SPI - allow all CPU families to use it
 2017-06-15 01:03:39 -05:00
Brian 40bb0cbf7a example configurations, etc. 2017-06-14 18:04:28 -04:00
Jim Brown 26d20ebcfc Don't allow filament change without homing first (#7054) 2017-06-13 17:11:37 -05:00
Roxy-3D 824f71d503 LCD Panel Interactive Mesh Editing (#7045) 
Original Mesh Bed Leveling replacement put at top of UBL Menu Options to
help facilitate the removal of the Original Mesh Bed Leveling.

Radar display (and control) of the UBL Interactive Mesh Editing.
 2017-06-12 18:26:49 -05:00
Scott Lahteine 445227c807 Fix missing LCD_STR_REFRESH 2017-06-12 01:28:52 -05:00
Scott Lahteine 699aa35df6 Code cleanup for G33 2017-06-12 01:25:40 -05:00
Scott Lahteine 570722a0fe Combine Travis tests to shorten required time 2017-06-12 01:09:24 -05:00