  Scott LahteineandGitHub
|
41246b45f1
|
Merge pull request #9040 from thinkyhead/bf2_m303_bughunt
[2.0.x] M303 pid autotune cleanup, comment
|
2018-01-03 23:17:59 -06:00 |
|
|
Scott LahteineandGitHub
|
724e3f33bc
|
Merge pull request #9001 from Tannoo/(2.0.x)_LCD_EEPROM_init_fix
[2.0.x] EEPROM init fix
|
2018-01-03 05:47:01 -06:00 |
|
|
Scott LahteineandGitHub
|
fc67c64b8f
|
Merge pull request #8989 from tcm0116/2.0.x_ubl
[2.0.x] Fix UBL compilation warnings
|
2018-01-02 21:38:45 -06:00 |
|
|
Scott LahteineandGitHub
|
d190c702de
|
Add MKS_BASE Microstepping pins
Based on #9008
|
2018-01-01 18:49:21 -06:00 |
|
|
Scott LahteineandGitHub
|
9312ee63b0
|
Merge pull request #8979 from thinkyhead/bf2_sync_up_configs
[2.0.x] Synchronize configs with 1.1.x
|
2017-12-31 01:15:43 -06:00 |
|
|
Scott LahteineandGitHub
|
41dfb229ec
|
Merge pull request #8978 from thinkyhead/bf2_slimming_option
[2.0.x] SLIM_LCD_MENUS option
|
2017-12-31 00:56:29 -06:00 |
|
|
Scott LahteineandGitHub
|
3dd04736c0
|
Update M17_M18_M84.cpp
|
2017-12-31 00:26:45 -06:00 |
|
|
Scott LahteineandGitHub
|
5294fd132f
|
Merge pull request #8924 from ejtagle/bugfix-2.0.x
[2.0.x] Improve SW SPI for DUE a bit more
|
2017-12-30 23:32:46 -06:00 |
|
|
Scott LahteineandGitHub
|
7cc2193bce
|
Add Tronxy X1 example config (#8972)
|
2017-12-30 17:25:31 -06:00 |
|
|
Scott LahteineandGitHub
|
2b1e6829b3
|
Merge pull request #8966 from thinkyhead/bf2_better_no_reentry
[2.0.x] ultralcd.cpp: Better no_reentry, use in queuing G-code
|
2017-12-30 16:33:24 -06:00 |
|
|
Scott LahteineandGitHub
|
8274369522
|
Merge pull request #8945 from thinkyhead/bf2_better_char_lcd
[2.0.x] Display up to 3 extruders on char LCD
|
2017-12-28 20:48:14 -06:00 |
|
|
Scott LahteineandGitHub
|
db32c185ae
|
Merge pull request #8860 from Bob-the-Kuhn/2.0.x-DUE-RRDFGSC
[2.0.x] DUE - update for Reprap Discount Full Graphic Smart Controller
|
2017-12-27 05:06:49 -06:00 |
|
|
Scott LahteineandGitHub
|
f8156d2d2c
|
Merge pull request #8913 from thinkyhead/bf2_multitool_M600
[2.0.x] Multi extruder support for M600 / LCD
|
2017-12-27 04:40:50 -06:00 |
|
|
Scott LahteineandGitHub
|
fb6966f2b5
|
Merge pull request #8912 from thinkyhead/bf2_no_vol_fix
[2.0.x] No sub-menu if NO_VOLUMETRICS
|
2017-12-26 18:46:39 -06:00 |
|
|
Scott LahteineandGitHub
|
95b82ae5e3
|
Merge pull request #8893 from thinkyhead/bf2_action_on_action
[2.0.x] Fixes for G29, esp. 3POINT
|
2017-12-25 08:45:53 -06:00 |
|
|
Scott LahteineandGitHub
|
68438b0d4e
|
Merge pull request #8889 from thinkyhead/bf2_action_on_action
[2.0.x] //Actions on Pause / Resume (M600, M125, etc.)
|
2017-12-25 07:30:24 -06:00 |
|
|
Scott LahteineandGitHub
|
f218eb0ddf
|
Merge pull request #8887 from thinkyhead/bf2_reduce_jerk_default
[2.0.x] Reduce default jerk. XY by half. Z by 1/4
|
2017-12-24 21:48:35 -06:00 |
|
|
Scott LahteineandGitHub
|
723da1d7a5
|
Merge pull request #8872 from Bob-the-Kuhn/2.0.x-deglitch
[2.0.x] remove SET_OUTPUT glitch - LPC1768 & DUE
|
2017-12-24 19:39:00 -06:00 |
|
|
Scott LahteineandGitHub
|
869c89d83f
|
Merge pull request #8865 from thinkyhead/bf2_more_scara_scaling
[2.0.x] SCARA Feedrate Scaling for G2/G3 - using HYPOT
|
2017-12-24 19:18:13 -06:00 |
|
|
Scott LahteineandGitHub
|
737561c1b3
|
Merge pull request #8876 from subdancer/bugfix-2.0.x
[2.0.x] RADDS LCD Display
|
2017-12-24 19:17:14 -06:00 |
|
|
Scott LahteineandGitHub
|
4a8fd8ae92
|
Merge pull request #8853 from ejtagle/bugfix-2.0.x
USB Mass Storage Implementation / CDC with HW flow control and misc fixes and improvements for Arduino DUE/RE-ARM based boards
|
2017-12-24 18:50:28 -06:00 |
|
|
Scott LahteineandGitHub
|
2d75b540e2
|
Merge pull request #8867 from tcm0116/2.0.x_pio_errors
[2.0.x][PlatformIO] Stop compiling after first five errors
|
2017-12-24 18:49:43 -06:00 |
|
|
Scott LahteineandGitHub
|
aa97cd6e9b
|
Merge pull request #8871 from petrzjunior/bugfix-2.0.x
[2.0.x][Language] Update Czech for Dec 2017
|
2017-12-24 18:48:59 -06:00 |
|
|
Scott LahteineandGitHub
|
2b0165e90c
|
Merge pull request #8878 from tcm0116/2.0.x_revert
[2.0.x] Revert "Followup to #8698"
|
2017-12-24 18:46:02 -06:00 |
|
|
Scott LahteineandGitHub
|
ca145643bd
|
Merge pull request #8863 from thinkyhead/bf2_restore_position_float
[2.0.x] Restore position_float to LIN_ADVANCE
|
2017-12-21 17:12:28 -06:00 |
|
|
Scott LahteineandGitHub
|
63cc34f632
|
Merge pull request #8846 from thinkyhead/bf2_no_volumetrics
[2.0.x] One setting to validate filament width
|
2017-12-19 23:31:23 -06:00 |
|
|
Scott LahteineandGitHub
|
5a0f9605e3
|
Merge pull request #8842 from thinkyhead/bf2_no_volumetrics
[2.0.x] Add option for NO_VOLUMETRICS
|
2017-12-19 21:14:35 -06:00 |
|
|
Scott LahteineandGitHub
|
a891d8d738
|
Merge pull request #8820 from thinkyhead/bf2_mks_sbase_spi
[2.0.x] Fix SDSUPPORT for MKS SBASE
|
2017-12-17 21:15:49 -06:00 |
|
|
Scott LahteineandGitHub
|
029333a8eb
|
Merge pull request #8819 from thinkyhead/bf2_reverting_XXXX
[2.0.x] Revert "Initial step correction"
|
2017-12-17 20:59:41 -06:00 |
|
|
Scott LahteineandGitHub
|
1de7c75590
|
Merge pull request #8799 from thinkyhead/bf2_zonestar_tronxy
[2.0.x] Support for Tronxy and Zonestar LCD
|
2017-12-15 19:55:36 -06:00 |
|
|
Scott LahteineandGitHub
|
20008b72a8
|
Merge pull request #8784 from fiveangle/bf2-travis_examples_squashed
[2.0.x] Fix example configs and add to TravisCI tests - squashed
|
2017-12-15 17:34:34 -06:00 |
|
|
Scott LahteineandGitHub
|
f9aa1daa0d
|
Merge pull request #8793 from robpower/NanoDLP_Sync_improvement_2
[2.0.x] V2 Extended NanoDLP_Z_Move_Sync to G4 & G28,Added all axis option.
|
2017-12-15 16:42:29 -06:00 |
|
|
Scott LahteineandGitHub
|
4782acf60e
|
Merge pull request #8780 from fiveangle/bf2-typo
[2.0.x] typo in Marlin.cpp
|
2017-12-15 15:25:41 -06:00 |
|
|
Scott LahteineandGitHub
|
09d13f186f
|
Correct unskew, after all
|
2017-12-15 14:24:20 -06:00 |
|
|
Scott LahteineandGitHub
|
c5632bb91b
|
Merge pull request #8792 from fiveangle/bf2-HAS_HEAT_BED_conditional
[2.0.x] Missing HAS_HEAT_BED conditional
|
2017-12-15 14:18:48 -06:00 |
|
|
Scott LahteineandGitHub
|
21a7b4f26d
|
Merge pull request #8773 from thinkyhead/bf2_filwidth_refinement
[2.0.x] Comment, fix filament width sensor
|
2017-12-13 16:26:11 -06:00 |
|
|
Scott LahteineandGitHub
|
a641992c1d
|
Merge pull request #8762 from victorpv/patch-2
[2.0.x] STM32F1 HAL: Fix issue #8585. Updates to readme.
|
2017-12-12 18:28:18 -06:00 |
|
|
Scott LahteineandGitHub
|
c555a214d2
|
Merge pull request #8730 from thinkyhead/bf2_fixup_ubl
[2.0.x] UBL - Skew and Dual X Carriage
|
2017-12-11 03:37:13 -06:00 |
|
|
Scott LahteineandGitHub
|
f53e0702fc
|
Merge pull request #8747 from thinkyhead/bf2_sync_M420_M852
[2.0.x] M852 changes position. Position change reporting.
|
2017-12-10 22:40:32 -06:00 |
|
|
Scott LahteineandGitHub
|
11f9c253e0
|
Merge pull request #8736 from thinkyhead/bf2_first_step_fix
[2.0.x] Reset timer count before first block step
|
2017-12-10 19:02:22 -06:00 |
|
|
Scott LahteineandGitHub
|
9b800b7fbe
|
Merge pull request #8726 from thinkyhead/bf2_minirambo_10a
[2.0.x] Add board Mini RAMBo 1.0a
|
2017-12-09 00:06:05 -06:00 |
|
|
Scott LahteineandGitHub
|
a2ac452ef9
|
Merge pull request #8725 from thinkyhead/bf2_hal_timer_for_advance
[2.0.x] TCNT0 => HAL_timer_get_current_count
|
2017-12-08 23:05:06 -06:00 |
|
|
Scott LahteineandGitHub
|
206866ebb3
|
Merge pull request #8708 from thinkyhead/bf2_splits_are_expendable
[2.0.x] Discard "continued" blocks on interrupted move
|
2017-12-08 03:35:09 -06:00 |
|
|
Scott LahteineandGitHub
|
43ea265b78
|
Merge pull request #8685 from MateuszKrawczuk/patch-3
Update TEMP_BED_PIN in MIGHTYBOARD_REVE
|
2017-12-07 21:50:35 -06:00 |
|
|
Scott LahteineandGitHub
|
9d65e61f39
|
Merge pull request #8706 from thinkyhead/bf2_multi_probe
[2.0.x] MULTIPLE_PROBING — Why stop at 2?
|
2017-12-07 21:21:38 -06:00 |
|
|
Scott LahteineandGitHub
|
542efda7db
|
Merge pull request #8698 from thinkyhead/bf2_replace_jerk_code
[2.0.x] Improved Core-compatible jerk code
|
2017-12-07 00:17:00 -06:00 |
|
|
Scott LahteineandGitHub
|
438c21ad5c
|
Merge pull request #8693 from GMagician/2.x-address-#8644
[2.x] Address #8644
|
2017-12-07 00:05:02 -06:00 |
|
|
Scott LahteineandGitHub
|
60e7951312
|
Merge pull request #8691 from thinkyhead/bf2_clean_blocks_on_trigger
[2.0.x] Purge blocks on endstop/probe hit
|
2017-12-06 22:39:43 -06:00 |
|
|
Scott LahteineandGitHub
|
d163c4b530
|
Merge pull request #8695 from thinkyhead/bf2_fixes_DEC6
[2.0.x] Cleanup, bugfixes, parity with 1.1.x
|
2017-12-06 22:22:35 -06:00 |
|
|
Scott LahteineandGitHub
|
466f2761cb
|
Merge pull request #8688 from AnHardt/2_first_move_probing_homing
[2.0.x] Don't split first_move while homing or probing
|
2017-12-06 11:52:50 -06:00 |
|
|
Scott LahteineandGitHub
|
1da2b2dd74
|
Merge pull request #8667 from Wackerbarth/PID_on_bed_only
[2.0.x] Compilation errors with PIDTEMPBED only
|
2017-12-05 20:15:05 -06:00 |
|
|
Scott LahteineandGitHub
|
cb8b9950af
|
Merge pull request #8663 from thinkyhead/bf2_rampsplus
[2.0.x] Support for RAMPS Plus (3DYMY)
|
2017-12-05 01:07:25 -06:00 |
|
|
Scott LahteineandGitHub
|
37fff608b0
|
Merge pull request #8652 from fiveangle/bf2_usbcon_xonxoff
[2.0.x] SERIAL_XON_XOFF not supported on USB-native AVR devices
|
2017-12-04 16:46:18 -06:00 |
|
|
Scott LahteineandGitHub
|
02dd621ac7
|
Merge pull request #8659 from thinkyhead/backup_2_split_first
[2.0.x] Split first move to planner for better chaining
|
2017-12-04 16:17:27 -06:00 |
|
|
Scott LahteineandGitHub
|
f125ba7eb6
|
Merge pull request #8647 from thinkyhead/bf2_planner_split_first
[2.0.x] Revert PR #8611 — split first planner move
|
2017-12-03 18:15:01 -06:00 |
|
|
Scott LahteineandGitHub
|
6e944a413c
|
Merge pull request #8607 from benlye/patch-1
[2.0.x] Fix M49 so that it does not hang the terminal console
|
2017-12-03 03:41:33 -06:00 |
|
|
Scott LahteineandGitHub
|
967522b95e
|
Merge pull request #8615 from dot-bob/Duplicator_6-2.0.x
[2.0.x] Example configurations for Wanhao Duplicator 6
|
2017-12-03 03:37:48 -06:00 |
|
|
Scott LahteineandGitHub
|
f4b16a3bac
|
Update M49.cpp
|
2017-12-03 03:34:56 -06:00 |
|
|
Scott LahteineandGitHub
|
f9327534f8
|
Merge pull request #8634 from fiveangle/bf2_report_xonxoff
[2.0.x] Report SERIAL_XON_XOFF in M115
|
2017-12-03 02:18:50 -06:00 |
|
|
Scott LahteineandGitHub
|
da9f140829
|
Merge pull request #8637 from thinkyhead/bf2_ubl_uses_LSL
[2.0.x] Use custom segment length for UBL Cartesian
|
2017-12-03 01:57:49 -06:00 |
|
|
Scott LahteineandGitHub
|
824980e70e
|
Merge pull request #8611 from thinkyhead/bf2_planner_split_first
[2.0.x] Split first planner move for better chaining
|
2017-12-03 01:50:46 -06:00 |
|
|
Scott LahteineandGitHub
|
046a1ad331
|
Merge pull request #8625 from tcm0116/2.0.x-G33
[2.0.x] Fix missing return values in G33_auto_tune
|
2017-12-02 00:51:19 -06:00 |
|
|
Scott LahteineandGitHub
|
98aba6a534
|
Merge pull request #8624 from thinkyhead/bf2_skew_correction
[2.0] Skew Correction
|
2017-12-02 00:43:48 -06:00 |
|
|
Scott LahteineandGitHub
|
e3948d8582
|
Merge pull request #8612 from thinkyhead/bf2_planner_parity
[2.0.x] Fix some planner bugs
|
2017-11-30 17:58:53 -06:00 |
|
|
Scott LahteineandGitHub
|
bee2b5eea4
|
Merge pull request #8388 from Tannoo/2.0.x-led_control_menu
[2.0] led_control_menu
|
2017-11-30 00:18:21 -06:00 |
|
|
Scott LahteineandGitHub
|
fd78446b2b
|
Merge pull request #8600 from thinkyhead/bf2_cartesian_segments
[2.0.x] Segmented mesh moves
|
2017-11-29 17:25:36 -06:00 |
|
|
Scott LahteineandGitHub
|
4f32786cf7
|
Merge pull request #8588 from fiveangle/bf20_babystepping_travis_options
[2.0.x] Additional Travis BABYSTEPPING tests
|
2017-11-28 17:56:55 -06:00 |
|
|
Scott LahteineandGitHub
|
a8aa43ce2d
|
Merge pull request #8587 from AnHardt/2_Fix_WDTO_during_long_DELTA_moves
[2.0.x] Fix WDTO during long delta moves
|
2017-11-28 17:29:18 -06:00 |
|
|
Scott LahteineandGitHub
|
47099af3ec
|
Merge pull request #8575 from thinkyhead/kuru_to_upstream
[2.0.x] Make MBL work more like PROBE_MANUALLY
|
2017-11-27 12:55:05 -06:00 |
|
|
Scott LahteineandGitHub
|
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 |
|
|
Scott LahteineandGitHub
|
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 LahteineandGitHub
|
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 LahteineandGitHub
|
d3ed0f53cd
|
Merge pull request #8563 from thinkyhead/bf2_functools_lru_cache
Fix #8561. Fix #8562
|
2017-11-25 14:35:59 -06:00 |
|
|
Scott LahteineandGitHub
|
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 LahteineandGitHub
|
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 LahteineandGitHub
|
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 LahteineandGitHub
|
fd13489a8a
|
Combine some Travis tests
|
2017-11-24 13:10:54 -06:00 |
|
|
Scott LahteineandGitHub
|
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 LahteineandGitHub
|
8602461da8
|
Merge pull request #8523 from GMagician/2.0-Tool-change-bad-behaviour-fix
[2.0.x] Tool change bad behaviour fix
|
2017-11-22 21:29:33 -06:00 |
|
|
Scott LahteineandGitHub
|
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 LahteineandGitHub
|
7533ccfa83
|
Merge pull request #8527 from thinkyhead/bf2_lcd_init_charset
[2.0.x] Fix up LCD init / charset
|
2017-11-22 19:06:29 -06:00 |
|
|
Scott LahteineandGitHub
|
001ce7a2fd
|
Merge pull request #8521 from teemuatlut/Ultratronics
[2.0.x] Add support for Ultratronics Pro v1.0 and fix compiling for Due HAL
|
2017-11-22 16:18:59 -06:00 |
|
 Scott LahteineandScott Lahteine
|
c613a1ed38
|
Fix indentation, stepper.h dependency, etc.
|
2017-11-22 14:55:30 -06:00 |
|
|
Scott LahteineandGitHub
|
4371345cbe
|
Don't re-init graphical LCD after boot screen
Followup to https://github.com/MarlinFirmware/Marlin/commit/13a3fb1accec51adb12f7af4f45d6d63f4bc8a3f
|
2017-11-21 18:23:39 -06:00 |
|
|
Scott LahteineandGitHub
|
8d0a45f5d4
|
Merge pull request #8512 from thinkyhead/bf2_debouncer
[2.0.x] General code clean/comment
|
2017-11-21 17:46:20 -06:00 |
|
|
Scott LahteineandGitHub
|
cf2c5266ed
|
Merge pull request #8514 from MateuszKrawczuk/patch-1
Remove pin count check for MIGHTYBOARD_REVE
|
2017-11-21 15:44:59 -06:00 |
|
|
Scott LahteineandGitHub
|
63e135732c
|
Merge pull request #8495 from GMagician/Tool-change-fix
[2.0.x] tool change bad behaviours
|
2017-11-20 20:36:46 -06:00 |
|
|
Scott LahteineandGitHub
|
5cfdb76186
|
Merge pull request #8425 from Vynt-1/bugfix-2.0.x
Update pins_RuRAMPS
|
2017-11-20 16:18:16 -06:00 |
|
|
Scott LahteineandGitHub
|
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 LahteineandGitHub
|
586c1e4e73
|
Merge pull request #8484 from Bob-the-Kuhn/P1.02-P1.20
2.0.x LPC1768 - M42 compatibility with Repetier Host
|
2017-11-20 15:03:00 -06:00 |
|
|
Scott LahteineandGitHub
|
37a8d0b809
|
Merge pull request #8464 from tcm0116/2.0.x-pio_lib_deps
[2.0.x] Update PlatformIO lib_deps
|
2017-11-20 15:02:27 -06:00 |
|
|
Scott LahteineandGitHub
|
5a52cf6a71
|
Merge pull request #8499 from thinkyhead/bf2_workaround_sq
[2.0.x] Dependency adjustments (e.g., sq macro)
|
2017-11-19 16:08:09 -06:00 |
|
|
Scott LahteineandGitHub
|
3af7fc07e7
|
Merge pull request #8446 from Bob-the-Kuhn/LPC1768-PWM-rewrite
2.0.x FAST_PWM_FAN updates & make LPC1768 PWM use fewer CPU cycles
|
2017-11-18 07:07:30 -06:00 |
|
|
Scott LahteineandGitHub
|
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 LahteineandGitHub
|
ca6d408549
|
Merge pull request #8477 from thinkyhead/bf2_some_formatting
[2.0.x] Apply some formatting
|
2017-11-18 03:45:51 -06:00 |
|
|
Scott LahteineandGitHub
|
a7ff4f5799
|
Merge pull request #8455 from thinkyhead/bf2_filwidth_fix
[2.0] Fix Filament Width Sensor LCD display
|
2017-11-16 17:58:42 -06:00 |
|
|
Scott LahteineandGitHub
|
166dbada91
|
Merge pull request #8438 from thinkyhead/bf2_thermistor_ov
[2.0] Add OV() macro for use in thermistor tables
|
2017-11-15 03:50:50 -06:00 |
|
|
Scott LahteineandGitHub
|
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 LahteineandGitHub
|
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 LahteineandGitHub
|
1c7b9f6d5d
|
Merge pull request #8433 from thinkyhead/bf2_fix_parser_value
[2.0] Fix parser value handling
|
2017-11-15 00:49:47 -06:00 |
|