Commit graph

7624 commits

Author SHA1 Message Date
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
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 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
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 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 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 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 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
Scott Lahteine c19eb33408 Move G26 to gcode sub-folder 2017-11-23 21:43:23 -06:00
Scott Lahteine a03f93bab4 Fix fan kickstart 2017-11-23 21:42:45 -06:00
Scott Lahteine 9e3c41f9e8 Tweak fan kickstart / speed code 2017-11-23 15:20:35 -06:00
GMagician 118ac61e59 [2.0.x] Tool change bad behaviour fix
Previous fix did not work as expected when axeis not homed. It raise Z but never return to original position
2017-11-22 20:24:03 -06:00
Scott Lahteine c35d27f77c
Merge pull request #8299 from tcm0116/2.0.x-BIQU_BQ111-A4
[2.0.x] Add BIQU BQ111-A4 board
2017-11-22 19:16:04 -06:00
Scott Lahteine 1685cd193b Tweak char_mode init 2017-11-22 19:12:08 -06:00
Scott Lahteine 9406c87a97 Fix up LCD init / charset 2017-11-22 18:22:55 -06:00
Thomas Moore fa577392b2 Add BIQU BQ111-A4 board 2017-11-22 16:34:59 -06:00
Scott Lahteine c2fc78c3a8 #ifndef => #if !PIN_EXISTS 2017-11-22 16:28:52 -06:00
Scott Lahteine c613a1ed38 Fix indentation, stepper.h dependency, etc. 2017-11-22 14:55:30 -06:00
teemuatlut f011a32771 Board definitions for Ultratronics Pro v1.0 2017-11-22 14:55:24 -06:00
Bob-the-Kuhn 9dad534f02 fixed 2017-11-21 21:37:20 -06:00
Scott Lahteine 4371345cbe
Don't re-init graphical LCD after boot screen
Followup to 13a3fb1acc
2017-11-21 18:23:39 -06:00
Scott Lahteine 56c02b7f59 Shift register buttons question
Can LCD shift registers keep up with faster MCUs?
2017-11-21 16:12:40 -06:00
Scott Lahteine 3994d3b935 General cosmetic LCD 2017-11-21 16:12:40 -06:00
Scott Lahteine 617993d0ea Patch for !!TEST (was _BV once?) 2017-11-21 16:12:08 -06:00
Scott Lahteine 3269d8dd62 Tweak M42 var 2017-11-21 16:12:08 -06:00
Mateusz Krawczuk bb1a6eea88
Remove pin count check for MIGTHYBOARD_REVE
Remove assert and unused code since it is implemented in pinsDebug_plus_70.h
2017-11-21 14:38:02 +01:00
Scott Lahteine 1ce0fb336b Patch Max7219_LED_Set input args 2017-11-20 21:15:15 -06:00
GMagician a61127a421 [2.0.x] tool change bad behaviours
This will solve 2 issues on tool change.
1) when no home is done ("no_move" is set) tool change should never move X & Y because... I don't know where I am...only Z should be adjusted to avoid bed collision if other nozzle is lower than current.
Since no move no bed level matrix should be applied
2) When SWITCHING_NOZZLE is enabled and system is homed there are two movements to go to destination, but first can move Z to older position and then crash on the bed
2017-11-20 16:34:55 -06:00
Vitaliy Sapyanov e2724c68ab Update pins_RURAMPS4D.h
Add and bugfix pins
2017-11-20 15:36:13 -06:00
Scott Lahteine 9770062309
Merge pull request #8463 from thinkyhead/bf2_32bit_M42
[2.0.x] Updates to Anet A8 configurations
2017-11-20 15:12:30 -06:00
Scott Lahteine 3066655727 Try port*100+pin, fix config dependency 2017-11-20 13:58:23 -06:00
Scott Lahteine ba8bc7ea80 Cosmetic tweaks 2017-11-20 13:58:02 -06:00
Scott Lahteine f409147116 Fix P2_04, P2_05 2017-11-20 13:58:02 -06:00
Bob-the-Kuhn a28ccabe2a M42 P1.20 fix 2017-11-20 13:58:02 -06:00
Unknown 33912fa7e8 Update Temperature::setPwmFrequency prototype to match source
Introduced with #8446
2017-11-20 01:50:41 -08:00
Scott Lahteine b9327a4d16 Misc. general cleanup 2017-11-19 15:43:39 -06:00
Scott Lahteine 8836623e0f Fix sq/min/max macros after platform headers 2017-11-19 15:43:39 -06:00
Scott Lahteine fe4f009fdd 32-bit unless… 2017-11-19 15:43:38 -06:00
Scott Lahteine 25af9decfe Remove enum.h include of MarlinConfig.h 2017-11-19 15:43:38 -06:00
Scott Lahteine 1d4571b88d Dependency adjustments 2017-11-19 15:43:38 -06:00
Scott Lahteine 550f1025f0 Try using <Arduino.h> everywhere 2017-11-19 14:23:02 -06:00
Scott Lahteine c0000a0cdc Move servo code to modules/servo.* 2017-11-19 14:23:02 -06:00
Scott Lahteine 81bc428b48 Don't compile custom u8g without DOGLCD 2017-11-19 13:58:38 -06:00
Bob-the-Kuhn c14000775b PWM fixes, slow down fan update
include LPC1768 syntax for M42

