melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,211 Commits 2 Branches 0 Tags 2 GiB
9924199802
Commit Graph

7211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine
add0032820 Improve FILAMENT_RUNOUT_SENSOR, FILRUNOUT_PIN 2016-06-19 18:13:33 -07:00
Scott Lahteine
15a5eeb740 Merge pull request #4094 from thinkyhead/rc_cartesio_config 
Cartesio UI display option in all configs
 2016-06-19 17:43:25 -07:00
Scott Lahteine
f8c278ce4d Cartesio UI display option in all configs 2016-06-19 17:39:46 -07:00
Scott Lahteine
43ec24158e Merge pull request #4092 from thinkyhead/rc_sd_error 
Output a message for SD read errors
 2016-06-19 17:30:29 -07:00
Scott Lahteine
400e13d136 Output a message for SD read errors 2016-06-19 17:14:56 -07:00
Roxy-3D
96b8bcca84 Merge pull request #4081 from thinkyhead/rc_tweaky_m48_tweaks 
Cleanup of M48
 2016-06-18 22:21:16 -05:00
Scott Lahteine
b7e3c1bbc4 Tweak M48 output conditions 2016-06-18 16:17:53 -07:00
Scott Lahteine
b714fb644c Merge pull request #4085 from thinkyhead/rc_fix_M851 
Fix M851
 2016-06-18 15:42:52 -07:00
Scott Lahteine
1dad912b03 Adjust M48 raise / move handling 2016-06-18 15:38:24 -07:00
Scott Lahteine
46d3ef2223 Simplify sample_set probe_pt call in M48 2016-06-18 15:38:23 -07:00
Scott Lahteine
a647b05f82 Shrink some debug code in G28 2016-06-18 15:38:23 -07:00
Scott Lahteine
4edf813bde Just-in-time declaration style in M48 2016-06-18 15:38:23 -07:00
Juan Ricardo Gomez Anaya
c475291e19 Fix M851 
Minor change missing in the process of standardize the gcode M851
 2016-06-18 15:19:07 -07:00
Scott Lahteine
e35583888c Merge pull request #4082 from esenapaj/Follow-up-the-PR-#4065 
Follow-up the PR #4065 (Remove support for XY servo endstops)
 2016-06-18 03:31:12 -07:00
Scott Lahteine
6dff52d920 Merge pull request #4078 from RicardoGA/Language_Spanish 
Update Spanish Language
 2016-06-18 03:28:46 -07:00
Scott Lahteine
da526f6ba9 Merge pull request #4080 from thinkyhead/rc_probe_feedrates 
Save / restore feedrate in probing functions
 2016-06-18 02:44:52 -07:00
esenapaj
d55b94d606 Follow-up the PR #4065 (Remove support for XY servo endstops) 
・Update a forgotten Configuration.h of Cartesio
 2016-06-18 18:01:58 +09:00
Scott Lahteine
4e860babbc Allow setting xy_travel_speed for delta leveling also 2016-06-18 01:40:49 -07:00
Scott Lahteine
d36d4edd80 Tweak partial homing code 2016-06-18 01:16:50 -07:00
Scott Lahteine
d3a05de96e Save and restore feedrate in probe functions 2016-06-18 01:16:26 -07:00
Juan Ricardo Gomez Anaya
5991eb428f Update Spanish Language 
Spanish language update and also add missing messages
 2016-06-18 00:27:04 -05:00
Scott Lahteine
f33bd0bb10 Merge pull request #4077 from thinkyhead/rc_delete_old_macros 
Delete some obsolete Z servo macros
 2016-06-17 18:59:16 -07:00
Scott Lahteine
599154f9e2 Merge pull request #4076 from thinkyhead/rc_stop_print 
Add an SD Card stop function, use in ultralcd
 2016-06-17 18:53:29 -07:00
