CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,902 Commits 1 Branch 0 Tags 107 MiB
75221fa673
Commit Graph

4902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
João Brázio
75221fa673
Followup for #3813 2016-05-22 13:14:58 +01:00
Scott Lahteine
f9b4b90058 Merge pull request #3813 from jbrazio/bugfix/3809 
Stopwatch and PrintCounter improvements
 2016-05-21 18:33:57 -07:00
João Brázio
8c0edb2de4
Fixes #3809 and adds several improvements to the Stopwatch and 
PrintCounter classes
 2016-05-22 01:59:59 +01:00
Scott Lahteine
03e44e0f83 Merge pull request #3807 from thinkyhead/rc_reverse_options_doc 
Additional instructions for controller reverse options
 2016-05-20 20:36:31 -07:00
Scott Lahteine
c5130fd23b Additional instructions for controller reverse options 2016-05-20 18:14:50 -07:00
Scott Lahteine
cadf441059 Merge pull request #3798 from AnHardt/extend-M421 
Extend M421 with I and J parameters
 2016-05-20 16:17:23 -07:00
AnHardt
f5a036510f Extend M421 with I and J parameters 
Extend M421 with I and J parameters
 2016-05-21 00:18:09 +02:00
Scott Lahteine
2f6e7b7b9b Merge pull request #3805 from MatixYo/patch-7 
Update language_pl.h to the latest strings
 2016-05-20 14:50:49 -07:00
Scott Lahteine
88291d1656 Merge pull request #3802 from thinkyhead/rc_epatel_g28_rest_pos 
MBL: Add option to configure G28 resting position for all axes
 2016-05-20 12:10:52 -07:00
Scott Lahteine
f69b5afe4c Travis CI test for MBL 2016-05-20 11:52:27 -07:00
Scott Lahteine
1a6c72cb57 Apply to the rest of the configs 2016-05-20 11:52:27 -07:00
Scott Lahteine
37c6d0f4ed Reword MESH_G28_REST_ORIGIN comment 2016-05-20 11:52:27 -07:00
Edward Patel
c7d90dc5ec Add option to configure G28 all axis resting position for MBL 2016-05-20 11:52:27 -07:00
Mateusz Juszczyk
bbe4c20ef6 Update language_pl.h 2016-05-20 13:24:34 +02:00
Scott Lahteine
319d184999 Merge pull request #3803 from jbrazio/feature/buildroot-cleanup 
Buildroot cleanup
 2016-05-19 21:34:11 -07:00
João Brázio
3d3a919059
Moves the Marlin logo into the buildroot 2016-05-20 03:43:30 +01:00
João Brázio
08b485a310
Travis will now generate and use the custom version header file 2016-05-20 03:22:04 +01:00
Scott Lahteine
a469341555 Merge pull request #3800 from jbrazio/feature/move-felix-cfg 
Moves Felix's dual configuration to a folder
 2016-05-19 18:53:39 -07:00
João Brázio
66fb23edb5
Makes buildroot bin scripts executable 2016-05-20 02:26:13 +01:00
João Brázio
14652bb141
Moves shared helper scripts to the buildroot 2016-05-20 02:25:13 +01:00
Scott Lahteine
61de6daf1d Merge pull request #3761 from thinkyhead/rc_plan_arc_idle 
Apply config changes, tweak comments, next_ping_ms => next_idle_ms
 2016-05-19 17:10:17 -07:00
João Brázio
80f05920c5
Moves Felix's dual configuration to a folder 2016-05-20 00:49:16 +01:00
Scott Lahteine
8218558953 Update comments, rename next_ping_ms, followup to #3797 2016-05-19 16:44:57 -07:00
Scott Lahteine
6d68b12e28 Merge pull request #3797 from AnHardt/fix-screen-updatedelay 
Rework intermediate idle() and manage_heater() calls in G2/G3 and G5
 2016-05-19 16:29:27 -07:00
Scott Lahteine
aaaf4febaf Merge pull request #3794 from esenapaj/RCBugFix 
Update Galician language to 1.1.0-RCBugFix.
 2016-05-19 16:22:10 -07:00
AnHardt
e761bdbb4b Remove SF_ARC_FIX from G5 (Cubic B-spline) 
Remove SF_ARC_FIX from G5 (Cubic B-spline).
SF_ARC_FIX is a fix for G2/G3 (arcs) where Skeinforge always produced relative instead of absolute coordinates for the endpoint of an arc.
It's very unlikely this is also a problem with Cubic B-splines. More likely is copying from the G2/G3 code.
 2016-05-19 21:00:12 +02:00