couple more pin_t changes

consistency

change M42 to R, P format

Revert "change M42 to R, P format"

This reverts commit 01f12f579ec9ccc1bb9126e68d2c86449e9b7edf.
2017-11-18 07:05:50 -06:00
Scott Lahteine 60adc6ff02 Display filwidth ratio in terms of E mm 2017-11-18 07:01:49 -06:00
Scott Lahteine 6e533748eb Fixes #8472 2017-11-18 05:15:55 -06:00
Scott Lahteine 485abb023b
Merge pull request #8456 from thinkyhead/bf2_wednesday_tweaks
[2.0] No retroactive adjustment with M851 Z
2017-11-18 04:49:53 -06:00
Scott Lahteine 3bba7d60f3 No retroactive changes with M851 Z
If using babystep to adjust the Z probe offset, the axis will move and the mesh will be updated at the same time, causing a doubling of the Z offset over the rest of the print.

To correct for this, the current Z position would need to be modified in the opposite direction, canceling out the additional Z offset added to the mesh. This would be confusing to users, and moreover it would not be accurate without also taking the current Z fade level and current Z height into account.

It might make sense to change the mesh in the case where no babystepping is taking place, but this could be considered an undesirable side-effect of changing the `zprobe_zoffset`.

One way to remedy this would be to return to storing the mesh with `zprobe_zoffset` included, then subtracting `zprobe_zoffset` from the returned Z value. Thus, a babystep moving the Z axis up 1mm would subtract 1 from `zprobe_zoffset` while adding 1 to all mesh Z values.

