Commit Graph
100 Commits
Author SHA1 Message Date
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
Scott LahteineandGitHub 5ef4a5577c Merge pull request #4537 from thinkyhead/rc_fix_some_flaws
Patch up some flaws here and there
2016-08-05 23:49:57 -07:00
Scott LahteineandGitHub 3a3984e67a Merge pull request #4535 from thinkyhead/rc_old_symbols_first
Move tests for old symbols to the top of sanity check
2016-08-04 21:24:02 -07:00
Scott LahteineandGitHub 479107d04f Merge pull request #4530 from Kaibob2/patch-1
Added / Update language_de.h
2016-08-04 16:58:50 -07:00
Scott LahteineandGitHub dddaeb3f8c Merge pull request #4528 from thinkyhead/rc_make_it_so
Z-Height options replace Z-Raise options
2016-08-04 13:46:44 -07:00
Scott LahteineandGitHub 4cf66cfa62 Merge pull request #4522 from rafacouto/RCBugFix
Update of Galician language
2016-08-03 14:41:33 -07:00
Scott LahteineandGitHub bd7a96ed42 Merge pull request #4517 from thinkyhead/rc_min_probe_pin
Define Z_MIN_PROBE_PIN always, allowing override
2016-08-02 21:35:59 -07:00
Scott LahteineandGitHub 704ae1b737 Merge pull request #4516 from thinkyhead/rc_short_prints_quiet
Only report finished prints longer than 1 min
2016-08-02 21:14:30 -07:00
Scott LahteineandGitHub 7ed70305df Merge pull request #4515 from thinkyhead/rc_fix_speaker_tone
Prevent the 'tone(f,d)' function from being interrupted
2016-08-02 21:13:47 -07:00
Scott LahteineandGitHub e040e00ae9 Merge pull request #4514 from thinkyhead/rc_cleanup_circularqueue
Patch up CircularQueue
2016-08-02 19:42:38 -07:00
Scott LahteineandGitHub 52b6b8e36b Merge pull request #4512 from thinkyhead/rc_encoder_flex
Improved SCREEN / MENU macros
2016-08-02 18:59:42 -07:00
Scott LahteineandGitHub cebeb48005 Merge pull request #4511 from thinkyhead/rc_encoder_flex
Allow encoder pulse/step override for more LCDs
2016-08-02 16:50:50 -07:00
Scott LahteineandGitHub 58749cae94 Merge pull request #4510 from thinkyhead/rc_buzzer_needs_beeper
Patch for COREYZ, tweak to scaled feedrate macro
2016-08-02 15:55:06 -07:00
Scott LahteineandGitHub 0f030aface Merge pull request #4503 from AnHardt/fix-retract
Correct typo in retract()
2016-08-02 15:04:55 -07:00
Scott LahteineandGitHub fbd8f06951 Merge pull request #4506 from thinkyhead/rc_buzzer_needs_beeper
Buzzer requires BEEPER_PIN
2016-08-02 14:40:43 -07:00
Scott LahteineandGitHub 7cceb15925 Merge pull request #4505 from thinkyhead/rc_auto_select_dplugs
Auto-select power plugs for RAMPS derivatives
2016-08-02 12:56:52 -07:00
Scott LahteineandGitHub 1967e4216e Merge pull request #4504 from AnHardt/fix-baybystepping
Fix babystepping dependency
2016-08-02 12:46:50 -07:00
Scott LahteineandGitHub 34c60f1b55 Merge pull request #4491 from thinkyhead/rc_fix_lcd_move_e
Use a default argument in _lcd_move_e
2016-08-01 16:45:25 -07:00
Scott LahteineandGitHub 7594138740 Merge pull request #4493 from jbrazio/buildroot-cleanup
Move font folder
2016-08-01 15:57:23 -07:00
Scott LahteineandGitHub 6eed37aafb Merge pull request #4486 from thinkyhead/rc_pid_add_extrusion_rate_off
PID_EXTRUSION_SCALING, disabled by default
2016-07-31 18:23:51 -07:00
Scott LahteineandGitHub 4bf3526d00 Merge pull request #4463 from thinkyhead/rc_azteeg_x3_eeb
Wrangle RAMPS variants and derivatives
2016-07-31 18:22:49 -07:00
Scott LahteineandGitHub 1993c45759 Merge pull request #4487 from thinkyhead/rc_refresh_pos_fix
Update refresh_positioning - no need for obj ref
2016-07-31 18:22:38 -07:00
Scott LahteineandGitHub f7da37002c Merge pull request #4482 from AnHardt/rep-s-spi
repair-software-spi
2016-07-31 15:25:44 -07:00
Scott LahteineandGitHub f388beafa1 Merge pull request #4476 from otvald/RCBugFix
FIX for endstop adjustemt on delta is offset
2016-07-31 01:09:54 -07:00
Scott LahteineandGitHub 3633d4978b Merge pull request #4475 from esenapaj/Fix-for-PR-#4452
Fix for PR #4452 (Additional heater-state output changes)
2016-07-31 01:08:27 -07:00
Scott LahteineandGitHub 448e5252c3 Merge pull request #4474 from esenapaj/Update-distribution-date-and-readme
Update distribution date and readme
2016-07-31 01:07:43 -07:00
Scott LahteineandGitHub f575e92f2e Merge pull request #4473 from esenapaj/Follow-up-the-PR-#4408-etc
Follow-up the PR #4408 (Add support for reprapworld LCD), etc
2016-07-30 04:45:27 -07:00
Scott LahteineandGitHub a406b176b0 Merge pull request #4472 from thinkyhead/rc_old_conditional
Make Conditionals.h a catch-all for old configs
2016-07-30 04:34:43 -07:00
Scott LahteineandGitHub bfbd01e29a Merge pull request #4470 from thinkyhead/rc_fix_manual_move
Followup to #4468
2016-07-30 04:17:05 -07:00
Scott LahteineandGitHub 802d873fc1 Merge pull request #4469 from esenapaj/Fix-for-PR-#4453
Fix for PR #4453 (Improved MANUAL_[XYZ]_HOME_POS)
2016-07-30 04:08:54 -07:00
Scott LahteineandGitHub 8e2f095dde Merge pull request #4456 from jbrazio/speaker-type3
Improvement to non-blocking speaker
2016-07-30 04:07:08 -07:00
Scott LahteineandGitHub 2f76138645 Merge pull request #4468 from thinkyhead/rc_fix_manual_move
Specify manual-movable E axes by extruder type
2016-07-30 03:21:43 -07:00
Scott LahteineandGitHub 46c33f1cfa Merge pull request #4467 from jbrazio/safe_delay-millis_t
Makes safe_delay() to be fully compatible with delay()
2016-07-29 20:23:44 -07:00
Scott LahteineandGitHub 9e21b2e51d Merge pull request #4455 from AnHardt/double-bump-feature
double bump probing as a feature
2016-07-29 20:00:10 -07:00
Scott LahteineandGitHub db4d03bc81 Merge pull request #4452 from thinkyhead/rc_fix_heaterstates_part_2
Additional heater-state output changes
2016-07-29 19:58:00 -07:00
Scott LahteineandGitHub c68ca95345 Merge pull request #4464 from thinkyhead/rc_fix_steps_per_mm_handling
Account for DELTA in Planner::refresh_positioning
2016-07-29 19:34:59 -07:00
Scott LahteineandGitHub c677d2ac56 Merge pull request #4453 from thinkyhead/rc_better_manual_home
Improved MANUAL_[XYZ]_HOME_POS
2016-07-28 20:09:33 -07:00