SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
4885 commits 1 branch 0 tags 118 MiB
Commit graph

4885 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Scott Lahteine ce1d6981c2 Merge pull request #3725 from esenapaj/patch-1 
Separate Z_PROBE_ALLEN_KEY from MECHANICAL_PROBE
 2016-05-16 20:23:03 -07:00
João Brázio b6a3aef297
G29: Report final position back to host when using MBL 2016-05-17 01:27:59 +01:00
esenapaj 95f30529a6 Add stowing process for MECHANICAL_PROBE 2016-05-16 18:12:10 +09:00
esenapaj e2b87f6c85 Separate Z_PROBE_ALLEN_KEY from MECHANICAL_PROBE 2016-05-16 18:12:10 +09:00
Scott Lahteine 58339aea5f Merge pull request #3769 from jbrazio/bugfix/iteration-invokes-undef-behavior 
Bugfix: iteration invokes undefined behavior
 2016-05-15 20:36:25 -07:00
Scott Lahteine 26b4cb5b42 Merge pull request #3771 from thinkyhead/rc_auto_fans_again 
Fix checkExtruderAutoFans
 2016-05-15 20:32:31 -07:00
Scott Lahteine c9271e610b Merge pull request #3762 from jbrazio/bugfix/lcd-hide-bed-icon 
Remove the hotbed icon from the status screen
 2016-05-15 19:11:05 -07:00
Scott Lahteine 2f14934c65 Fix checkExtruderAutoFans 
Make sure to only set the fan state once when extruders share a fan
 2016-05-15 18:54:37 -07:00
João Brázio ecd490ed49
Bugfix: iteration invokes undefined behavior 2016-05-15 22:45:08 +01:00
Scott Lahteine abdfd914f8 Merge pull request #3763 from esenapaj/patch-4 
Follow-up for #3720 and #3759
 2016-05-15 12:37:51 -07:00
Scott Lahteine 388a58ec02 Merge pull request #3767 from thinkyhead/rc_fix_zigzag_calls 
Fix MBL zigzag calls
 2016-05-15 12:35:36 -07:00
Scott Lahteine 754b0152f5 Fix MBL zigzag calls 2016-05-15 12:35:01 -07:00
Scott Lahteine 86ac48a374 Merge pull request #3760 from thinkyhead/rc_fix_mbl_m503_output 
Fix various issues with MBL command M421
 2016-05-15 11:49:49 -07:00
Scott Lahteine 1fcc9ec721 Merge pull request #3715 from jbrazio/feature/buildroot 
Cleanup the buildroot
 2016-05-15 11:44:10 -07:00
esenapaj 6d722716f7 Follow-up the PR #3720 and #3759 
Update forgotten Configuration_DUAL.h
 2016-05-15 14:08:45 +09:00
João Brázio 451000387d
Remove the hotbed icon when HAS_TEMP_BED is false 2016-05-15 03:00:05 +01:00
Scott Lahteine a058226799 Prevent watchdog timeout in bezier moves 2016-05-14 17:41:16 -07:00