  Scott LahteineandGitHub
|
f0beae7641
|
Fix stupid, stupid, stupid oversight in G29 update
Mea culpa!
|
2016-09-18 16:24:47 -05:00 |
|
|
Scott LahteineandGitHub
|
127d796420
|
Merge pull request #4837 from thinkyhead/rc_nonlinear_in_planner
Handle nonlinear bed-leveling in Planner
|
2016-09-18 15:31:51 -05:00 |
|
|
Scott LahteineandGitHub
|
2ebfbc4c8d
|
Merge pull request #4836 from thinkyhead/rc_some_comments
Some comments, const args, debug output tweaks
|
2016-09-18 13:38:07 -05:00 |
|
|
Scott LahteineandGitHub
|
48fe2fdc9e
|
Merge pull request #4835 from thinkyhead/rc_abl_non_square_grid
Allow non-square Auto Bed Leveling grid
|
2016-09-18 13:37:43 -05:00 |
|
|
Scott LahteineandGitHub
|
fef959c31a
|
Merge pull request #4834 from thinkyhead/rc_code_bool
Standardize code_value_bool
|
2016-09-18 12:44:20 -05:00 |
|
|
Scott LahteineandGitHub
|
07ac9a1152
|
Merge pull request #4822 from blubbfish/patch-3
Tweak some german language strings
|
2016-09-18 11:38:22 -05:00 |
|
|
Scott LahteineandGitHub
|
20e5140e75
|
Merge pull request #4833 from thinkyhead/rc_no_scara_axis_scaling
Remove SCARA axis_scaling
|
2016-09-18 11:31:50 -05:00 |
|
|
Scott LahteineandGitHub
|
37258956d5
|
Merge pull request #4832 from thinkyhead/rc_fix_M0_M1
Enable M0/M1 with Emergency Parser
|
2016-09-18 11:31:36 -05:00 |
|
|
Scott LahteineandGitHub
|
d41eeb62af
|
Merge pull request #4781 from thinkyhead/rc_final_z_correction
Use simplified Z correction in G29 when possible
|
2016-09-16 15:14:19 -05:00 |
|
|
Scott LahteineandGitHub
|
502150046c
|
Merge pull request #4805 from thinkyhead/rc_config_adjustment
Additional documentation of Configuration.h
|
2016-09-16 15:13:20 -05:00 |
|
|
Scott LahteineandGitHub
|
b08bd84f8e
|
Merge pull request #4806 from blubbfish/patch-2
Update language_de.h
|
2016-09-16 14:39:20 -05:00 |
|
|
Scott LahteineandGitHub
|
939bf1057c
|
Merge pull request #4820 from darrelhunt/RCBugFix
Fixing Pin Definition Files to Define USBCON
|
2016-09-16 14:33:38 -05:00 |
|
|
Scott LahteineandGitHub
|
4ca837b6cf
|
Merge pull request #4815 from tnw513/fix-italian
Added missing translation (Italian)
|
2016-09-15 19:08:28 -05:00 |
|
|
Scott LahteineandGitHub
|
e40646de42
|
Merge pull request #4803 from thinkyhead/rc_lcd_button_fix
Clear LCD button state, apply timer to all
|
2016-09-13 18:03:39 -05:00 |
|
|
Scott LahteineandGitHub
|
2fce217576
|
Merge pull request #4804 from thinkyhead/rc_fix_broken_G29
Fix some regressive typos in G29
|
2016-09-13 17:51:38 -05:00 |
|
|
Scott LahteineandGitHub
|
94d5cf8721
|
Merge pull request #4789 from thinkyhead/rc_better_leveling_etc
Various cleanups ahead of more…
|
2016-09-13 05:21:17 -05:00 |
|
|
Scott LahteineandGitHub
|
0ea7ed6db6
|
Merge pull request #4797 from thinkyhead/rc_runout_comments
Fix comment on FILAMENT_RUNOUT_SENSOR
|
2016-09-13 02:25:26 -05:00 |
|
|
Scott LahteineandGitHub
|
48e14d049a
|
Merge pull request #4710 from thinkyhead/rc_fix_leveling_maths
Bed leveling that accounts for home XYZ
|
2016-09-10 15:47:39 -05:00 |
|
|
Scott LahteineandGitHub
|
416821a71c
|
Merge pull request #4765 from thinkyhead/rc_endstop_direction
Sanitycheck endstop plugs based on homing direction
|
2016-09-10 14:49:50 -05:00 |
|
|
Scott LahteineandGitHub
|
2e8fd70fb1
|
Merge pull request #4779 from thinkyhead/rc_cleanups_1
Minor code cleanup, tweak M109/M190
|
2016-09-10 13:47:05 -05:00 |
|
|
Scott LahteineandGitHub
|
29c4f67a29
|
Additional path - followup to #4743
|
2016-09-07 15:08:12 -05:00 |
|
|
Scott LahteineandGitHub
|
8a8d6e00b7
|
Merge pull request #4756 from thinkyhead/rc_makefilefix
makefile fix for arduino 1.6.9 unzipped
|
2016-09-03 20:24:26 -05:00 |
|
|
Scott LahteineandGitHub
|
6f71bd7372
|
Merge pull request #4754 from thinkyhead/rc_mixing_regression
Unify counter_m and counter_M
|
2016-09-02 12:27:43 -05:00 |
|
|
Scott LahteineandGitHub
|
cbe9ab902c
|
Merge pull request #4747 from thinkyhead/rc_sd_show_percent
Option to show SD percent on Graphical LCD
|
2016-09-02 07:44:42 -05:00 |
|
|
Scott LahteineandGitHub
|
3b2f7ba225
|
Merge pull request #4748 from thinkyhead/rc_sd_print_timer
Patch duration_t toDigital method
|
2016-09-02 04:41:11 -05:00 |
|
|
Scott LahteineandGitHub
|
dad94d2fef
|
Merge pull request #4749 from thinkyhead/rc_minumum_minimum
Fix a misspelling of minimum
|
2016-09-02 04:41:00 -05:00 |
|
|
Scott LahteineandGitHub
|
ad659b5f91
|
Merge pull request #4725 from thinkyhead/rc_log_machine_info
Log machine info in G28 and G29
|
2016-09-01 23:58:59 -05:00 |
|
|
Scott LahteineandGitHub
|
c3caa42630
|
Merge pull request #4738 from thinkyhead/rc_ensure_floats
Optimize stepper ISRs, plus cleanup, shorthand
|
2016-09-01 14:36:22 -05:00 |
|
|
Scott LahteineandGitHub
|
3ff657e729
|
Merge pull request #4727 from thinkyhead/rc_homing_together
Add heading for movement settings
|
2016-09-01 14:26:46 -05:00 |
|
|
Scott LahteineandGitHub
|
6eaf4f4909
|
Fix spacing of debug output in homeaxis
|
2016-08-28 19:43:33 -05:00 |
|
|
Scott LahteineandGitHub
|
1e6d1c39ea
|
Improve verbiage of dropsegments sanity error
|
2016-08-28 19:40:32 -05:00 |
|
|
Scott LahteineandGitHub
|
0729a8f08d
|
Use the probe travel height for pre-probe move
Instead of using the home_bump for Z to move close to the bed before doing a slow probe, use the probe travel height.
|
2016-08-28 19:13:08 -05:00 |
|
|
Scott LahteineandGitHub
|
dd94d0b9d5
|
Fix bed probing bug without PROBE_DOUBLE_TOUCH
If `PROBE_DOUBLE_TOUCH` wasn't enabled, the probe move could be way too short! See #4701 for example.
|
2016-08-28 19:00:25 -05:00 |
|
|
Scott LahteineandGitHub
|
35a0c46f16
|
Tweak debug output for probe in G29
|
2016-08-28 18:44:44 -05:00 |
|
|
Scott LahteineandGitHub
|
a82a89bc58
|
Merge pull request #4722 from thinkyhead/rc_minimum_stepper_pulse
MINIMUM_STEPPER_PULSE option
|
2016-08-28 10:03:32 -05:00 |
|
|
Scott LahteineandGitHub
|
73c5c312c9
|
Merge pull request #4723 from thinkyhead/rc_fix_some_text
Fix Danish encoding and an error message
|
2016-08-28 10:02:46 -05:00 |
|
|
Scott LahteineandGitHub
|
2cb63f0bf7
|
Merge pull request #4719 from thinkyhead/rc_delta_homing_patch
Marlin patches for homing, esp. Delta
|
2016-08-27 20:46:50 -05:00 |
|
|
Scott LahteineandGitHub
|
8241cf9901
|
Merge pull request #4720 from thinkyhead/rc_allow_stepper_omission
Patch stepper.cpp to allow omitting steppers
|
2016-08-27 20:36:22 -05:00 |
|
|
Scott LahteineandGitHub
|
7e893f4309
|
Merge pull request #4721 from thinkyhead/rc_temperature_isr_comments
Rc temperature isr comments
|
2016-08-27 20:36:03 -05:00 |
|
|
Scott LahteineandGitHub
|
338bc768b1
|
Merge pull request #4717 from thinkyhead/rc_log_the_probe
Debug logging of nozzle type and offsets
|
2016-08-27 20:24:19 -05:00 |
|
|
Scott LahteineandGitHub
|
fae92e3f3c
|
Merge pull request #4718 from thinkyhead/rc_twibus_patch_20160827
TWIBus patch for proper use of Wire.requestFrom
|
2016-08-27 20:22:53 -05:00 |
|
|
Scott LahteineandGitHub
|
d641344d3a
|
Remove redundant probe offset in homing
|
2016-08-27 19:58:56 -05:00 |
|
|
Scott LahteineandGitHub
|
fb19a3cdec
|
Merge pull request #4649 from thinkyhead/rc_boelle_danish_update
Danish update (18 Aug 2016)
|
2016-08-27 19:06:05 -05:00 |
|
|
Scott LahteineandGitHub
|
8e9ac72191
|
Merge pull request #4709 from thinkyhead/rc_log_the_reason
Log whether homing with probe or endstop
|
2016-08-26 17:05:55 -05:00 |
|
|
Scott LahteineandGitHub
|
3b93b79f5c
|
Merge pull request #4703 from bgort/RCBugFix
Add note suggesting RAMBo users use the RAMBo board type or platformio environment
|
2016-08-26 14:53:56 -05:00 |
|
|
Scott LahteineandGitHub
|
0c892357a7
|
Merge pull request #4693 from thinkyhead/rc_pins_cleanup_aug23
Cleanup of pins files, Conditionals
|
2016-08-25 21:35:36 -05:00 |
|
|
Scott LahteineandGitHub
|
2c3de5ee46
|
Merge pull request #4691 from esenapaj/Suppress-warnings
Suppress warnings
|
2016-08-24 21:35:18 -05:00 |
|
|
Scott LahteineandGitHub
|
37ac540a26
|
Fix unsigned/signed comparison in fanPin loop
|
2016-08-24 21:34:30 -05:00 |
|
|
Scott LahteineandGitHub
|
d07d85ac9f
|
Ensure probe points at the delta edge are kept
|
2016-08-23 05:09:56 -05:00 |
|
|
Scott LahteineandGitHub
|
13e337ac4b
|
Merge pull request #4688 from AnHardt/crittical_section
Repair MarlinSerial with TX-buffer
|
2016-08-23 03:31:12 -05:00 |
|
|
Scott LahteineandGitHub
|
6b274e563d
|
Merge pull request #4685 from thinkyhead/rc_gege2b_french
Update french language
|
2016-08-22 14:20:54 -05:00 |
|
|
Scott LahteineandGitHub
|
d8f4f263e0
|
Merge pull request #4673 from thinkyhead/rc_segments_steps_move
MIN_SEGMENTS_FOR_MOVE => MIN_STEPS_PER_SEGMENT
|
2016-08-21 09:34:06 -05:00 |
|
|
Scott LahteineandGitHub
|
27b80b1dd1
|
Merge pull request #4667 from thinkyhead/rc_M211_sw_endstop_switch
M211: Enable/Disable Software Endstops
|
2016-08-21 06:44:00 -05:00 |
|
|
Scott LahteineandGitHub
|
f9e3347d6f
|
Merge pull request #4669 from thinkyhead/rc_config_descriptions
PREVENT_DANGEROUS_EXTRUDE => PREVENT_COLD_EXTRUSION
|
2016-08-21 06:41:57 -05:00 |
|
|
Scott LahteineandGitHub
|
a1f6cf1e5d
|
Merge pull request #4665 from thinkyhead/rc_lcd_not_ultipanel
Clean up ultralcd code, dependencies on ULTIPANEL
|
2016-08-20 22:43:17 -05:00 |
|
|
Scott LahteineandGitHub
|
1a255afa36
|
Merge pull request #4666 from thinkyhead/rc_dropsegments_adj
dropsegments => MIN_SEGMENTS_FOR_MOVE
|
2016-08-20 22:42:16 -05:00 |
|
|
Scott LahteineandGitHub
|
394c80c87b
|
Merge pull request #4655 from thinkyhead/rc_serial_static
Optimize, reduce size of MarlinSerial
|
2016-08-20 15:51:57 -05:00 |
|
|
Scott LahteineandGitHub
|
b15f8ca641
|
Merge pull request #4660 from MagoKimbra/Fix_Zig_Zag
Fix_Zig_Zag
|
2016-08-20 15:44:25 -05:00 |
|
|
Scott LahteineandGitHub
|
4d4c00d69c
|
Merge pull request #4651 from thinkyhead/rc_homing_vs_leveling_z
Improvements to homing / leveling
|
2016-08-19 15:45:49 -05:00 |
|
|
Scott LahteineandGitHub
|
f3a54316e6
|
Merge pull request #4652 from bgort/RCBugFix
Add Rambo support/env to platformio.ini; properly maps extended pins
|
2016-08-19 09:30:59 -05:00 |
|
|
Scott LahteineandGitHub
|
733453569b
|
Merge pull request #4650 from thinkyhead/rc_percent_is_percent
extruder_multiplier => flow_percentage
|
2016-08-19 04:38:18 -05:00 |
|
|
Scott LahteineandGitHub
|
6970c24ee6
|
Merge pull request #4642 from zenmetsu/ru-Lang
Ru lang updated
|
2016-08-18 17:11:46 -05:00 |
|
|
Scott LahteineandGitHub
|
464d594450
|
Merge pull request #4608 from thinkyhead/rc_more_twibus_tweaks
Additional details for I2C_SLAVE_ADDRESS
|
2016-08-15 19:37:03 -07:00 |
|
|
Scott LahteineandGitHub
|
7427290d3a
|
Merge pull request #4634 from thinkyhead/rc_lang_disp_char
Set language display charset in language.h
|
2016-08-15 19:25:56 -07:00 |
|
|
Scott LahteineandGitHub
|
165d7abb1b
|
Merge pull request #4625 from thinkyhead/rc_i2c_request_capture_flush
Add request, capture, flush to TWIBus
|
2016-08-15 18:15:43 -07:00 |
|
|
Scott LahteineandGitHub
|
0e6b41a34a
|
Merge pull request #4624 from RicardoGA/RCBugFix
Update Spanish Lenguage
|
2016-08-15 18:15:23 -07:00 |
|
|
Scott LahteineandGitHub
|
132322e4d9
|
Fix #4614: currentScreen only defined with ULTIPANEL
|
2016-08-14 00:29:46 -07:00 |
|
|
Scott LahteineandGitHub
|
dcd26b0403
|
Merge pull request #4621 from thinkyhead/rc_fan_set_output
Init PWM-able AUTO_FAN pins with SET_OUTPUT
|
2016-08-13 21:22:27 -07:00 |
|
|
Scott LahteineandGitHub
|
79ba983782
|
Allow reply() to use const string with no warning
|
2016-08-13 21:05:44 -07:00 |
|
|
Scott LahteineandGitHub
|
27570c08ba
|
Merge pull request #4620 from thinkyhead/rc_twibus_further
Further refinements of TWIBus
|
2016-08-13 20:56:09 -07:00 |
|
|
Scott LahteineandGitHub
|
38fa1b1939
|
Merge pull request #4196 from cimbalo/Platformio_support
Add working PlatformIO support
|
2016-08-12 17:32:09 -07:00 |
|
|
Scott LahteineandGitHub
|
d7edc039af
|
Merge pull request #4605 from thinkyhead/rc_3drag_fan_is_8
Fixup 3DRAG pins based on updated RAMPS pins
|
2016-08-12 17:30:27 -07:00 |
|
|
Scott LahteineandGitHub
|
7147c86e9f
|
Merge pull request #4611 from tnw513/patch-2
Fix acceleration and feedrate following bq/Marlin
|
2016-08-12 17:30:02 -07:00 |
|
|
Scott LahteineandGitHub
|
405afec393
|
Include decimeters in filamentUsed display
|
2016-08-12 05:16:43 -07:00 |
|
|
Scott LahteineandGitHub
|
fef0e8ba86
|
Merge pull request #4610 from thinkyhead/rc_sd_pause_and_stop
Fix stopSDPrint so it works when paused
|
2016-08-12 04:09:22 -07:00 |
|
|
Scott LahteineandGitHub
|
9e5d5a3b7c
|
Merge pull request #4597 from tnw513/italian_fix
Added hyphenated strings for full graphic display
|
2016-08-12 02:37:53 -07:00 |
|
|
Scott LahteineandGitHub
|
11027a56b6
|
Merge pull request #4606 from thinkyhead/rc_more_i2c_slave
Add an i2c request handler
|
2016-08-11 23:51:56 -07:00 |
|
|
Scott LahteineandGitHub
|
d29a64d4b3
|
Merge pull request #4603 from thinkyhead/rc_less_MSG_MOVE
Strip never-translated strings from language files
|
2016-08-11 14:21:58 -07:00 |
|
|
Scott LahteineandGitHub
|
d6a7ca6553
|
Merge pull request #4584 from thinkyhead/rc_delta_cal_more
Use configured feedrates, center in DELTA_CALIBRATION_MENU
|
2016-08-11 14:04:05 -07:00 |
|
|
Scott LahteineandGitHub
|
64f15ac451
|
Merge pull request #4602 from thinkyhead/rc_marlinserial_clean
Minor cleanup of SdFatUtil.h, MarlinSerial.cpp
|
2016-08-11 13:42:16 -07:00 |
|
|
Scott LahteineandGitHub
|
52560e257f
|
Merge pull request #4595 from thinkyhead/rc_i2c_slave
Add support for i2c slave address
|
2016-08-11 12:39:26 -07:00 |
|
|
Scott LahteineandGitHub
|
30afac64c4
|
Merge pull request #4594 from thinkyhead/rc_fix_serial_output
Fix serial output for MBL, M303
|
2016-08-11 00:05:30 -07:00 |
|
|
Scott LahteineandGitHub
|
58c8e6cef2
|
Fixes #4576: Convert filamentUsed to long for display
|
2016-08-09 23:57:28 -07:00 |
|
|
Scott LahteineandGitHub
|
01f1f779a5
|
Followup to #4574, specify L for long
|
2016-08-09 23:43:37 -07:00 |
|
|
Scott LahteineandGitHub
|
fa2467a834
|
Merge pull request #4578 from Kaibob2/patch-2
Update language_de.h with MSG_MOVE_E1 - E4
|
2016-08-09 23:04:15 -07:00 |
|
|
Scott LahteineandGitHub
|
bd8ea21abe
|
Merge pull request #4574 from thinkyhead/rc_graphical_days
Include days in Graphical LCD print timer
|
2016-08-08 23:53:31 -07:00 |
|
|
Scott LahteineandGitHub
|
f4ac8c15e3
|
Merge pull request #4573 from thinkyhead/rc_mintemp_bed_later
Throw MINTEMP BED error only if heating
|
2016-08-08 23:02:42 -07:00 |
|
|
Scott LahteineandGitHub
|
1f15f0df5f
|
Merge pull request #4572 from thinkyhead/rc_digital_clock_100h
Show up to 99:59 in digital time
|
2016-08-08 22:28:29 -07:00 |
|
|
Scott LahteineandGitHub
|
b772172c84
|
Merge pull request #4571 from thinkyhead/rc_proper_delta_calibration
Patch command order in delta calibration menu
|
2016-08-08 21:50:42 -07:00 |
|
|
Scott LahteineandGitHub
|
9afa060ed6
|
Merge pull request #4570 from thinkyhead/rc_proper_delta_calibration
Make DELTA_CALIBRATION_MENU more universal
|
2016-08-08 21:11:40 -07:00 |
|
|
Scott LahteineandGitHub
|
46c8862635
|
Merge pull request #4564 from AnHardt/max-spi-setup
MISO is an input
|
2016-08-08 21:01:15 -07:00 |
|
|
Scott LahteineandGitHub
|
dad4702e85
|
Merge pull request #4569 from thinkyhead/rc_disable_slowdown_on_delta
Always disable SLOWDOWN for DELTA/SCARA
|
2016-08-08 20:58:40 -07:00 |
|
|
Scott LahteineandGitHub
|
67c4acf750
|
Merge pull request #4562 from thinkyhead/rc_fix_z_dual_endstops
Fix Z_DUAL_ENDSTOPS with Z MIN Homing
|
2016-08-07 19:23:09 -07:00 |
|
|
Scott LahteineandGitHub
|
1edbea0fcb
|
Merge pull request #4563 from thinkyhead/rc_explain_probe_heights
Explain that Z_PROBE_*_HEIGHT options are nozzle-relative
|
2016-08-07 19:22:19 -07:00 |
|
|
Scott LahteineandGitHub
|
fc11f05c11
|
Merge pull request #4556 from thinkyhead/rc_all_feedrates_mm_s
Within Marlin, maintain most feed rates in mm/s
|
2016-08-07 16:14:16 -07:00 |
|
|
Scott LahteineandGitHub
|
ed0b50ebee
|
Merge pull request #4555 from thinkyhead/rc_mbl_index_rounding
Remove premature int-cast from MBL cell index methods
|
2016-08-06 23:34:01 -07:00 |
|
|
Scott LahteineandGitHub
|
cffe77c537
|
Merge pull request #4553 from thinkyhead/rc_lcd_chars_save_ram
Save bytes for custom chars (Hitachi LCD)
|
2016-08-06 18:29:16 -07:00 |
|
|
Scott LahteineandGitHub
|
0a1a2fea30
|
Merge pull request #4554 from thinkyhead/rc_anhardt_rep-max6675
Repair SPI-pins, some other pins
|
2016-08-06 18:10:55 -07:00 |
|
|
Scott LahteineandGitHub
|
7145bd085d
|
Merge pull request #4551 from thinkyhead/rc_anhardt_rep_stow_allen
Make Allen Key Probe stow
|
2016-08-06 16:31:51 -07:00 |
|
|
Scott LahteineandGitHub
|
5347f39fce
|
Merge pull request #4542 from AnHardt/rep-de
Repair-language.de
|
2016-08-05 23:50:35 -07:00 |
|