Commit Graph

9707 Commits

Author SHA1 Message Date
Scott Lahteine
c8718aa111 Spacing, macros in LPC1768_PWM 2017-11-26 20:20:05 -06:00
Scott Lahteine
a67cf78c6b Clean up whitespace, spacing 2017-11-26 20:18:52 -06:00
Scott Lahteine
f0dd4e3fa0 Bootscreen parity with 1.1.x 2017-11-26 20:07:17 -06:00
Scott Lahteine
b634bfe1b1 Tweak to readDir code 2017-11-26 18:25:00 -06:00
Scott Lahteine
7be4857ab9 Tweak BLOCK_BUFFER_SIZE description 2017-11-26 17:36:40 -06:00
Bob-the-Kuhn
7d8b66e207
Merge pull request #8570 from Bob-the-Kuhn/Sbase-PWM
[2.0.x] MKS Sbase - add servo pin definitions and add directly controlled PWM
2017-11-26 09:36:18 -06:00
Bob-the-Kuhn
59b32c25b5 MKS Sbase changes 2017-11-26 07:47:06 -06:00
Scott Lahteine
f90c075d1f SD Menu patches 2017-11-26 01:14:18 -06:00
Scott Lahteine
9b64be0bc5 Fixes for leveling sub-menus 2017-11-26 00:05:36 -06:00
Scott Lahteine
25674da90c Tweaks to do_blocking_move 2017-11-25 23:31:16 -06:00
Scott Lahteine
22b897e77d Show M211 output with workspace offset 2017-11-25 20:48:20 -06:00
Scott Lahteine
d06e29846d Loosen HAS_BED_PROBE definition 2017-11-25 20:11:21 -06:00
Scott Lahteine
2f837ce9b7
Merge pull request #8565 from Roxy-3D/bugfix-2.0.x
Change G26 and G29 bit function names to avoid HAL name collision
2017-11-25 20:02:53 -06:00
Roxy-3D
e48fcad615 change G26 and G29 bit function names to avoid HAL collision 2017-11-25 19:58:45 -06:00
Scott Lahteine
41ec449960 Fix G26 error return 2017-11-25 19:53:14 -06:00
Scott Lahteine
9badf5dc0d Fix Micromake C1 config 2017-11-25 18:41:07 -06:00
Scott Lahteine
7576ad7fc2
Merge pull request #8554 from tcm0116/2.0.x-cleanup
[2.0.x] Fix for #8525 and other cleanup
2017-11-25 18:19:54 -06:00
Scott Lahteine
27c5692b13 Syntax tweaks 2017-11-25 18:13:36 -06:00
Scott Lahteine
a9adc2c2f6
Merge pull request #8558 from LVD-AC/2.0.x]-probe-error-handling
[2.0.x] G33 probe error handling
2017-11-25 17:16:58 -06:00
Scott Lahteine
d18d40e1d6 M290 report on change, P0 to leave Probe Z Offset alone 2017-11-25 16:47:39 -06:00
LVD-AC
65f365333f [2.0.x] G33 probe error handling 2017-11-25 16:19:10 -06:00
Scott Lahteine
d3ed0f53cd
Merge pull request #8563 from thinkyhead/bf2_functools_lru_cache
Fix #8561. Fix #8562
2017-11-25 14:35:59 -06:00
Bob-the-Kuhn
8c69adba8b
Merge pull request #8553 from Bob-the-Kuhn/2.0.x-U8Glib-follow-up
[2.0.X] U8Glib follow up
2017-11-25 14:26:32 -06:00
Scott Lahteine
ba5ff1a838 Try manual install of backports.functools_lru_cache 2017-11-25 14:14:36 -06:00
Scott Lahteine
be00e421a7 Patch up M290, M851 2017-11-25 14:11:57 -06:00
Bob-the-Kuhn
fc40d56131 fixed error, updated defaults, added notes
Travis fix - only allow ultralcd_st7920_u8glib_rrd_AVR.cpp to compile when ST7920 selected
2017-11-25 12:35:03 -06:00
Roxy-3D
d29cb646e3
Fix erroneous reference to temperature in time calculations
Travis is having problems at:  https://github.com/MarlinFirmware/Marlin/pull/8560   

