melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 71a7408012 Merge pull request #4106 from thinkyhead/rc_temp_compile_err Scott Lahteine 2016-06-21 02:48:46 -07:00
  • 5e469622c9 Merge pull request #4105 from thinkyhead/rc_combine_probe_blocks Scott Lahteine 2016-06-21 02:14:38 -07:00
  • dcb8ec32ee Fix compile error with watch_bed_next_ms Scott Lahteine 2016-06-21 02:13:41 -07:00
  • 3996242e9d Allow Z_MIN_PROBE_REPEATABILITY_TEST solo Scott Lahteine 2016-06-21 01:28:36 -07:00
  • 26a9cd0b08 Move run_z_probe to earlier block Scott Lahteine 2016-06-21 01:25:23 -07:00
  • 7f8a2025af Move raise_z_after_probing into earlier block Scott Lahteine 2016-06-21 01:02:01 -07:00
  • 71534dc11f Merge pull request #4100 from thinkyhead/rc_z_deploy Scott Lahteine 2016-06-21 00:40:48 -07:00
  • 6563b07879 Test for mechanical and fix mounted probes Scott Lahteine 2016-06-20 14:56:16 -07:00
  • 2530371516 Always disable probe at the end of G29 Scott Lahteine 2016-06-20 16:40:28 -07:00
  • 6aba98e470 Comment on setup_for_endstop_move Scott Lahteine 2016-06-20 16:18:41 -07:00
  • 04e88d008e Clear up ordering in G30 Scott Lahteine 2016-06-20 16:18:30 -07:00
  • ed75b0ea11 Make clean_up function available for probes Scott Lahteine 2016-06-20 16:21:43 -07:00
  • 51d52cb52a Make run_z_probe available for any bed probe Scott Lahteine 2016-06-20 16:02:27 -07:00
  • f6b09cf465 Always use deploy/stow for dock_sled Scott Lahteine 2016-06-20 15:50:51 -07:00
  • 3b457c2dd3 Use deploy/stow with FIX_MOUNTED_PROBE too Scott Lahteine 2016-06-20 14:31:01 -07:00
  • 524f6d9bd6 Merge pull request #4096 from thinkyhead/rc_always_raise_servo Scott Lahteine 2016-06-19 20:40:06 -07:00
  • 7e9d4a68d4 Always raise Z (if needed) for servo deploy/stow Scott Lahteine 2016-06-12 15:15:37 -07:00
  • 9beb3f2f5e Merge pull request #4097 from thinkyhead/rc_fil_runout_cleanup Scott Lahteine 2016-06-19 19:46:14 -07:00
  • f215b30932 Merge pull request #4093 from thinkyhead/rc_probe_without_abl Scott Lahteine 2016-06-19 19:44:25 -07:00
  • 2fd2301928 FILRUNOUT => FIL_RUNOUT Scott Lahteine 2016-06-19 19:25:09 -07:00
  • dfbf8b3c2c FIL_RUNOUT_INVERTING false by default Scott Lahteine 2016-06-19 19:24:59 -07:00
  • 7b5cd314a5 Merge pull request #4095 from thinkyhead/rc_fil_runout_cleanup Scott Lahteine 2016-06-19 18:48:18 -07:00
  • 42ccb5b0df Travis test a servo probe without ABL Scott Lahteine 2016-06-19 17:48:26 -07:00
  • de12228758 Make Z Probe options independent of ABL Scott Lahteine 2016-06-14 18:03:17 -07:00
  • add0032820 Improve FILAMENT_RUNOUT_SENSOR, FILRUNOUT_PIN Scott Lahteine 2016-06-19 18:05:57 -07:00
  • 15a5eeb740 Merge pull request #4094 from thinkyhead/rc_cartesio_config Scott Lahteine 2016-06-19 17:43:25 -07:00
  • f8c278ce4d Cartesio UI display option in all configs Scott Lahteine 2016-06-19 17:39:46 -07:00
  • 43ec24158e Merge pull request #4092 from thinkyhead/rc_sd_error Scott Lahteine 2016-06-19 17:30:29 -07:00
  • 400e13d136 Output a message for SD read errors Scott Lahteine 2016-06-19 17:14:56 -07:00
  • 96b8bcca84 Merge pull request #4081 from thinkyhead/rc_tweaky_m48_tweaks Roxy-3D 2016-06-18 22:21:16 -05:00
  • b7e3c1bbc4 Tweak M48 output conditions Scott Lahteine 2016-06-18 15:38:15 -07:00
  • b714fb644c Merge pull request #4085 from thinkyhead/rc_fix_M851 Scott Lahteine 2016-06-18 15:42:52 -07:00
  • 1dad912b03 Adjust M48 raise / move handling Scott Lahteine 2016-06-18 03:16:13 -07:00
  • 46d3ef2223 Simplify sample_set probe_pt call in M48 Scott Lahteine 2016-06-18 03:15:49 -07:00
  • a647b05f82 Shrink some debug code in G28 Scott Lahteine 2016-06-18 03:13:34 -07:00
  • 4edf813bde Just-in-time declaration style in M48 Scott Lahteine 2016-06-18 01:41:57 -07:00
  • c475291e19 Fix M851 Juan Ricardo Gomez Anaya 2016-06-18 15:58:42 -05:00
  • e35583888c Merge pull request #4082 from esenapaj/Follow-up-the-PR-#4065 Scott Lahteine 2016-06-18 03:31:12 -07:00
  • 6dff52d920 Merge pull request #4078 from RicardoGA/Language_Spanish Scott Lahteine 2016-06-18 03:28:46 -07:00
  • da526f6ba9 Merge pull request #4080 from thinkyhead/rc_probe_feedrates Scott Lahteine 2016-06-18 02:44:52 -07:00
  • d55b94d606 Follow-up the PR #4065 (Remove support for XY servo endstops) esenapaj 2016-06-18 17:58:31 +09:00
  • 4e860babbc Allow setting xy_travel_speed for delta leveling also Scott Lahteine 2016-06-18 01:40:49 -07:00
  • d36d4edd80 Tweak partial homing code Scott Lahteine 2016-06-18 01:16:50 -07:00
  • d3a05de96e Save and restore feedrate in probe functions Scott Lahteine 2016-06-18 01:16:26 -07:00
  • 5991eb428f Update Spanish Language Juan Ricardo Gomez Anaya 2016-06-18 00:27:04 -05:00
  • f33bd0bb10 Merge pull request #4077 from thinkyhead/rc_delete_old_macros Scott Lahteine 2016-06-17 18:59:16 -07:00
  • 599154f9e2 Merge pull request #4076 from thinkyhead/rc_stop_print Scott Lahteine 2016-06-17 18:53:29 -07:00
  • defcacc1a9 Delete some obsolete Z servo macros Scott Lahteine 2016-06-17 18:49:17 -07:00
  • bbf5b486c3 Add an SD Card stop function, use in ultralcd Scott Lahteine 2016-06-17 18:27:14 -07:00
  • 3a150f07c2 Merge pull request #4073 from thinkyhead/rc_temp_mystery Scott Lahteine 2016-06-17 17:49:50 -07:00
  • c53d6441d1 Merge pull request #4074 from thinkyhead/rc_fix_gitignore Scott Lahteine 2016-06-17 17:48:23 -07:00
  • 17bd77031f .gitignore comments in correct format Scott Lahteine 2016-06-17 17:47:07 -07:00
  • bd4ec727e7 Merge pull request #4066 from thinkyhead/rc_M851_with_probe Scott Lahteine 2016-06-17 17:32:55 -07:00
  • 692a6e7c91 Merge pull request #4065 from thinkyhead/rc_goodbye_xy_servos Scott Lahteine 2016-06-17 17:32:08 -07:00
  • de177ba6c9 Minor tweaks to M109 / M190 Scott Lahteine 2016-06-17 17:26:21 -07:00
  • eab44b30d4 Safety and serial sections Scott Lahteine 2016-06-17 15:03:43 -07:00
  • fc56a547d1 Rename movement section to motion Scott Lahteine 2016-06-17 15:03:33 -07:00
  • a8b8796cd7 Define probe offsets when a probe exists Scott Lahteine 2016-06-16 19:00:51 -07:00
  • 1000563d80 Make M851 standard with a bed probe Scott Lahteine 2016-06-14 18:05:20 -07:00
  • f66a194159 Merge pull request #4062 from jbrazio/bugfix/compiler-warnings Scott Lahteine 2016-06-17 14:23:28 -07:00
  • e189f6a842 Patch Travis test for bed leveling Scott Lahteine 2016-06-16 19:26:30 -07:00
  • 1bed392c68 HAS_Z_ENDSTOP_SERVO => HAS_Z_SERVO_ENDSTOP Scott Lahteine 2016-06-16 18:15:48 -07:00
  • 47ce810f52 Remove support for XY servo endstops Scott Lahteine 2016-06-13 20:18:24 -07:00
  • 7641f414cf Merge pull request #4069 from esenapaj/Follow-up-the-PR-#4055 Scott Lahteine 2016-06-17 14:13:37 -07:00
  • dbb6d1ef45 Merge pull request #4071 from token47/patch-1 Scott Lahteine 2016-06-17 14:11:32 -07:00
  • d087ae0b9f Update README.md Andre Ruiz 2016-06-17 17:02:18 -03:00
  • d1e5dc6319
         Fixes misc gcc warnings João Brázio 2016-06-16 19:24:11 +01:00
  • c5eecb11b2 Follow-up the PR #4055 (Croatian language support) esenapaj 2016-06-17 21:20:15 +09:00
  • cabb71ff38 Merge pull request #4064 from jbrazio/feature/update-gitignore Scott Lahteine 2016-06-16 18:24:23 -07:00
  • e7ab26dc9c
         Updates .gitignore João Brázio 2016-06-17 01:50:51 +01:00
  • d991a4c24a Merge pull request #4063 from thinkyhead/rc_remove_swp_files Scott Lahteine 2016-06-16 17:22:48 -07:00
  • 8d8cbef1de Merge pull request #4055 from thinkyhead/rc_croatian_language Scott Lahteine 2016-06-16 17:22:25 -07:00
  • ebbed2975e Delete mysterious .swp files from #3609 Scott Lahteine 2016-06-16 16:39:36 -07:00
  • c42b1364b2 Merge pull request #4045 from thinkyhead/rc_max_feedrate_is_mm_s Scott Lahteine 2016-06-16 16:23:22 -07:00
  • 02e5dad29a Include Croatian in language listings Scott Lahteine 2016-06-15 22:02:12 -07:00
  • 2015aad867 Tweak Croatian language file heading Scott Lahteine 2016-06-15 22:01:57 -07:00
  • 884bc63fbe Add Croatian language Robert Marko 2016-06-15 15:14:56 +02:00
  • ef3bef6b9e Fix feedrate in gcode_T (max_feedrate is mm/s) Scott Lahteine 2016-06-14 18:39:24 -07:00
  • 9030ceec1d Merge pull request #4056 from thinkyhead/rc_mfinit Scott Lahteine 2016-06-16 15:44:14 -07:00
  • 4640974e1b Merge pull request #4060 from esenapaj/Follow-up-the-PR-#4053 Scott Lahteine 2016-06-16 15:44:00 -07:00
  • 340f97d635 Add ghtp script to set remotes to HTTP or SSL Scott Lahteine 2016-06-16 12:56:39 -07:00
  • 55edb37b52 Merge pull request #4058 from MagoKimbra/gcode_T Scott Lahteine 2016-06-16 12:54:21 -07:00
  • 106227540e Follow-up and improvement the PR #4053 (CNControls Cartesio UI Support) esenapaj 2016-06-16 19:22:31 +09:00
  • 008d0637dd Fix gcode_T MagoKimbra 2016-06-16 09:05:36 +02:00
  • cd9ecfdcb1 Merge pull request #4057 from thinkyhead/rc_babysteps_mm Scott Lahteine 2016-06-15 23:03:46 -07:00
  • 114d9db7d0 Show babysteps on the LCD in mm, not steps edwilliams16 2016-06-12 23:28:16 -10:00
  • b410bf933b Merge pull request #4053 from thinkyhead/rc_cartesio_redo Scott Lahteine 2016-06-15 22:33:45 -07:00
  • 4fa05913c3 Script to init the upstream remote for Marlin Scott Lahteine 2016-06-15 22:24:10 -07:00
  • f639044c24 Merge pull request #3609 from jbrazio/feature/config-version Scott Lahteine 2016-06-15 22:09:47 -07:00
  • 4d2cb70152 Cartesio UI Support Scott Lahteine 2016-06-15 21:38:52 -07:00
  • da90bbe0eb Merge pull request #4010 from thinkyhead/rc_toolchange_adjust Scott Lahteine 2016-06-15 21:10:33 -07:00
  • 948c467e16 Merge pull request #4043 from AnHardt/save_delay Scott Lahteine 2016-06-15 21:06:43 -07:00
  • 4b93989a77 MBL Z adjustment on toolchange Scott Lahteine 2016-06-11 13:00:30 -07:00
  • 9c800d1f8c Position adjustment for bed leveling Scott Lahteine 2016-06-11 12:59:44 -07:00
  • 8c7babb70f Merge pull request #4049 from esenapaj/Fix-for-the-PR-#4023 Scott Lahteine 2016-06-15 20:39:46 -07:00
  • 2d6de3e592 Merge pull request #4047 from Alex9779/Fix/ultralcd_move_e Scott Lahteine 2016-06-15 20:38:41 -07:00
  • 1219310622 Introduce save_delay() AnHardt 2016-06-15 18:11:55 +02:00
  • 44f091a413 Fix for the PR #4023(Add macros to move servos) esenapaj 2016-06-15 22:34:21 +09:00
  • c2b7ef1e7e "e" was renamed to "eindex" in a previous commit Alexander Leisentritt 2016-06-15 11:11:16 +02:00
  • 52ac2a62ee Merge pull request #4013 from thinkyhead/rc_toolchange_no_move Scott Lahteine 2016-06-14 20:13:01 -07:00