 Scott Lahteine
|
0970dbcdf3
|
Merge pull request #9017 from thinkyhead/bf1_better_eeprom_init
[1.1.x] New EEPROM powers
|
2018-01-05 18:19:27 -06:00 |
|
|
Scott Lahteine
|
fd4f49512d
|
Merge pull request #9054 from thinkyhead/bf1_fwretract_class
[1.1.x] FWRetract class for 2.0.x parity
|
2018-01-04 19:40:32 -06:00 |
|
|
Scott Lahteine
|
518d9beb83
|
Merge pull request #9053 from thinkyhead/bf1_parser_squish
[1.1.x] Reduce process_parsed_command lines
|
2018-01-04 17:06:14 -06:00 |
|
|
Scott Lahteine
|
c5e31b1723
|
Merge pull request #9032 from tcm0116/1.1.x-ultralcd
[1.1.x] Fix 'lcd_temp_menu_e0_filament_change' was not declared error
|
2018-01-03 21:34:37 -06:00 |
|
|
Scott Lahteine
|
20d55e5fed
|
Merge pull request #9039 from thinkyhead/bf1_m303_bughunt
[1.1.x] Cleanup, commentary of M303 pid tuning code
|
2018-01-03 21:33:59 -06:00 |
|
|
Scott Lahteine
|
36541d61ab
|
Merge pull request #9038 from thinkyhead/bf1_fix_resume_pos
[1.1.x] Fix resume_print positioning
|
2018-01-03 20:46:50 -06:00 |
|
|
Scott Lahteine
|
c893a90d64
|
Merge pull request #8988 from tcm0116/1.1.x_ubl
[1.1.x] Fix UBL compilation warnings
|
2018-01-02 21:37:59 -06:00 |
|
|
Scott Lahteine
|
ba9879f8fa
|
Merge pull request #9008 from karkla/bugfix-1.1.x
[1.1.x] Update pins_MKS_BASE.h with Microstepping pin definitions
|
2018-01-01 18:47:59 -06:00 |
|
|
Scott Lahteine
|
3cd48db9a9
|
Merge pull request #8983 from ABH10/bugfix-1.1.x_thermistor-tables
[1.1.x] Update of comments in thermistor table files. No functional changes.
|
2018-01-01 18:40:29 -06:00 |
|
|
Scott Lahteine
|
8e82dd0b5b
|
Merge pull request #8947 from houseofbugs/bugfix-1.1.x
[1.1.x] SLIM_LCD_MENUS option
|
2017-12-31 00:56:10 -06:00 |
|
|
Scott Lahteine
|
5f13e2e336
|
Merge pull request #8977 from thinkyhead/bf1_sync_up_configs
[1.1.x] Synchronize configs with 2.0.x
|
2017-12-31 00:55:39 -06:00 |
|
|
Scott Lahteine
|
4153d76810
|
Update Marlin_main.cpp
|
2017-12-31 00:24:57 -06:00 |
|
|
Scott Lahteine
|
1e18d716c2
|
Merge pull request #7107 from tcm0116/load_unload
[1.1.x] Add M701 and M702 filament load and unload
|
2017-12-30 23:34:16 -06:00 |
|
|
Scott Lahteine
|
eaf681675a
|
Merge pull request #8965 from thinkyhead/bf1_better_no_reentry
[1.1.x] ultralcd.cpp: Improve no_reentry, use when queuing G-code
|
2017-12-30 04:24:24 -06:00 |
|
|
Scott Lahteine
|
025a4558fb
|
Merge pull request #8944 from zarthcode/patch-1
Fix malformed Capabilities report
|
2017-12-28 21:06:23 -06:00 |
|
|
Scott Lahteine
|
f9b7659b56
|
Merge pull request #8907 from marcio-ao/bugfix-1.1.x
[1.1.x] Multi extruder support for M600 / LCD
|
2017-12-27 01:30:32 -06:00 |
|
|
Scott Lahteine
|
ecba9b6738
|
Merge pull request #8897 from thinkyhead/bf1_lcd_click_redraw
[1.1.x] Clear lcd_clicked on use
|
2017-12-26 20:54:31 -06:00 |
|
|
Scott Lahteine
|
93e3b3d5ba
|
Merge pull request #8911 from houseofbugs/patch-1
[1.1.x] Fix NO_VOLUMETRICS compile error
|
2017-12-26 20:25:20 -06:00 |
|
|
Scott Lahteine
|
99f98890c2
|
Merge pull request #8892 from thinkyhead/bf1_action_on_action
[1.1.x] Fixes for G29 / 3POINT
|
2017-12-25 09:08:02 -06:00 |
|
|
Scott Lahteine
|
395235a529
|
Merge pull request #8891 from thinkyhead/bf1_action_on_action
[1.1.x] Allow consecutive uses of G29
|
2017-12-25 07:30:04 -06:00 |
|
|
Scott Lahteine
|
19e768d43d
|
Merge pull request #8849 from silentninja1/patch-3
[1.1.x] //Actions on Pause / Resume (M600, M125, etc.)
|
2017-12-25 04:41:37 -06:00 |
|
|
Scott Lahteine
|
1bb5791e64
|
Merge pull request #8888 from thinkyhead/bf1_reduce_jerk_default
[1.1.x] Reduce default jerk
|
2017-12-24 21:48:39 -06:00 |
|
|
Scott Lahteine
|
aa9cad0cc6
|
Merge pull request #8870 from petrzjunior/bugfix-1.1.x
[1.1.x][Language] Update Czech for Dec 2017
|
2017-12-24 18:48:37 -06:00 |
|
|
Scott Lahteine
|
0950527437
|
Fix WELCOME_MSG in PT
From #8879
|
2017-12-24 18:45:16 -06:00 |
|
|
Scott Lahteine
|
b7306ef07f
|
Fix WELCOME_MSG in PT
From #8879
|
2017-12-24 18:42:50 -06:00 |
|
|
Scott Lahteine
|
6f40d57e14
|
Merge pull request #8851 from thinkyhead/bf1_more_scara_scaling
[1.1.x] SCARA Feedrate Scaling for G2/G3 - using HYPOT
|
2017-12-21 21:35:19 -06:00 |
|
|
Scott Lahteine
|
2aaf66b789
|
Merge pull request #8847 from thinkyhead/bf1_restore_position_float
[1.1.x] Restore position_float to LIN_ADVANCE
|
2017-12-21 16:33:46 -06:00 |
|
|
Scott Lahteine
|
ea345b1db7
|
Merge pull request #8738 from lumbric/bugfix-1.1.x
Add missing CPP files to Make file, fixes #8731
|
2017-12-19 23:46:23 -06:00 |
|
|
Scott Lahteine
|
51a0f7aaba
|
Merge pull request #8845 from thinkyhead/bf1_no_volumetrics
[1.1.x] One setting to validate filament width
|
2017-12-19 23:31:14 -06:00 |
|
|
Scott Lahteine
|
201bbaacfc
|
Merge pull request #8844 from thinkyhead/bf1_no_volumetrics
[1.1.x] Add option for NO_VOLUMETRICS
|
2017-12-19 21:14:26 -06:00 |
|
|
Scott Lahteine
|
f0bca012a5
|
Merge pull request #8818 from thinkyhead/bf1_reverting_8735
[1.1.x] Revert #8735 "Initial step correction"
|
2017-12-17 20:59:27 -06:00 |
|
|
Scott Lahteine
|
76b0df6ba1
|
Merge pull request #8813 from drdelaney/bugfix-1.1.x
[1.1.x] Adding support for using the MKS_12864OLED with the SSD1306 controller
|
2017-12-16 18:10:57 -06:00 |
|
|
Scott Lahteine
|
c5a4230a6a
|
Merge pull request #8760 from drdelaney/bugfix-1.1.x
[1.1.x] Support for Tronxy and Zonestar LCD
|
2017-12-15 19:21:22 -06:00 |
|
|
Scott Lahteine
|
4277fcb32c
|
Merge pull request #8790 from robpower/NanoDLP_Sync_improvement
[1.1.x] Extended NanoDLP_Z_Move_Sync to G4 & G28,Added option for all axis.
|
2017-12-15 16:25:02 -06:00 |
|
|
Scott Lahteine
|
f38f2ace5a
|
Correct unskew, after all
|
2017-12-15 14:23:20 -06:00 |
|
|
Scott Lahteine
|
b10831d58e
|
Merge pull request #8791 from fiveangle/bf1-HAS_HEAT_BED_conditional
[1.1.x] Missing HAS_HEAT_BED conditional
|
2017-12-15 13:47:24 -06:00 |
|
|
Scott Lahteine
|
be58e137c5
|
Merge pull request #8772 from thinkyhead/bf1_filwidth_refinement
[1.1.x] Comment, fix filament width sensor
|
2017-12-13 16:25:59 -06:00 |
|
|
Scott Lahteine
|
17b05c150c
|
Merge pull request #8729 from thinkyhead/bf1_sort_out_leveling
[1.1.x] UBL - Skew and Dual X Carriage
|
2017-12-11 01:40:20 -06:00 |
|
|
Scott Lahteine
|
db204c13f2
|
Merge pull request #8745 from thinkyhead/bf1_sync_M420_M852
[1.1.x] M852 skew changes position. And, position change reporting.
|
2017-12-10 23:13:49 -06:00 |
|
|
Scott Lahteine
|
b692d91ca3
|
Merge pull request #8666 from jkur/bugfix-1.1.x
[1.1.x] Add board Mini RAMBo 1.0a
|
2017-12-09 00:06:13 -06:00 |
|
|
Scott Lahteine
|
4f465c2d07
|
Merge pull request #8721 from thinkyhead/bf1_better_reverse_pass
[1.1.x] Improved Planner::reverse_pass
|
2017-12-08 21:20:23 -06:00 |
|
|
Scott Lahteine
|
4aba382b01
|
Merge pull request #8715 from thinkyhead/bf1_followup_8713
Followup to #8713
|
2017-12-08 18:14:57 -06:00 |
|
|
Scott Lahteine
|
2c445743e9
|
Merge pull request #8716 from bjarchi/fix-11x-8604
[1.1.x] Fix for #8604
|
2017-12-08 18:09:38 -06:00 |
|
|
Scott Lahteine
|
ab5133514c
|
Merge pull request #8707 from thinkyhead/bf1_splits_are_expendable
[1.1.x] Discard "continued" blocks on interrupted move
|
2017-12-08 02:29:13 -06:00 |
|
|
Scott Lahteine
|
cd6468d6de
|
Fix TEMP_BED_PIN for Mightyboard Rev.E
Based on #8685
|
2017-12-07 21:52:43 -06:00 |
|
|
Scott Lahteine
|
822254291f
|
Merge pull request #8702 from bjarchi/fix-1.1.x-probe_bounds
Fix - Conditionals_post.h - allow overriding of [min,max] probe point
|
2017-12-07 21:49:04 -06:00 |
|
|
Scott Lahteine
|
e29bf84f06
|
Merge pull request #8705 from thinkyhead/bf1_multi_probe
[1.1.x] MULTIPLE_PROBING — Why stop at 2?
|
2017-12-07 21:21:30 -06:00 |
|
|
Scott Lahteine
|
6c328ec096
|
Merge pull request #8690 from thinkyhead/bf1_clean_blocks_on_trigger
[1.1.x] Purge blocks on endstop/probe hit
|
2017-12-06 22:26:08 -06:00 |
|
|
Scott Lahteine
|
f30b774f26
|
Merge pull request #8696 from thinkyhead/bf1_fixes_DEC6
[1.1.x] Cleanup, bugfixes, parity with 2.0.x
|
2017-12-06 21:41:38 -06:00 |
|
|
Scott Lahteine
|
348e989a50
|
Merge pull request #8687 from AnHardt/1_first_move_probing_homing
[1.1.x] Don't split first_move while homing or probing
|
2017-12-06 11:54:44 -06:00 |
|
|
Scott Lahteine
|
4608e1f590
|
Merge pull request #8681 from thinkyhead/bf1_pidtempbed_fix
[1.1.x] Change K1 to required option PID_K1
|
2017-12-05 20:11:52 -06:00 |
|
|
Scott Lahteine
|
88b34d2bb6
|
Merge pull request #8655 from kein0r/bugfix-1.1.x
Added Support for RAMPS 1.4 Plus board
|
2017-12-05 01:07:19 -06:00 |
|
|
Scott Lahteine
|
ff258d43e7
|
Merge pull request #8661 from lumbric/bugfix-1.1.x
Add missing library in Makefile
|
2017-12-04 23:50:34 -06:00 |
|
|
Scott Lahteine
|
3abd307691
|
Merge pull request #8658 from thinkyhead/backup_1_split_first
[1.1.x] Split first move to planner for better chaining
|
2017-12-04 16:17:14 -06:00 |
|
|
Scott Lahteine
|
1bbf55a7f7
|
Merge pull request #8648 from thinkyhead/bf1_planner_split_first
[1.1.x] Revert PR #8608 — split first planner move
|
2017-12-03 17:58:36 -06:00 |
|
|
Scott Lahteine
|
1600f7d4ee
|
Merge pull request #8635 from fiveangle/bf1_report_xonxoff
[1.1.x] Report SERIAL_XON_XOFF in M115
|
2017-12-03 02:19:28 -06:00 |
|
|
Scott Lahteine
|
71a4c04dd5
|
Merge pull request #8636 from thinkyhead/bf1_ubl_uses_LSL
[1.1.x] Use custom segment length for UBL Cartesian
|
2017-12-03 01:57:32 -06:00 |
|
|
Scott Lahteine
|
0eef0ff0de
|
Merge pull request #8608 from thinkyhead/bf1_planner_split_first
[1.1.x] Split first planner move for better chaining
|
2017-12-03 01:50:58 -06:00 |
|
|
Scott Lahteine
|
e990fd23f1
|
Merge pull request #8623 from thinkyhead/bf1_skew_correction
[1.1] Skew Correction
|
2017-12-02 00:43:38 -06:00 |
|
|
Scott Lahteine
|
e7c6abd767
|
Update V45 Settings header
|
2017-11-30 22:26:21 -06:00 |
|
|
Scott Lahteine
|
ab43113f73
|
Merge pull request #8613 from thinkyhead/bf1_planner_parity
[1.1.x] Fix some planner bugs
|
2017-11-30 17:37:10 -06:00 |
|
|
Scott Lahteine
|
ace3e50898
|
Merge pull request #8488 from Tannoo/1.1.x-led_control_menu
[1.1.x] led control menu
|
2017-11-30 00:18:07 -06:00 |
|
|
Scott Lahteine
|
83ab68b36f
|
Merge pull request #8596 from thinkyhead/bf1_cartesian_segments
[1.1.x] Segmented mesh moves
|
2017-11-29 17:25:27 -06:00 |
|
|
Scott Lahteine
|
b781f76711
|
Merge pull request #8589 from fiveangle/bf11_babystepping_travis_options
[1.1.x] Additional Travis BABYSTEPPING tests
|
2017-11-28 17:53:17 -06:00 |
|
|
Scott Lahteine
|
6eedb64777
|
Merge pull request #8586 from AnHardt/1_Fix_WDTO_during_long_DELTA_moves
[1.1.x] Fix WDTO during long delta moves
|
2017-11-28 17:27:08 -06:00 |
|
|
Scott Lahteine
|
44c7f86f49
|
Merge pull request #8574 from thinkyhead/push_to_upstream
[1.1.x] Make MBL work more like PROBE_MANUALLY
|
2017-11-27 12:54:54 -06:00 |
|
|
Scott Lahteine
|
4c93153194
|
Merge pull request #8556 from LVD-AC/1.1.x]-probe-errors
[1.1.x] G33 probe error handing
|
2017-11-25 15:51:55 -06:00 |
|
|
Scott Lahteine
|
d38aaa0c7e
|
Merge pull request #8550 from thinkyhead/bf1_fix_probe_pt
Fix #8540
|
2017-11-24 17:15:05 -06:00 |
|
|
Scott Lahteine
|
8696f98c3b
|
Merge pull request #8552 from revilor/bugfix-1.1.x
MK2_MULTIPLEXER does not require E2/E3 stepper pins
|
2017-11-24 17:14:25 -06:00 |
|
|
Scott Lahteine
|
de67c3f235
|
Merge pull request #8548 from thinkyhead/bf1_mesh_gfx_overlay
[1.1.x] Adapt MESH_EDIT_GFX_OVERLAY
|
2017-11-24 16:17:52 -06:00 |
|
|
Scott Lahteine
|
a77e513443
|
Combine some travis tests
|
2017-11-24 13:06:18 -06:00 |
|
|
Scott Lahteine
|
664d386623
|
Merge pull request #8337 from robpower/NanoDLP_Z_Move_Sync
[1.1.x] Added optional NanoDLP Z movement synchronization
|
2017-11-24 12:55:58 -06:00 |
|
|
Scott Lahteine
|
5c087727a9
|
Merge pull request #8522 from Roxy-3D/bugfix-1.1.x
[1.1.x] Make G26 work with other meshes too
|
2017-11-23 23:17:00 -06:00 |
|
|
Scott Lahteine
|
ed6a5ff7e5
|
Merge pull request #8524 from GMagician/1.1.x-tool-change-bad-behaviour-fix
[1.1.x] Tool change bad behaviour fix
|
2017-11-22 20:23:02 -06:00 |
|
|
Scott Lahteine
|
3958ff8627
|
Merge pull request #8526 from thinkyhead/bf1_lcd_init_charset
[1.1.x] Fix up LCD init / charset
|
2017-11-22 18:58:36 -06:00 |
|
|
Scott Lahteine
|
bbc2ee6da1
|
Don't re-init graphical LCD after boot screen
Followup to https://github.com/MarlinFirmware/Marlin/commit/13a3fb1accec51adb12f7af4f45d6d63f4bc8a3f
|
2017-11-21 18:21:50 -06:00 |
|
|
Scott Lahteine
|
6ebf8ea230
|
Merge pull request #8496 from GMagician/tool-change-fix-1.0
[1.1.x] tool change bad behaviours
|
2017-11-20 20:36:42 -06:00 |
|
|
Scott Lahteine
|
b6dbc4c5c1
|
Merge pull request #8426 from SteveGotthardt/bugfixes
[1.1.x]Update Anet A8 default values from my Anet A8 experience
|
2017-11-20 15:12:46 -06:00 |
|
|
Scott Lahteine
|
dcc9b0d437
|
Merge pull request #8458 from thinkyhead/bf1_no_mesh_alter
[1.1] No retroactive adjustment with M851 Z
|
2017-11-18 04:49:39 -06:00 |
|
|
Scott Lahteine
|
2511e869e2
|
Update Configuration.h
|
2017-11-16 23:18:55 -06:00 |
|
|
Scott Lahteine
|
aa612124f2
|
Merge pull request #8452 from tcm0116/1.1.x-pio_deps
[1.1.x] Fix PlatformIO dependencies
|
2017-11-16 22:54:15 -06:00 |
|
|
Scott Lahteine
|
3e050fb35a
|
Merge pull request #8454 from GMagician/1.1.x-gitignore
[1.1] gitignore visual studio update
|
2017-11-16 22:39:30 -06:00 |
|
|
Scott Lahteine
|
3dee10636c
|
Merge pull request #8459 from thinkyhead/bf1_filwidth_fix
[1.1] Fix FILAMENT_LCD_DISPLAY, disabled state, optimize
|
2017-11-16 17:58:51 -06:00 |
|
|
Scott Lahteine
|
0eed5e0667
|
Merge pull request #8437 from thinkyhead/bf1_thermistor_ov
[1.1] Add OV() macro for thermistor tables
|
2017-11-15 03:50:42 -06:00 |
|
|
Scott Lahteine
|
d2613ce077
|
Merge pull request #8432 from thinkyhead/bf1_fix_M32_subroutines
[1.1] Fix 'M32 P' subroutines
|
2017-11-15 02:31:21 -06:00 |
|
|
Scott Lahteine
|
f2e222b9e8
|
Merge pull request #8419 from RowanMeara/rm-dithering-1.1.x
[1.1.x] Fix Software Fan PWM
|
2017-11-15 02:29:59 -06:00 |
|
|
Scott Lahteine
|
d8b1343279
|
Merge pull request #8431 from thinkyhead/bf1_fix_parser_value
[1.1] Fix parser value handling
|
2017-11-15 00:50:01 -06:00 |
|
|
Scott Lahteine
|
be67acbd48
|
Merge pull request #8417 from thinkyhead/bf1_M114_DETAIL
[1.1] Add M114_DETAIL to Configuration_adv.h
|
2017-11-14 00:28:48 -06:00 |
|
|
Scott Lahteine
|
216f9b45cc
|
Merge pull request #8411 from SteveGotthardt/AnetWarningFixes
[1.1] Fix compile warnings for REPRAPWORLD_KEYPAD
|
2017-11-13 22:33:11 -06:00 |
|
|
Scott Lahteine
|
1962c13455
|
Merge pull request #8412 from thinkyhead/bf1_mesh_test_pins
[1.1] Move test extrusion options under G26
|
2017-11-13 21:22:42 -06:00 |
|
|
Scott Lahteine
|
4e3b566f72
|
Merge pull request #7286 from cscott/printrboard-rev-f
[1.1.x] Update pin definitions for PRINTRBOARD REV F.
|
2017-11-13 16:08:14 -06:00 |
|
|
Scott Lahteine
|
8b684637bc
|
Merge pull request #8397 from RowanMeara/rm-M428-1.1.x
[1.1.x] Fix M428
|
2017-11-13 15:11:36 -06:00 |
|
|
Scott Lahteine
|
a2fc7da587
|
Merge pull request #8398 from thinkyhead/bf1_fix_printrboard_pins
[1.1] Fix Printrboard pins for parity with 2.0
|
2017-11-13 01:07:18 -06:00 |
|
|
Scott Lahteine
|
5cc87abb3a
|
Merge pull request #8381 from thinkyhead/bf1_native_followup
[1.1] Remove offsets from soft endstops, tool change
|
2017-11-11 23:13:40 -06:00 |
|
|
Scott Lahteine
|
972248c333
|
Merge pull request #8357 from tcm0116/1.1.x-M600
[1.1.x] Normalize load/unload length in M600
|
2017-11-10 21:01:30 -06:00 |
|
|
Scott Lahteine
|
2a54fd1444
|
Merge pull request #8325 from LVD-AC/1.1.x-manual-probe
[1.1.x] PROBE_SELECTED etc.
|
2017-11-10 19:28:53 -06:00 |
|
|
Scott Lahteine
|
438e894899
|
Merge pull request #8347 from cheton/translation
[1.1.x] Translation updates for Traditional Chinese
|
2017-11-10 04:53:31 -06:00 |
|
|
Scott Lahteine
|
b6b4bf0959
|
Merge pull request #8345 from tcm0116/1.1.x-delta_height
[1.1.x] Add delta_height variable in lieu of using home_offset
|
2017-11-09 01:19:48 -06:00 |
|
|
Scott Lahteine
|
d60619f8e5
|
Merge pull request #8342 from thinkyhead/bf1_fixes_for_117
[1.1] Fix PROBE_MANUALLY on kinematic bots
|
2017-11-08 23:51:50 -06:00 |
|
|
Scott Lahteine
|
7326fe1136
|
Fix tilt_mesh_based_on_probed_grid output bug
|
2017-11-08 20:07:02 -06:00 |
|