So...   doing a direct commit to get things correct.   Bugfix_v1.1.x does not have this bug.  Nothing needs to be done to that branch.
2017-11-25 10:40:56 -06:00
Thomas Moore
7bb1721f35 Fix _BV already defined warnings for Teensy 2017-11-24 22:34:39 -06:00
Thomas Moore
5f9592a523 Cleanup narrowing warning in pin_is_protected 2017-11-24 22:15:56 -06:00
Thomas Moore
34eaaab5fb Fix _BV already defined warnings 2017-11-24 21:59:31 -06:00
Thomas Moore
2ea779e560 Allow bed probe sanity checks to run 2017-11-24 21:59:01 -06:00
Scott Lahteine
d24b1190bd Don't use Z_MIN_PROBE_ENDSTOP on DELTA 2017-11-24 18:24:22 -06:00
Scott Lahteine
e34c6827ea Init MIXING virtual tools as switching 2017-11-24 18:02:09 -06:00
Scott Lahteine
a9ecb975b2 Apply LINEAR_UNIT to M503 output for M200 2017-11-24 17:32:48 -06:00
Scott Lahteine
d95ee0f003
Merge pull request #8551 from revilor/bugfix-2.0.x
MK2_MULTIPLEXER does not require E2/E3 stepper pins
2017-11-24 17:16:23 -06:00
Scott Lahteine
80ada58818 One fewer function call in probe_pt 2017-11-24 17:10:38 -06:00
oliver
92a0dc552a MK2_MULTIPLEXER does not require E2/E3 stepper pins 2017-11-24 23:56:39 +01:00
Scott Lahteine
a81df268fd
Merge pull request #8547 from thinkyhead/bf2_babystep_gfx_overlay
[2.0.x] Followup for MESH_EDIT_GFX_OVERLAY
2017-11-24 16:18:01 -06:00
Scott Lahteine
b49acce035 Tweaks for lcd_external_control 2017-11-24 15:53:25 -06:00
Scott Lahteine
1ef1052ae1 Phatter arrows for Z offset overlay 2017-11-24 15:53:25 -06:00
Scott Lahteine
5926c9c97b Followup for MESH_EDIT_GFX_OVERLAY 2017-11-24 15:53:25 -06:00
Scott Lahteine
ab03a31cc9 Patch G0/G1 for NANODLP_Z_SYNC 2017-11-24 14:11:12 -06:00
Scott Lahteine
a766dfb3b1
Merge pull request #8536 from thinkyhead/bf2_nanodlp_z_move_sync
[2.0.x] Implement NANODLP_Z_SYNC for 2.0.x
2017-11-24 13:11:14 -06:00
Scott Lahteine
fd13489a8a
Combine some Travis tests 2017-11-24 13:10:54 -06:00
Scott Lahteine
01e207213f Fix MK2_MULTIPLEXER stepper indirection 2017-11-24 12:49:28 -06:00
Roxy-3D
ec04cf27d3
Fix the G26 out of scope identifiers in the v2.0.0 branch (#8543)
These changes may need to be warmed over.  I tried to fix things with
the least amount of disruption.   I just wanted to get the bugfix_v2.0.0
branch working for people again.
2017-11-24 10:39:56 -06:00
Scott Lahteine
dc82babe8e Implement NANODLP_Z_SYNC for 2.0.x 2017-11-24 00:28:06 -06:00
Scott Lahteine
4d517d169a
Merge pull request #8535 from thinkyhead/bf2_more_mesh_G26
[2.0.x]  Adapt G26 to work for all meshes
2017-11-23 23:17:06 -06:00
Scott Lahteine
c6b0c104bb Adapt G26 to work for all meshes 2017-11-23 22:31:37 -06:00
Scott Lahteine
5ce7f23afa Config option G26_MESH_VALIDATION for all meshes 2017-11-23 21:43:23 -06:00