Commit Graph
100 Commits
Author SHA1 Message Date
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
Scott LahteineandGitHub 1734de4d4e Merge pull request #4447 from thinkyhead/rc_fix_heaterstates
Fix output of heater states
2016-07-28 17:51:11 -07:00
Scott LahteineandGitHub 9083e5420a Merge pull request #4419 from AnHardt/sd2pinmap
Switch Sd2CardLib to fastio
2016-07-28 17:38:46 -07:00
Scott LahteineandGitHub 6f59560526 Merge pull request #4448 from jbrazio/speaker-followup
A little cleanup at speaker.h
2016-07-28 17:37:36 -07:00
Scott LahteineandGitHub 5d8d18d03d Merge pull request #4451 from thinkyhead/rc_arduino_160_minimum
Prevent compiling with old Arduino sooner
2016-07-28 17:37:10 -07:00
Scott LahteineandGitHub 256b03598d Merge pull request #4450 from thinkyhead/rc_fix_delta_optimization
Fix DELTA speed calculation
2016-07-28 16:50:04 -07:00
Scott LahteineandGitHub ae1c7bca1b Merge pull request #4445 from thinkyhead/rc_fix_rdfgsc_mega3
Fix for R.D.F.G.S.C. with MEGATRONICS 3 board
2016-07-28 15:55:30 -07:00
Scott LahteineandGitHub 5367d56f87 Merge pull request #4434 from thinkyhead/rc_delta_safe_homing
DELTA should ignore Z_SAFE_HOMING
2016-07-27 23:41:52 -07:00
Scott LahteineandGitHub dc3d2b50cd Merge pull request #4426 from thinkyhead/rc_probeless_safe_homing
Allow Z_SAFE_HOMING without a probe
2016-07-27 05:12:33 -07:00
Scott LahteineandGitHub 9f1dd6d431 Merge pull request #4420 from thinkyhead/rc_allow_no_deploy_raise
Allow zero raise for deploy/stow
2016-07-26 17:21:51 -07:00
Scott LahteineandGitHub 54084612fd Merge pull request #4415 from petrzjunior/transl
[LANGUAGE] Update Czech (Info screen strings)
2016-07-26 13:20:20 -07:00
Scott LahteineandGitHub 5597400cda Merge pull request #4414 from thinkyhead/rc_split_conditionals
Split up Conditionals.h into two files
2016-07-26 13:16:52 -07:00
Scott LahteineandGitHub 24ee50f4d9 Merge pull request #4417 from thinkyhead/rc_remove_old_lang
Remove MSG_PRINT_TIME from languages
2016-07-26 13:01:35 -07:00
Scott LahteineandGitHub 8684570f68 Merge pull request #4412 from thinkyhead/rc_followup_4402
Followup #4402 fixing 3-point leveling
2016-07-25 16:10:50 -07:00
Scott LahteineandGitHub c55b7d0750 Merge pull request #4405 from thinkyhead/rc_theres_always_something
Move HAS_DIGIPOTSS to Conditionals.h
2016-07-25 15:58:42 -07:00
Scott LahteineandGitHub 42eebcd518 Merge pull request #4409 from thinkyhead/rc_cleanup_comment
Clean up Transfer Buffer Size comment
2016-07-25 15:58:34 -07:00
Scott LahteineandGitHub 7e37c20839 Merge pull request #4408 from thinkyhead/rc_reprapworld_lcd
Add support for reprapworld LCD
2016-07-25 12:37:58 -07:00
Scott LahteineandGitHub 54f4f80077 Merge pull request #4404 from thinkyhead/rc_better_stepper_indirection
Arrange stepper_indirection by axis
2016-07-24 19:26:39 -07:00
Scott LahteineandGitHub 169c21b477 Merge pull request #4402 from thinkyhead/rc_consistent_positioning
Account for coordinate space offsets
2016-07-24 19:23:20 -07:00
Scott LahteineandGitHub 7c27f34996 Merge pull request #4397 from thinkyhead/rc_tweak_eeprom
Neaten up EEPROM read/write functions
2016-07-24 18:45:54 -07:00
Scott LahteineandGitHub b7b7c90477 Merge pull request #4389 from thinkyhead/rc_optimize_planner
Optimize planner with precalculation, etc.
2016-07-24 17:48:23 -07:00
Scott LahteineandGitHub 6900bb2286 Merge pull request #4395 from tnw513/italian_fix
Update Italian translations. Remove trailing spaces.
2016-07-24 17:47:48 -07:00
Scott LahteineandGitHub 1fe60b723f Merge pull request #4400 from thinkyhead/rc_sanity_check_temp_sensor
Sanity check for too many temp sensors
2016-07-24 15:38:41 -07:00
Scott LahteineandGitHub 2839c56f5a Merge pull request #4390 from jbrazio/duration_t
Renamed timestamp_t to duration_t
2016-07-24 13:24:05 -07:00
Scott LahteineandGitHub 450fe8134d Merge pull request #4398 from thinkyhead/rc_z_safe_sanity
Sanity checks for Z_SAFE_HOMING
2016-07-24 12:21:10 -07:00
Scott LahteineandGitHub c287846f46 Merge pull request #4387 from thinkyhead/rc_anhardt_more_4370
Update Z in a unified way in run_z_probe
2016-07-23 16:47:10 -07:00
Scott LahteineandGitHub 22d0654fe6 Merge pull request #4382 from esenapaj/Update-Japanese-translation
Update Japanese translation
2016-07-23 16:31:38 -07:00
Scott LahteineandGitHub a3b5d5eb65 Merge pull request #4383 from esenapaj/Follow-up-the-PR-#4353
Follow-up the PR #4353 (General cleanup: enum)
2016-07-23 12:17:45 -07:00
Scott LahteineandGitHub 5167cb424a Merge pull request #4381 from thinkyhead/rc_blocking_move_logging
Banish do_blocking_move_to_axis_pos
2016-07-23 01:33:17 -07:00
Scott LahteineandGitHub 13387ac302 Merge pull request #4380 from esenapaj/Fix-the-PR-#4379
Fix for the PR #4379 (Additional logging of do_blocking_move_to)
2016-07-23 00:43:01 -07:00
Scott LahteineandGitHub 8099ee51a5 Merge pull request #4379 from thinkyhead/rc_blocking_move_logging
Additional logging of do_blocking_move_to
2016-07-23 00:10:55 -07:00
Scott LahteineandGitHub 8633b644cf Merge pull request #4378 from thinkyhead/rc_debug_leveling_docs
Document DEBUG_LEVELING_FEATURE
2016-07-22 23:57:01 -07:00
Scott LahteineandGitHub 652fd8a826 Merge pull request #4362 from thinkyhead/rc_duplication_mode
DUAL_NOZZLE_DUPLICATION_MODE
2016-07-22 21:17:59 -07:00
Scott LahteineandGitHub 1766b990b8 Merge pull request #4376 from jbrazio/timestamp_t-short
Adds short format to timestamp_t
2016-07-22 21:17:17 -07:00
Scott LahteineandGitHub 6da3729531 Merge pull request #4370 from thinkyhead/rc_delta_fwd_kinematics
Delta Forward Kinematics (and LOGICAL_POSITION)
2016-07-22 21:16:00 -07:00
Scott LahteineandGitHub 179e091473 Merge pull request #4374 from thinkyhead/rc_jbrazio_timestamp_t
Implements timestamp_t structure
2016-07-22 16:08:10 -07:00
Scott LahteineandGitHub 0b2c608d2f Merge pull request #4372 from jbrazio/gcc-bark
Fix minor gcc warning
2016-07-22 15:18:53 -07:00
Scott LahteineandGitHub 5655f8b331 Merge pull request #4373 from thinkyhead/rc_homing_leveling_wtf
Fix, cleanup DELTA G28 / G29 support functions
2016-07-22 14:34:23 -07:00