Scott Lahteine
defcacc1a9 Delete some obsolete Z servo macros 2016-06-17 18:49:17 -07:00
Scott Lahteine
bbf5b486c3 Add an SD Card stop function, use in ultralcd 2016-06-17 18:27:14 -07:00
Scott Lahteine
3a150f07c2 Merge pull request #4073 from thinkyhead/rc_temp_mystery 
Minor tweaks to M109 / M190
 2016-06-17 17:49:50 -07:00
Scott Lahteine
c53d6441d1 Merge pull request #4074 from thinkyhead/rc_fix_gitignore 
.gitignore comments in correct format
 2016-06-17 17:48:23 -07:00
Scott Lahteine
17bd77031f .gitignore comments in correct format 2016-06-17 17:47:07 -07:00
Scott Lahteine
bd4ec727e7 Merge pull request #4066 from thinkyhead/rc_M851_with_probe 
Make M851 standard with a bed probe
 2016-06-17 17:32:55 -07:00
Scott Lahteine
692a6e7c91 Merge pull request #4065 from thinkyhead/rc_goodbye_xy_servos 
Remove support for XY servo endstops
 2016-06-17 17:32:08 -07:00
Scott Lahteine
de177ba6c9 Minor tweaks to M109 / M190 2016-06-17 17:26:21 -07:00
Scott Lahteine
eab44b30d4 Safety and serial sections 2016-06-17 15:19:43 -07:00
Scott Lahteine
fc56a547d1 Rename movement section to motion 2016-06-17 15:19:43 -07:00
Scott Lahteine
a8b8796cd7 Define probe offsets when a probe exists 2016-06-17 15:19:42 -07:00
Scott Lahteine
1000563d80 Make M851 standard with a bed probe 2016-06-17 15:19:42 -07:00
Scott Lahteine
f66a194159 Merge pull request #4062 from jbrazio/bugfix/compiler-warnings 
Fixes misc gcc warnings
 2016-06-17 14:23:28 -07:00
Scott Lahteine
e189f6a842 Patch Travis test for bed leveling 2016-06-17 14:20:18 -07:00
Scott Lahteine
1bed392c68 HAS_Z_ENDSTOP_SERVO => HAS_Z_SERVO_ENDSTOP 2016-06-17 14:20:17 -07:00
Scott Lahteine
47ce810f52 Remove support for XY servo endstops 2016-06-17 14:19:17 -07:00
Scott Lahteine
7641f414cf Merge pull request #4069 from esenapaj/Follow-up-the-PR-#4055 
Follow-up the PR #4055 (Croatian language support)
 2016-06-17 14:13:37 -07:00
Scott Lahteine
dbb6d1ef45 Merge pull request #4071 from token47/patch-1 
Update README.md
 2016-06-17 14:11:32 -07:00
Andre Ruiz
d087ae0b9f Update README.md 2016-06-17 17:02:18 -03:00
João Brázio
d1e5dc6319
Fixes misc gcc warnings 2016-06-17 20:24:24 +01:00
esenapaj
c5eecb11b2 Follow-up the PR #4055 (Croatian language support) 
・Update a forgotten Configuration.h of Cartesio
 2016-06-17 21:20:15 +09:00
Scott Lahteine
cabb71ff38 Merge pull request #4064 from jbrazio/feature/update-gitignore 
Updates .gitignore
 2016-06-16 18:24:23 -07:00
João Brázio
e7ab26dc9c
Updates .gitignore 2016-06-17 01:50:51 +01:00
Scott Lahteine
d991a4c24a Merge pull request #4063 from thinkyhead/rc_remove_swp_files 
Delete mysterious .swp files from #3609
 2016-06-16 17:22:48 -07:00
Scott Lahteine
8d8cbef1de Merge pull request #4055 from thinkyhead/rc_croatian_language 
Croatian language support
 2016-06-16 17:22:25 -07:00
Scott Lahteine
ebbed2975e Delete mysterious .swp files from #3609 2016-06-16 16:42:03 -07:00
Scott Lahteine
c42b1364b2 Merge pull request #4045 from thinkyhead/rc_max_feedrate_is_mm_s 
Fix feedrate in gcode_T (max_feedrate is mm/s)
 2016-06-16 16:23:22 -07:00