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

7019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine
df2d0eb37c Merge pull request #3608 from thinkyhead/rcbugfix_merge_rc 
Merge RC => RCBugFix changes since RC5
 2016-04-24 20:28:25 -07:00
esenapaj
db56ff5881 follow-up to commit 200b248(Update README.md) 
follow-up to commit 200b2487c2dfb1a5160c0974d2b7c6f2e54719ee

Update release date in another place
 2016-04-24 20:16:37 -07:00
Jochen Groppe
0ed43ec34b Update README.md 
Oops! at least 1.6.0
 2016-04-24 20:16:37 -07:00
Jochen Groppe
b899338c32 Update README.md 
* Description for RC5
* Hint for deprecated Arduino versions
 2016-04-24 20:16:36 -07:00
Scott Lahteine
735f1f5bfa Merge pull request #3606 from thinkyhead/rc_step_sec_comments 
Patch steps rate comment in trapezoid function
 2016-04-24 19:48:41 -07:00
Scott Lahteine
fce1e843b9 Patch steps rate comment in trapezoid function 2016-04-24 19:38:58 -07:00
Scott Lahteine
266ae90861 Merge pull request #3594 from jbrazio/feature/rework-versioning 
Rework Marlin's versioning system
 2016-04-24 17:42:45 -07:00
João Brázio
aa7a65e613
Updated travis config 2016-04-24 05:57:14 +01:00
João Brázio
7de0161204
Updated example config files 2016-04-24 05:21:17 +01:00
João Brázio
3b6f75511f
Updated multiple pins files 2016-04-24 05:21:17 +01:00
João Brázio
170f7e8a45
Rework Marlin's versioning system 2016-04-24 05:21:17 +01:00
Scott Lahteine
c86d092ef3 Merge pull request #3598 from esenapaj/patch1 
Cleanup for language files
 2016-04-22 21:55:42 -07:00