Without including the `zprobe_zoffset` in the `z_values` there is no safe way to alter the mesh in conjunction with babystepping, although it's fine without it.
2017-11-18 03:36:39 -06:00
Scott Lahteine 32512332df Apply some formatting 2017-11-18 03:12:30 -06:00
Scott Lahteine 7dacc999b9 Remove obsolete show_bootscreen var 2017-11-17 17:01:43 -06:00
Roxy-3D 9729528d13
Update UBL's Delta Probable locations
This is a non-intuitive change.   @oldmcg says in this post https://github.com/MarlinFirmware/Marlin/issues/7572#issuecomment-340641207 that using DELTA_PRINTABLE_RADIUS is better than DELTA_PROBABLE_RADIUS for setting the probe limits.   This is because the automatic probe code checks all locations for being reachable by the probe prior to doing the probe.
2017-11-17 16:44:57 -06:00
Scott Lahteine d48cb6bf41 Apply coding standards to Max7219 2017-11-17 15:32:21 -06:00
Scott Lahteine bd8bcf06e7 Updates to Anet A8 configurations
Based on #8426
2017-11-16 23:19:36 -06:00
Bob-the-Kuhn 7eea000f4b E0 auto fan fixes 2017-11-16 18:42:56 -06:00
Scott Lahteine b2dda096fe Fix FILAMENT_LCD_DISPLAY for disabled state 2017-11-16 16:57:48 -06:00
Scott Lahteine 1e8afb66b7 Fix a planner comment 2017-11-16 16:57:47 -06:00
Scott Lahteine 50f09cc029 Miscellaneous cleanup 2017-11-16 00:47:16 -06:00
Scott Lahteine 63257dc083 Fix M503 output for M145
Fixes #7978
2017-11-15 04:00:18 -06:00
Scott Lahteine 0918dae66e Add OV() macro for use in thermistor tables 2017-11-15 03:15:18 -06:00
Scott Lahteine 24057270a3
Merge pull request #8420 from RowanMeara/rm-dithering-2.0.x
[2.0.x] Fix Software Fan PWM
2017-11-15 02:30:19 -06:00
Scott Lahteine 5079a02c90 Add HAL_SERVO_LIB to HAL_Due.h 2017-11-15 02:07:01 -06:00
Scott Lahteine 9c3761047e
Merge pull request #8434 from thinkyhead/bf2_fix_M32_subroutines
[2.0] Fix 'M32 P' subroutines
2017-11-15 01:15:02 -06:00
Scott Lahteine e0d367f1fb Fix M32 P subroutine handling 2017-11-15 00:44:21 -06:00
Scott Lahteine 9f8b4c5ee8 Patch SD lib files for readability 2017-11-15 00:44:21 -06:00
Scott Lahteine 2c8c30437e Fix parser parameter value handling 2017-11-14 23:20:33 -06:00
RowanMeara 6131533157 Change dithering behavior to intended. 2017-11-14 00:47:07 -08:00
Scott Lahteine e70b44dc0b Make sure leveled[] is defined for later use 2017-11-14 02:13:38 -06:00
Scott Lahteine 54774841ba
Merge pull request #8416 from thinkyhead/bf2_M114_DETAIL
[2.0] Add M114_DETAIL to Configuration_adv.h
2017-11-14 00:28:55 -06:00
Scott Lahteine 009e3a7aa7 Add M114_DETAIL to Configuration_adv.h 2017-11-14 00:03:17 -06:00
Scott Lahteine 6d6c3b1e97 Fix up REPRAPWORLD_KEYPAD defines 2017-11-13 22:14:54 -06:00
Scott Lahteine 3f0a982b8c Move Filament Width Sensor to Configuration_adv.h 2017-11-13 21:05:57 -06:00
Scott Lahteine b76e173205 Move test extrusion options under G26 2017-11-13 21:05:57 -06:00
Scott Lahteine 14ebedca27 Drop unused LARGE_FLASH option 2017-11-13 15:44:24 -06:00
Scott Lahteine b7feb53e8a Support for Extrudrboard in Printrboard Rev.F 2017-11-13 15:44:23 -06:00
Scott Lahteine 91baca6abb Patches for compiler warnings/errors 2017-11-13 04:43:47 -06:00
Scott Lahteine 2f73dec077 Apply native workspace fixes for G92, G53-59 2017-11-13 02:09:12 -06:00
Scott Lahteine 04abd8d459 Improve and clarify M428 code 2017-11-13 02:09:11 -06:00
Dave Johnson c009a990e4 [2.0.x] Fix some 8-bit Teensyduino compile warnings (#8385)
* Fix some 8-bit Teensyduino compile warnings

-Override Teensyduino legacy NOT_A_PIN 127 define
-some fixups for Printrboard_RevF pins

* Proper cleanup of Printrboard Rev.F pins

* Apply LCD fixes to Printrboard v1
2017-11-13 01:07:59 -06:00
Scott Lahteine e8e92f8969 No leveling data in M114 if no leveling is enabled 2017-11-12 23:03:38 -06:00
Scott Lahteine f5d210c35c Fix report_current_position 2017-11-12 23:02:53 -06:00
Roxy-3D faaae7a1b2
Provide more clearance for BL-Touch probe 2017-11-12 13:11:22 -06:00
Scott Lahteine 06ee6584fd Remove offsets from soft endstops, tool change 2017-11-11 22:47:38 -06:00
Scott Lahteine c938273bd5 Coding standard patch of M290 2017-11-11 22:14:21 -06:00
Scott Lahteine 98c1265e3b Disable laser power when PWM goes to 0 2017-11-11 22:00:22 -06:00
Scott Lahteine d4a1154c25 Use do_blocking_move_to where possible 2017-11-10 20:55:23 -06:00
Scott Lahteine 36426af564
Merge pull request #8356 from tcm0116/2.0.x-M600
[2.0.x] Normalize load/unload length in M600
2017-11-10 19:44:08 -06:00
Scott Lahteine 1ed86adf9c Cleanup around updatePID 2017-11-10 19:27:34 -06:00
Scott Lahteine 75a58ee4b8 Fix position_is_reachable bug in waiting 2017-11-10 19:27:33 -06:00
LVD-AC e334efb2a7 PROBE_MANUALLY etc. 2017-11-10 19:27:33 -06:00
Bob-the-Kuhn b6415dc169 finish 2017-11-10 14:39:55 -06:00
Scott Lahteine 0efa66be0b Updates to Traditional Chinese
From @cheton at #8347
2017-11-10 04:52:20 -06:00
Scott Lahteine cba9c1cf9e Add pre-calculated planner.e_factor 2017-11-10 03:14:24 -06:00
Thomas Moore 600c85226e Normalize load/unload length in M600 2017-11-10 02:31:46 -06:00
Scott Lahteine 81b91b3f9d Clean up some trailing white-space 2017-11-10 02:31:04 -06:00
Roxy-3D 2f9848ede3
Correct gMax 1.5+ example file
And...   Keep both branches in synchronization.
2017-11-09 23:44:14 -06:00
Scott Lahteine 006dad4b52 Add pins_RURAMPS4D.h & change pins.h
http://3dtoday.ru/blogs/svs0724/ruramps4d-ramps-for-adruino-due-the-pilot-shipment-available-for-zack/
2017-11-09 21:51:06 -06:00
Scott Lahteine 00514857e9 SBASE serial port -1, RAMPS spacing 2017-11-09 21:41:07 -06:00
Scott Lahteine c66696c507
Merge pull request #8344 from tcm0116/2.0.x-delta_height
[2.0.x] Add delta_height variable in lieu of using home_offset
2017-11-09 01:21:53 -06:00
Scott Lahteine 22e18fe832 Patch _manual_goto_xy for kinematics 2017-11-08 22:21:38 -06:00
Scott Lahteine 0cfb936dd1 Clarify some motion code 2017-11-08 22:15:55 -06:00
Thomas Moore f34c3597dc Add delta_height variable in lieu of using home_offset 2017-11-08 22:10:08 -06:00
Bob-the-Kuhn d47fbf791b Arduini IDE compatibility changes
changed includes to make Arduino IDE happy
2017-11-08 20:49:49 -06:00
Scott Lahteine 95ea43bde4 Update XYZ dual stepper configurations 2017-11-08 20:31:43 -06:00
Scott Lahteine b0b4a20930 Tweaks to core motion code 2017-11-08 20:09:09 -06:00
Scott Lahteine 8805e24cc7
Fix tilt_mesh_based_on_probed_grid output bug 2017-11-08 20:06:20 -06:00
Scott Lahteine 24437fbb13
Fix G26 Y argument bug 2017-11-08 19:20:10 -06:00
Scott Lahteine 09b05c9d79
Merge pull request #8321 from Bob-the-Kuhn/pins_re-arm
2.0.x - pins_RAMPS_RE_ARM.h - add mega2560 pin numbers
2017-11-08 13:11:13 -06:00
Scott Lahteine e6788bb6ae Fix get_destination_from_command for E 2017-11-08 12:54:00 -06:00
Roxy-3D 967104e1ce
Default Extrusion Settings were off a few lines in some of the example config files. (#8333) 2017-11-08 11:56:00 -06:00
Bob-the-Kuhn 8875885a15 pins add old names
fix typo

re-write PWM section, add "not on Re-ARM" list
2017-11-08 11:11:38 -06:00
Roxy-3D 1c6e83c137
if !HAS_MESH we still need to do some motion! (#8328)
* if !HAS_MESH we still need to do some motion!

Thank You MagoKimbra !

* Ooops....   need #else and not #elif
2017-11-08 09:42:21 -06:00
Scott Lahteine 82f45c3e6a Patch G33 misuse of PROBE_MANUALLY 2017-11-08 00:36:06 -06:00
Scott Lahteine 064e6fe60e Remove debugging pin toggle from LCD code 2017-11-07 23:00:54 -06:00
Bob-the-Kuhn 0483a7df91 AVR RRD works
LPC1768 VIKI2 & RRDFG are working

looks like all SPIs are working

library change

sh1106 locks up

fixed lockup, started I2C SW com

pretty

re-org

restore a few files

make library happy

switched HAL version of rrd

fix travis error

travis error fixes

another travis fix

cleanup

minor update

one more

correct spacing in platformio.ini
2017-11-07 18:40:29 -06:00
Scott Lahteine 96c9d715f3 Patch abuse of sprintf_P in G33 2017-11-07 17:33:50 -06:00
Roxy-3D ed62c621d7
Fix G26 Circle Drawing. Add Default Extrusion Settings (#8313)
- Fix G26 Circle Drawing.
- Add default extrusion settings so machine can print lines on print bed
- Yet to be done: Get LCD Menu's to use these settings.
2017-11-07 17:13:53 -06:00