AnHardt
2207001333 No compromises for the manage_heater() 
No compromises for the manage_heater(). manage_heater() will return immediately when there is nothing to do, but needs a constant detaT to work proper.
Calling idle() only every 200ms results in a display update every ~2 seconds - that should be enough.
For the other functionalities in idle() and manage_inactivity() 200ms is a lot but hopefully works.
 2016-05-19 20:52:11 +02:00
AnHardt
0c4d885d5b Speedup sreen update delay 
Speedup sreen update delay
and correct a comment.

A module division by 10 is slooooow. (powers of 2 are fast - but then you can AND a bitmask with the same result)
 2016-05-19 15:41:09 +02:00
Rafa Couto
9d416289cc Update Galician language to 1.1.0-RCBugFix. 2016-05-19 19:33:40 +09:00
Scott Lahteine
b422e39016 Merge pull request #3779 from thinkyhead/rc_x2_automatic_pins 
Automatically set X2 stepper pins
 2016-05-18 19:27:34 -07:00
Scott Lahteine
07c9a11c3c Automatically set X2 stepper pins 2016-05-18 19:09:09 -07:00
Scott Lahteine
8aa591ca09 Merge pull request #3789 from jbrazio/feature/m999-s-arg 
Implements S1 argument in M999
 2016-05-18 16:58:09 -07:00
Scott Lahteine
138c5c8378 Merge pull request #3788 from thinkyhead/rc_dual_x_compile_fix 
DUAL_X_CARRIAGE fixes, improvements, Travis test
 2016-05-18 16:56:54 -07:00
Scott Lahteine
7527fdec0b Add Travis test for DUAL_X_CARRIAGE 2016-05-18 16:32:34 -07:00
João Brázio
e6effb8f35
Implements S1 argument in M999 2016-05-19 00:13:33 +01:00
Scott Lahteine
2a7b1a85f7 Improve DUAL_X_CARRIAGE sanity check errors 2016-05-18 15:59:28 -07:00
Scott Lahteine
516e79bbda Declare extruder_duplication_enabled in Marlin.h 2016-05-18 15:51:44 -07:00
Scott Lahteine
bffa928954 Merge pull request #3785 from esenapaj/update-japanese-translation 
Update Japanese trasration
 2016-05-18 15:21:35 -07:00
esenapaj
56d5ae596c Update Japanese trasration 
・Add new translation
・Change translation
 2016-05-18 20:42:50 +09:00
Scott Lahteine
3bdc03667e Merge pull request #3784 from thinkyhead/rc_funcs_not_extern 
Function declarations in headers don't need "extern"
 2016-05-17 18:43:25 -07:00
Scott Lahteine
4041508ffb Function decl. in headers don't need "extern" 2016-05-17 18:35:01 -07:00
Scott Lahteine
82c2d308dc Merge pull request #3783 from thinkyhead/rc_bezier_delta_fix 
Bezier style and DELTA patch
 2016-05-17 18:27:48 -07:00
Scott Lahteine
ecec5c5e58 Bezier style and DELTA patch 2016-05-17 18:06:10 -07:00
Scott Lahteine
d66e53c42b Merge pull request #3782 from thinkyhead/rc_home_z_before_g29 
Require homing of Z before G29
 2016-05-17 17:53:56 -07:00
Scott Lahteine
552516ddf5 Merge pull request #3781 from AnHardt/minor-delta-segmenting-speedup 
Minor DELTA segmentation speedup
 2016-05-17 17:17:38 -07:00
Scott Lahteine
a28970784c XYZ unhomed 2016-05-17 17:02:53 -07:00
Scott Lahteine
a9926b71a4 Require homing of Z before G29 2016-05-17 16:57:12 -07:00
AnHardt
41e9569dbc Minor DELTA segmentation speedup 
Minor DELTA segmentation speedup by pulling calculations out of the loop.
 2016-05-18 01:49:30 +02:00
Scott Lahteine
3016dfe484 Merge pull request #3744 from thinkyhead/rc_bezier_curves 
Add BEZIER_CURVE_SUPPORT — G5 command
 2016-05-17 13:57:38 -07:00
Scott Lahteine
d0ac4541d3 Merge pull request #3775 from jbrazio/bugfix/followup-3770 
G29: Report final position back to host when using MBL
 2016-05-17 13:55:26 -07:00