  Scott LahteineandGitHub
|
4ea447959e
|
Merge pull request #6311 from thinkyhead/rc_bare_M109_M190
Have M109 / M190 do nothing with no parameters
|
2017-04-11 06:10:31 -05:00 |
|
|
Scott LahteineandGitHub
|
48c16fc6ef
|
Merge pull request #6307 from thinkyhead/rc_less_no_reentrance
Only lcd_synchronize needs no_reentry
|
2017-04-10 20:58:32 -05:00 |
|
|
Scott LahteineandGitHub
|
67fb7f82ac
|
Merge pull request #6283 from thinkyhead/rc_eeprom_z_fade
Save / restore z_fade_height in EEPROM
|
2017-04-10 20:05:20 -05:00 |
|
|
Scott LahteineandGitHub
|
eff5af569b
|
Merge pull request #6300 from MagoKimbra/rc_fix_mesh_report
Fix mbl_mesh_report
|
2017-04-10 19:37:19 -05:00 |
|
|
Scott LahteineandGitHub
|
4a18968c10
|
Merge pull request #6297 from Kaibob2/patch-9
Fix EPROM -> EEPROM
|
2017-04-10 19:35:30 -05:00 |
|
|
Scott LahteineandGitHub
|
dad907b923
|
Merge pull request #6293 from thinkyhead/rc_move_toshiba
Put TOSHIBA with other stepper driver options
|
2017-04-09 22:08:36 -05:00 |
|
|
Scott LahteineandGitHub
|
7a704af5e6
|
Merge pull request #6284 from thinkyhead/rc_wt150_rebase
wt150 (Mightyboard Rev E) & RRD Full Graphic Smart Controller
|
2017-04-09 20:27:44 -05:00 |
|
|
Scott LahteineandGitHub
|
2bde7940e0
|
Merge pull request #6289 from zlowred/RCBugFix
Fixed comparison of float values to NaN
|
2017-04-09 19:39:04 -05:00 |
|
|
Scott LahteineandGitHub
|
e48a52a530
|
Patch a display issue with LCD_DECIMAL_SMALL_XY
The `ftostr4sign` function got munged by the `WITHIN` patch
|
2017-04-09 10:25:35 -05:00 |
|
|
Scott LahteineandGitHub
|
1a3cd6a090
|
Merge pull request #6213 from thinkyhead/rc_gitattributes
Init bed_level_virt_interpolate on EEPROM load
|
2017-04-09 08:13:11 -05:00 |
|
|
Scott LahteineandGitHub
|
cfad4736cd
|
Merge pull request #6285 from thinkyhead/rc_cheaptronic_v2
Cheaptronic V2
|
2017-04-09 07:09:23 -05:00 |
|
|
Scott LahteineandGitHub
|
2f5e934a19
|
Merge pull request #6282 from thinkyhead/rc_cleanup_and_5_extruders
Additional missed patches
|
2017-04-09 04:35:08 -05:00 |
|
|
Scott LahteineandGitHub
|
635f182478
|
Merge pull request #6281 from thinkyhead/rc_cleanup_and_5_extruders
More patches for 5 extruders
|
2017-04-09 04:07:22 -05:00 |
|
|
Scott LahteineandGitHub
|
b356d73239
|
Merge pull request #6278 from thinkyhead/pr_delta_angles
Followup to additional delta trim options
|
2017-04-08 22:25:57 -05:00 |
|
|
Scott LahteineandGitHub
|
d3b4d84586
|
Merge pull request #6277 from thinkyhead/pr_roxy3d_rcbugfix
Unify UBL Command Parsing
|
2017-04-08 20:17:46 -05:00 |
|
|
Scott LahteineandGitHub
|
98c9de11e1
|
Merge pull request #6266 from thinkyhead/rc_cleanup_after
Cleanup after recent merges
|
2017-04-08 20:08:15 -05:00 |
|
|
Scott LahteineandGitHub
|
f8408036f2
|
Merge pull request #6264 from thinkyhead/rc_five_extruders
Support up to 5 extruders in Marlin
|
2017-04-07 12:48:56 -05:00 |
|
|
Scott LahteineandGitHub
|
dc84678fc1
|
Fix HOTEND_STATUS_ITEM for graphical display
|
2017-04-06 23:07:30 -05:00 |
|
|
Scott LahteineandGitHub
|
a0de5d94e2
|
Merge pull request #6258 from benlye/benlye-bilinearfix2
Better fix for bilinear Z offset and G29 Z (update to #6251)
|
2017-04-06 20:51:57 -05:00 |
|
|
Scott LahteineandGitHub
|
b23aef5b8d
|
Merge pull request #6190 from Bob-the-Kuhn/Stop-and-Kill-prints---round-2
Message for every KILL and STOP (also need delays)
|
2017-04-06 20:40:12 -05:00 |
|
|
Scott LahteineandGitHub
|
7dfe2cc132
|
Merge pull request #6254 from thinkyhead/rc_ubl_rename
Group all UBL files via a common prefix
|
2017-04-06 05:46:18 -05:00 |
|
|
Scott LahteineandGitHub
|
11430b6d33
|
Merge pull request #6256 from thinkyhead/rc_unify_grid_size
Use same config name for all mesh dimensions
|
2017-04-06 05:30:28 -05:00 |
|
|
Scott LahteineandGitHub
|
034e912c85
|
Merge pull request #6248 from thinkyhead/rc_marlin_scad_mesh
Add hidden option to output Bilinear grids in JSON
|
2017-04-06 00:36:45 -05:00 |
|
 Scott LahteineandScott Lahteine
|
44a849bdce
|
Fix broken M206/M428/G92 offsets
|
2017-04-05 22:01:37 -05:00 |
|
|
Scott LahteineandGitHub
|
3412950abc
|
Merge pull request #6209 from thinkyhead/rc_psu_zero
Power Supply 0 as "General"
|
2017-04-02 16:44:42 -05:00 |
|
|
Scott LahteineandGitHub
|
a37a605fee
|
Merge pull request #6217 from thinkyhead/rc_fix_invisibles_to_most
Patch .gitattributes till UBL line endings are fixed
|
2017-04-02 12:52:26 -05:00 |
|
|
Scott LahteineandGitHub
|
289e3d6844
|
Merge pull request #6215 from thinkyhead/rc_bed_false_alarm
Fix thermal runaway when nonexistent bed temp is set
|
2017-04-02 11:59:58 -05:00 |
|
|
Scott LahteineandGitHub
|
1c69a155cf
|
Merge pull request #6214 from thinkyhead/rc_bltouch_delay_opt
Configurable delay for BLTouch servo emulation
|
2017-04-02 11:59:34 -05:00 |
|
|
Scott LahteineandGitHub
|
deaad78df9
|
Merge pull request #5678 from Bob-the-Kuhn/G38-optional-double-tap
G38 bug fix, made double touch optional & reverted to Z_MIN_PROBE
|
2017-04-02 10:32:04 -05:00 |
|
|
Scott LahteineandGitHub
|
b3e9977f97
|
Merge pull request #6212 from thinkyhead/rc_gitattributes
Fix LCD preheat menus
|
2017-04-02 09:54:13 -05:00 |
|
|
Scott LahteineandGitHub
|
9faa8c4704
|
Merge pull request #6210 from thinkyhead/rc_gitattributes
Add .gitattributes to normalize line endings
|
2017-04-02 08:56:51 -05:00 |
|
|
Scott LahteineandGitHub
|
883c6762c4
|
Merge pull request #6208 from thinkyhead/rc_parity_with_32bit
Patch MarlinSerial to match up with 32-bit version
|
2017-04-02 05:13:03 -05:00 |
|
|
Scott LahteineandGitHub
|
34b23ff312
|
Merge pull request #6202 from thinkyhead/rc_fix_broken_ubl
Patching up UBL, vetting recent commits
|
2017-04-02 03:51:38 -05:00 |
|
|
Scott LahteineandGitHub
|
a7aa70e79a
|
Merge pull request #6201 from thinkyhead/rc_fix_broken_ubl
Fix broken auto#.g, some other regressions
|
2017-04-01 22:14:04 -05:00 |
|
|
Scott LahteineandGitHub
|
f75aa4d5be
|
Merge pull request #6050 from thinkyhead/rc_probe_manually
Add PROBE_MANUALLY — ABL without a probe
|
2017-03-31 12:27:33 -05:00 |
|
|
Scott LahteineandGitHub
|
541165e878
|
Merge pull request #6181 from thinkyhead/rc_ubl_further_fixes
Further adjustments to UBL code
|
2017-03-31 11:35:02 -05:00 |
|
|
Scott LahteineandGitHub
|
81136c1e82
|
Merge pull request #6177 from thinkyhead/rc_tinyboy
Support for TinyBoy 2 3D printer (and its OLED display)
|
2017-03-31 04:31:47 -05:00 |
|
|
Scott LahteineandGitHub
|
baadb11536
|
Merge pull request #6174 from thinkyhead/rc_ubl_continued
UBL additional cleanup
|
2017-03-31 03:39:50 -05:00 |
|
|
Scott LahteineandGitHub
|
e746d68a12
|
Merge pull request #6176 from thinkyhead/rc_mbl_abl_optimize
Make MBL a static class, use lookup for index-to-point conversion
|
2017-03-31 02:12:49 -05:00 |
|
|
Scott LahteineandGitHub
|
de9d2cddc3
|
Merge pull request #6152 from thinkyhead/rc_cleanup_6150_etc
UBL cleanup, optimization
|
2017-03-30 17:40:29 -05:00 |
|
|
Scott LahteineandGitHub
|
9924199802
|
Merge pull request #5908 from thinkyhead/rc_fix_slowdown
General minor cleanup
|
2017-03-29 21:43:33 -05:00 |
|
|
Scott LahteineandGitHub
|
7ddd94dc61
|
Merge pull request #5994 from StefanBruens/fix_Makefile_errors
Fix makefile errors, cleanup
|
2017-03-29 06:32:08 -05:00 |
|
|
Scott LahteineandGitHub
|
af09095f03
|
Merge pull request #6154 from thinkyhead/rc_fil_sensor_vs_sd
Show Filament Width on LCD when SD is disabled
|
2017-03-29 05:24:48 -05:00 |
|
|
Scott LahteineandGitHub
|
e3459ec178
|
Merge pull request #5989 from MagoKimbra/rc_fix_delta_angles
Fix delta_angles
|
2017-03-29 03:35:18 -05:00 |
|
|
Scott LahteineandGitHub
|
592300922c
|
Merge pull request #6149 from thinkyhead/rc_scara_feedrate
Convert feedrate on SCARA from mm/s to deg/s
|
2017-03-29 03:31:44 -05:00 |
|
|
Scott LahteineandGitHub
|
8d53298a6d
|
Merge pull request #6139 from thinkyhead/rc_a4jp_scoovo
Board A4JP should be SCOOVO_X9H
|
2017-03-28 14:06:39 -05:00 |
|
|
Scott LahteineandGitHub
|
8c07ac7f7c
|
Merge pull request #6133 from thinkyhead/rc_use_safe_delay
Use safe_delay to ensure watchdog reset
|
2017-03-27 00:18:02 -05:00 |
|
|
Scott LahteineandGitHub
|
b47eaf14ae
|
Merge pull request #6109 from thinkyhead/rc_soft_pwm_dither
PWM dithering followup
|
2017-03-24 18:21:07 -05:00 |
|
|
Scott LahteineandGitHub
|
34d1c41b5f
|
Merge pull request #6111 from benlye/benlye-patch-echo_command
Fix type conversion issue with echo_command
|
2017-03-24 17:57:28 -05:00 |
|
|
Scott LahteineandGitHub
|
7d65911c00
|
Merge pull request #6110 from thinkyhead/rc_bilinear_and_m851
Adjust bilinear grid in M851
|
2017-03-24 17:51:25 -05:00 |
|
|
Scott LahteineandGitHub
|
eab7854a73
|
Merge pull request #6074 from thinkyhead/rc_immediate_shove
Immediate commands take precedence
|
2017-03-24 05:52:27 -05:00 |
|
|
Scott LahteineandGitHub
|
5a2abeca78
|
Merge pull request #6100 from thinkyhead/rc_soft_pwm_dither
Enhancement of PWM, with dithering
|
2017-03-24 04:57:40 -05:00 |
|
|
Scott LahteineandGitHub
|
4433b63d7a
|
Merge pull request #6099 from thinkyhead/rc_cleanup_ubl_1
Patch till UBL is integrated with planner-based leveling
|
2017-03-24 02:07:55 -05:00 |
|
|
Scott LahteineandGitHub
|
8f9face956
|
Merge pull request #6088 from rafaljot/patch-3
Update Marlin_main.cpp
|
2017-03-23 01:51:51 -05:00 |
|
|
Scott LahteineandGitHub
|
782634b6c9
|
Merge pull request #6081 from Sebastianv650/MIN_STEPPER_PULSE_for_Babystepping
Add MINIMUM_STEPPER_PULSE ability to babystepping
|
2017-03-22 21:57:36 -05:00 |
|
|
Scott LahteineandGitHub
|
d29ab8f2a6
|
Merge pull request #6075 from thinkyhead/rc_cleanup_ubl_1
Additional cleanup of UBL code
|
2017-03-22 21:45:59 -05:00 |
|
|
Scott LahteineandGitHub
|
100c9bc52d
|
Merge pull request #6079 from thinkyhead/rc_audio_feedback
Standard audio feedback. Use for settings store/load/reset
|
2017-03-22 07:35:57 -05:00 |
|
|
Scott LahteineandGitHub
|
2573f4dd05
|
Merge pull request #6052 from thinkyhead/rc_lift_on_pause
Add PARK_HEAD_ON_PAUSE feature / M125
|
2017-03-20 03:36:31 -05:00 |
|
|
Scott LahteineandGitHub
|
56c9dfc83b
|
Merge pull request #6066 from thinkyhead/rc_felix_fix
Update Felix config for UBL
|
2017-03-19 01:11:02 -05:00 |
|
|
Scott LahteineandGitHub
|
9b2b53f63a
|
Merge pull request #6042 from thinkyhead/rc_fix_toolchange_z
Move Z last in tool-change for SWITCHING_EXTRUDER
|
2017-03-19 00:34:41 -05:00 |
|
|
Scott LahteineandGitHub
|
7cabe81373
|
Merge pull request #6057 from thinkyhead/rc_followup_6054
Followup 6054 with some cleanup
|
2017-03-18 13:49:20 -05:00 |
|
|
Scott LahteineandGitHub
|
4bca27ab89
|
Fix Kelvin conversion
Thanks to @ospalh -- #6056
|
2017-03-18 13:23:08 -05:00 |
|
|
Scott LahteineandGitHub
|
2c630a1b5c
|
Merge pull request #6054 from thinkyhead/rc_ubl_renewal
UBL for RCBugFix — cleanup, rebase, patch
|
2017-03-18 12:07:57 -05:00 |
|
|
Scott LahteineandGitHub
|
0492a3a8f1
|
Merge pull request #6027 from Bob-the-Kuhn/add_kill_info
Message for every KILL and STOP
|
2017-03-18 11:49:35 -05:00 |
|
|
Scott LahteineandGitHub
|
03aa424ccb
|
Merge pull request #6053 from thinkyhead/rc_clean
Remove extraneous whitespace
|
2017-03-18 03:26:45 -05:00 |
|
|
Scott LahteineandGitHub
|
af644871bf
|
Merge pull request #6045 from thinkyhead/rc_remove_raw_kinematics
Remove delta optimization concepts… for now
|
2017-03-18 03:26:24 -05:00 |
|
|
Scott LahteineandGitHub
|
ed4f9d7e1c
|
Merge pull request #6046 from robbycandra/RCBugFix-ignore_visual_studio_files
Ignore Visual Studio Files
|
2017-03-17 22:25:01 -05:00 |
|
|
Scott LahteineandGitHub
|
d15f25539b
|
Merge pull request #6031 from thinkyhead/rc_mbl_z_unhack
MBL: Disable sw endstops instead of altering Z
|
2017-03-17 17:20:35 -05:00 |
|
|
Scott LahteineandGitHub
|
4e53124681
|
Merge pull request #6039 from Bob-the-Kuhn/M114-sync-with-stepper
M114 - wait for move completion before reporting position
|
2017-03-17 05:22:46 -05:00 |
|
|
Scott LahteineandGitHub
|
734f9ea133
|
Merge pull request #6040 from thinkyhead/rc_sanity_use_assert
Simplify some sanity checks with static_assert
|
2017-03-17 05:22:17 -05:00 |
|
|
Scott LahteineandGitHub
|
23f1cfb46f
|
Fix stuck CHDK pin as suggested in #6041
|
2017-03-16 21:49:39 -05:00 |
|
|
Scott LahteineandGitHub
|
0b22069e82
|
Merge pull request #6021 from Bob-the-Kuhn/BUG-FIX--Switching-extruder-tool-change-Z-height
Bug Fix: Switching extruder tool change leaves Z in wrong position
|
2017-03-16 21:15:20 -05:00 |
|
|
Scott LahteineandGitHub
|
51353f8fea
|
Merge pull request #6000 from trivalik/NoWorkspaceWarning
prevent warning with define of NO_WORKSPACE_OFFSETS
|
2017-03-12 00:00:51 -06:00 |
|
|
Scott LahteineandGitHub
|
54dada56a7
|
Merge pull request #6010 from MagoKimbra/rc_fix_bug_set_position_mm
Fix BUG set_position_mm
|
2017-03-12 00:00:16 -06:00 |
|
|
Scott LahteineandGitHub
|
6caf0830ae
|
Merge pull request #5985 from thinkyhead/rc_better_endstops_init
Use SET_INPUT_PULLUP where appropriate
|
2017-03-08 00:08:30 -06:00 |
|
|
Scott LahteineandGitHub
|
deb9d0dabd
|
Merge pull request #5984 from thinkyhead/rc_delta_angles
Add delta_tower_angle_trim
|
2017-03-07 19:41:24 -06:00 |
|
|
Scott LahteineandGitHub
|
7c9e2e2a1a
|
Merge pull request #5981 from thinkyhead/rc_tmc2130_redo
TMC2130 Library: @teemuatlut replaces @makertum
|
2017-03-07 16:23:52 -06:00 |
|
|
Scott LahteineandGitHub
|
33f8a8a344
|
Merge pull request #5973 from thinkyhead/rc_circle_pattern
Add circle pattern to nozzle clean
|
2017-03-06 04:47:01 -06:00 |
|
|
Scott LahteineandGitHub
|
94b3e0a483
|
Merge pull request #5959 from benlye/benlye-fixm48
Remove extra carriage return in M48 V1 output
|
2017-03-06 04:24:28 -06:00 |
|
|
Scott LahteineandGitHub
|
a9a1971295
|
Merge pull request #5972 from thinkyhead/rc_cooldown_before
Fix preheat menu formatting
|
2017-03-06 03:21:29 -06:00 |
|
|
Scott LahteineandGitHub
|
3b75518ef6
|
Merge pull request #5911 from aphex3k/flsun_kossel_mini
Configuration.h and Configuration_adv.h for the kossel mini by flsun
|
2017-03-06 02:26:01 -06:00 |
|
|
Scott LahteineandGitHub
|
2f620f86d9
|
Merge pull request #5970 from thinkyhead/rc_cooldown_before
Preheat Hotend Only menu items
|
2017-03-06 01:56:05 -06:00 |
|
|
Scott LahteineandGitHub
|
02de8e6f18
|
Merge pull request #5957 from MagoKimbra/rc_stepper_indirection_fix
Stepper indirection fix tmc driver
|
2017-03-06 01:16:40 -06:00 |
|
|
Scott LahteineandGitHub
|
c15c65f18a
|
Merge pull request #5971 from thinkyhead/rc_fix_e_factors
Patch DISTINCT_E_FACTORS bug
|
2017-03-06 01:11:17 -06:00 |
|
|
Scott LahteineandGitHub
|
be98016674
|
Merge pull request #5963 from thinkyhead/rc_no_offsets_optim
New option: NO_WORKSPACE_OFFSETS
|
2017-03-05 21:46:49 -06:00 |
|
|
Scott LahteineandGitHub
|
20addc6e32
|
Merge pull request #5955 from thinkyhead/rc_eeprom_fail_better
Display a message for EEPROM version mismatch
|
2017-03-04 17:15:07 -06:00 |
|
|
Scott LahteineandGitHub
|
177ad245f6
|
Merge pull request #5953 from thinkyhead/fix_fc_e_index
Fix submenu hotend status display
|
2017-03-04 00:12:29 -06:00 |
|
|
Scott LahteineandGitHub
|
b27f69ba51
|
Merge pull request #5813 from thinkyhead/rc_fix_makrpanel
Fix MAKRPANEL assignments
|
2017-03-03 21:40:49 -06:00 |
|
|
Scott LahteineandGitHub
|
1ef6ccd919
|
Merge pull request #5951 from thinkyhead/rc_print_2d_array
Reduce code size (40b, or 166b with bilinear subdivision)
|
2017-03-03 21:27:44 -06:00 |
|
|
Scott LahteineandGitHub
|
b9b203bfb2
|
Merge pull request #5950 from thinkyhead/rc_cleanup_mar3
General cleanup, const usage, var naming
|
2017-03-03 21:25:34 -06:00 |
|
|
Scott LahteineandGitHub
|
21fb347eee
|
Merge pull request #5948 from thinkyhead/rc_fix_status_printf
Fix "Heating..." message
|
2017-03-03 12:28:27 -06:00 |
|
|
Scott LahteineandGitHub
|
5065636023
|
Merge pull request #5934 from thinkyhead/rc_advance_ed_ratio
LIN_ADVANCE: Fixed E/D ratio option
|
2017-03-03 03:24:41 -06:00 |
|
|
Scott LahteineandGitHub
|
903808bb97
|
Merge pull request #5943 from thinkyhead/catalan_march_2017
Update Catalan language
|
2017-03-03 03:13:51 -06:00 |
|
|
Scott LahteineandGitHub
|
34253497d4
|
Babysteps code tweak
As suggested by https://github.com/MarlinFirmware/Marlin/pull/5887#issuecomment-283832163
|
2017-03-02 20:35:45 -06:00 |
|
|
Scott LahteineandGitHub
|
e309e980ce
|
Merge pull request #5942 from thinkyhead/rc_cleanup_finish_5887
Clean up and finish #5887
|
2017-03-02 20:26:13 -06:00 |
|
|
Scott LahteineandGitHub
|
eeb490221f
|
Remove BEEPER_PIN override in pins_RIGIDBOARD.h
Resolves #5926. This override is no longer needed since the RAMPS LCD controller pins were fixed.
|
2017-03-01 18:26:29 -06:00 |
|
|
Scott LahteineandGitHub
|
cbeff12f8a
|
Merge pull request #5933 from teemuatlut/lcd_days_hours
Fix formatting of SD print time hours above one day
|
2017-03-01 15:44:10 -06:00 |
|
|
Scott LahteineandGitHub
|
8a4e9d08a3
|
Merge pull request #5931 from thinkyhead/rc_core_endstop_fix
Fix CoreYX / YZ / ZX endstop logic
|
2017-03-01 15:32:11 -06:00 |
|
|
Scott LahteineandGitHub
|
05b217c0d0
|
Merge pull request #5930 from thinkyhead/rc_lcd_timeout_config
Make LCD_TIMEOUT_TO_STATUS configurable
|
2017-02-28 19:42:27 -06:00 |
|
|
Scott LahteineandGitHub
|
493e738575
|
Merge pull request #5910 from thinkyhead/rc_more_nozzle_wipe
Bidirectional Zig-Zag Nozzle Wipe
|
2017-02-25 22:03:33 -06:00 |
|