esenapaj
8d0b2f358a Cleanup for language files 
・Remove abolished strings (MSG_NOZZLE1, MSG_NOZZLE2)
・Remove duplicated strings 
・Arrange the strings in unified order
・Adjust spacing
・Remove some comments in Japanese files(follow-up the PR #3560)

The most part of these changes were salvaged from closed my PR#3550.
 2016-04-23 13:27:05 +09:00
Scott Lahteine
2bb56ef6de Merge pull request #3597 from thinkyhead/rc_fix_g29_debug 
Move G29 debug output before matrix.set_to_identity()
 2016-04-22 21:21:00 -07:00
João Brázio
a901555da4 Moved G29 debug output before matrix.set_to_identity() 2016-04-22 20:57:22 -07:00
Scott Lahteine
d28db67ca9 Merge pull request #3596 from thinkyhead/rc_fix_typo_in_mbl 
Fix a typo in #3586 to fix MBL
 2016-04-22 20:16:28 -07:00
Scott Lahteine
88c6693b9e Fix a typo in #3586 to fix MBL 2016-04-22 20:04:08 -07:00
Scott Lahteine
8620024130 Merge pull request #3588 from thinkyhead/rc_z_safe_homing_deps 
Allow Z_SAFE_HOMING to compile without a probe
 2016-04-21 17:51:18 -07:00
Scott Lahteine
aaf9d19954 Allow Z_SAFE_HOMING to compile without a probe 2016-04-21 15:55:49 -07:00
Scott Lahteine
92ab2c7dd8 Merge pull request #3587 from thinkyhead/rc_z_safe_homing_deps 
Define dependencies for Z_SAFE_HOMING if left out
 2016-04-21 15:46:24 -07:00
Scott Lahteine
63142eef40 Define dependencies for Z_SAFE_HOMING if left out 2016-04-21 15:22:19 -07:00
Scott Lahteine
173334e535 Merge pull request #3418 from jbrazio/translate/danish 
Missing Danish translation
 2016-04-21 14:56:43 -07:00
João Brázio
fe4fc88494
Closes #3351: missing Danish translation 2016-04-21 21:31:47 +01:00
Scott Lahteine
ce141deba2 Merge pull request #3586 from thinkyhead/rc_revert_mbl_menu_hack 
Revert MBL menus to "known" working point
 2016-04-21 13:30:08 -07:00
Scott Lahteine
003aab6dfd Revert MBL menus to "known" working point 2016-04-21 12:59:55 -07:00
Scott Lahteine
6fac4d9211 Merge pull request #3579 from thinkyhead/rc_fix_dogm_and_mbl_menus 
Fix menu redraw for DOGLCD, improve MBL
 2016-04-20 20:52:56 -07:00
Scott Lahteine
7ddaa79ffe Merge pull request #3578 from thinkyhead/rc_fix_twibus_less_debug_code 
Reduce PROGMEM usage by TWIBus, stopwatch
 2016-04-20 20:52:16 -07:00
Scott Lahteine
cfd10fcba1 Merge pull request #3577 from thinkyhead/rc_fix_G92_set_e_twice 
Fix G92 setting E twice
 2016-04-20 20:52:09 -07:00
Scott Lahteine
fa81b01033 Merge pull request #3576 from thinkyhead/rc_heres_your_z_safe_homing 
Z Safe Homing for all
 2016-04-20 20:52:01 -07:00
Scott Lahteine
dc2281d2f4 Add nextMenu, nextEncoderPosition to change menus after handler loop 2016-04-20 20:19:12 -07:00
Scott Lahteine
7fa2bda1b9 Give the "alive dot" its own blink 2016-04-20 18:57:17 -07:00
Scott Lahteine
9d5e1f32fd Use axis_homed in _lcd_level_bed_homing, item in Prepare before homing 2016-04-20 18:53:33 -07:00
Scott Lahteine
0c2aa92b07 Z Safe Homing for all 
The `Z_SAFE_HOMING` feature is coupled with probes and not leveling, so
make it available for general use.
 2016-04-20 17:04:52 -07:00
Scott Lahteine
9bcb72e7f8 Further patches to MBL - break up into more handlers 2016-04-20 16:37:35 -07:00
Scott Lahteine
3f6ae85748 Fix some MBL display issues for DOGLCD 2016-04-20 16:36:45 -07:00
Scott Lahteine
71b4f189bf lcd_implementation_drawedit can take 1 arg 2016-04-20 16:36:45 -07:00
Scott Lahteine
1caa2628da Use sync_plan_position_e function elsewhere 2016-04-20 13:02:19 -07:00
Scott Lahteine
c7df961144 Fix G92 so it only sets the plan position once 2016-04-20 13:01:58 -07:00
Scott Lahteine
1addb50b62 Shrink debug code in TWIBus and disable by default 2016-04-20 12:44:30 -07:00
Scott Lahteine
21a6b66807 Shrink debug code in Stopwatch and disable by default 2016-04-20 12:44:30 -07:00
Scott Lahteine
e523a0dc61 Fix bug in TWIBus ctor declaration 2016-04-20 12:37:46 -07:00
Scott Lahteine
ee9bd66a68 Add comments to debug bit flags 2016-04-20 12:37:22 -07:00
Scott Lahteine
3db5a75f30 Merge pull request #3568 from thinkyhead/rc_various_fixes 
General code cleanup, improved naming, etc.
 2016-04-19 20:53:38 -07:00
Scott Lahteine
8a2587f017 Read size for MAX6675 from sizeof(max6675_temp) 2016-04-19 19:57:32 -07:00
Scott Lahteine
ac69fad96d lowercase "stop" function 2016-04-19 19:43:54 -07:00
Scott Lahteine
39ee9c526b setTargetedHotend => get_target_extruder_from_command 2016-04-19 19:43:54 -07:00
Scott Lahteine
cafa8b8ce3 Rename filament runout items 2016-04-19 19:43:39 -07:00
Scott Lahteine
27b2e2e786 Document some variables 2016-04-19 19:43:39 -07:00
Scott Lahteine
a4062a47ac Rename baricuda variables 2016-04-19 19:43:38 -07:00
Scott Lahteine
78747b1328 min_pos/max_pos => sw_endstop_min/sw_endstop_max 2016-04-19 19:43:38 -07:00