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

4124 commits

Author SHA1 Message Date
Scott Lahteine
9eecb4404b Make raise_z_after_probing null sometimes 2016-06-02 16:56:49 -07:00
Scott Lahteine
28fb1f8994 Tweak #endif comment for ABL GRID 2016-06-02 16:56:49 -07:00
Scott Lahteine
b3a37b493d Patch G28 servo stow to use Conditionals, raise_z_after_probing 2016-06-02 16:56:49 -07:00
Scott Lahteine
5390c846a5 Positive conditions for HAS_LCD_CONTRAST 2016-06-02 16:17:34 -07:00
Scott Lahteine
efa7209acf Improved LCD contrast handling 
Based on MarlinFirmware/MarlinDev#200 from @eboston
 2016-06-02 16:17:34 -07:00
Scott Lahteine
b703fa9538 Add sanity check for SAV_3DGLCD display types 2016-06-02 15:21:17 -07:00
lrpirlet
3aefa04386 Raise the servo probe before stow outside ABL context 2016-06-01 21:53:45 +02:00
Scott Lahteine
9729e9c450 Combine ST7565 / U8GLIB_NHD_C12864 items in dogm 2016-06-01 01:42:14 -07:00
Scott Lahteine
f331763eca Merge pull request #3829 from thinkyhead/rc_fix_T_command 
Fix bad movement in gcode_T when switching extruders
 2016-05-31 19:36:18 -07:00
Scott Lahteine
67f816ff79 Merge pull request #3926 from thinkyhead/rc_statics_endstops 
Drop FORCE_INLINE from endstops.h
 2016-05-31 19:35:41 -07:00
Scott Lahteine
2bd4f33369 Merge pull request #3928 from thinkyhead/rc_allen_key_cleanup 
Remove excess allen key probe examples from configs
 2016-05-31 19:18:21 -07:00
Scott Lahteine
d698c89971 Fix bad movement in gcode_T when switching 2016-05-31 19:14:33 -07:00
Scott Lahteine
1a01a44a94 Merge pull request #3936 from thinkyhead/rc_sav_mk1 
Support for SAV_3DGLCD OLED LCD controller
 2016-05-31 18:46:25 -07:00
Scott Lahteine
4770d7c346 Merge pull request #3933 from boelle/patch-2 
added defines present in en but not in da
 2016-05-31 18:42:38 -07:00
Scott Lahteine
c6c01eaaac Merge pull request #3888 from thinkyhead/rc_slower_max31855 
Slower SPI speed for MAX31855
 2016-05-31 18:40:38 -07:00
Scott Lahteine
a0b000d752 Support for SAV_3DGLCD OLED LCD controller 2016-05-31 14:41:16 -07:00
Scott Lahteine
bd97bbc52a Make HAS_LCD_CONTRAST a boolean flag 2016-05-31 11:47:02 -07:00
Scott Lahteine
bc77670673 Merge pull request #3929 from thinkyhead/rc_fix_printrboard_dac 
Need to call dac_init() in setup() for DAC_STEPPER_CURRENT
 2016-05-31 10:29:37 -07:00
Bo Herrmannsen
a1a8240606 added defines present in en but not in da 2016-05-31 14:57:52 +02:00
Bo Herrmannsen
5eb7a79d93 initial changes to DA 2016-05-31 14:24:33 +02:00
Scott Lahteine
55ef04a566 Need to call dac_init() in setup() for DAC_STEPPER_CURRENT 
As reported by https://github.com/MarlinFirmware/Marlin/pull/3182#issuecomment-222595488
 2016-05-30 23:35:06 -07:00
Scott Lahteine
43a71ef226 Remove excess allen key probe examples from configs 2016-05-30 18:26:53 -07:00
Scott Lahteine
1582ed43bf Merge pull request #3918 from epatel/marlin/mbl_negative_xy_adv 
MBL: Move border macros to Configuration_adv.h
 2016-05-30 18:15:50 -07:00
Scott Lahteine
ff53819856 Drop FORCE_INLINE in planner.h 
This change actually does increase the binary size by about 12 bytes,
but how does it affect performance?
 2016-05-30 17:18:28 -07:00
Scott Lahteine
e60224a943 Drop FORCE_INLINE from endstops.h 
`FORCE_INLINE` seems to have no effect with standard optimization.
 2016-05-30 17:08:56 -07:00
Scott Lahteine
85512e9372 Drop FORCE_INLINE from temperature.h 
`FORCE_INLINE` seems to have no effect on code generation with standard
optimization.
 2016-05-30 17:06:50 -07:00
Scott Lahteine
78fb02a5ad Apply static to Temperature class 2016-05-30 16:50:51 -07:00
Scott Lahteine
c3df293fc6 Merge pull request #3923 from thinkyhead/rc_statics_endstops 
Apply static to Endstops class
 2016-05-30 16:48:23 -07:00
Scott Lahteine
02735fd500 Merge pull request #3921 from thinkyhead/rc_calc_timer_tweak 
Tiny calc_timer speedup
 2016-05-30 16:47:03 -07:00
Scott Lahteine
668d50f68e Keep Stepper encapsulation, use static data and methods 2016-05-30 16:24:04 -07:00
Scott Lahteine
26f866b908 Apply static to Endstops class 2016-05-30 16:23:43 -07:00
Scott Lahteine
470d5ac09f Apply static to Planner class 2016-05-30 16:22:41 -07:00
Scott Lahteine
ecfdcf7250 Tiny calc_timer speedup 2016-05-30 16:17:02 -07:00
Edward Patel
06593833ff MBL: Move border macros to Configuration_adv.h 2016-05-30 20:50:16 +02:00
Scott Lahteine
ffe55c230d Merge pull request #3914 from thinkyhead/rc_fix_lcd_contrast 
Patch conditionals for DEFAULT_LCD_CONTRAST, MINIPANEL
 2016-05-30 11:20:14 -07:00
Scott Lahteine
d3efc96289 Patch conditionals for DEFAULT_LCD_CONTRAST, MINIPANEL 
- `DEFAULT_LCD_CONTRAST` was incorrectly overriding all `DOGLCD`
- `MINIPANEL` conditionals are identical to `MAKRPANEL`
 2016-05-30 01:10:47 -07:00
Edward Patel
92a27c37b3 MBL: Apply https://github.com/MarlinFirmware/Marlin/pull/3903 to example_configurations 2016-05-30 09:50:11 +02:00
Scott Lahteine
3861f1e0da Merge pull request #3908 from jbrazio/bugfix/3826 
Closes #3826: SD printing will now pause and stop the print counter
 2016-05-30 00:08:57 -07:00
Scott Lahteine
8806c7bbcc Merge pull request #3903 from epatel/marlin/mbl_negative_xy 
MBL: Fix for negative x/y positions
 2016-05-29 22:07:35 -07:00
Scott Lahteine
dc22097b3a Fix some of array initializations 
- In `stepper.h` init `count_direction` array
- In `ultralcd.cpp` init `autotune_temp` array
 2016-05-29 20:55:13 -07:00
João Brázio
40e64b36de
Closes #3826: SD printing will now pause and stop the print counter 
The LCD menu items for SD printing pause/stop have been updated to control
also the print job timer. This commit also fixes a small output bug with
M78, the failed print counter was displaying the wrong value.
 2016-05-30 00:56:39 +01:00
Edward Patel
eb2746a34f MBL: Fix for negative x/y positions 2016-05-28 21:05:43 +02:00
Scott Lahteine
fe3122774a Merge pull request #3806 from thinkyhead/rc_coreyz_support 
Support for COREYZ. Fixes for COREXY, COREXZ
 2016-05-26 18:50:43 -07:00
Scott Lahteine
fad7680605 Slower SPI speed for MAX31855 2016-05-25 18:15:36 -07:00
Scott Lahteine
30f6b84561 Merge pull request #3812 from thinkyhead/rc_mbl_index_finders 
Two index finding functions for MBL
 2016-05-23 15:54:37 -07:00
Scott Lahteine
89e630b2fb Merge pull request #3808 from thinkyhead/rc_singlenozzle 
SINGLENOZZLE
 2016-05-23 15:52:19 -07:00
Scott Lahteine
827738a790 set_z parameters marked const 2016-05-23 14:25:43 -07:00
Scott Lahteine
9049f4084b EEPROM report uses G29 S3 2016-05-23 14:25:43 -07:00
Scott Lahteine
4955163959 Propose simpler probe index methods 2016-05-23 14:25:43 -07:00
Scott Lahteine
a1a5cb5393 Propose simpler cel index methods 2016-05-23 14:25:42 -07:00
Scott Lahteine
360adc6a3b Small reduction in M421 code 2016-05-23 14:25:42 -07:00
Scott Lahteine
a4ed988c60 Two index finding functions for MBL 2016-05-23 14:25:42 -07:00
Scott Lahteine
0e55c06f7d Rename CORE_AXIS_3 to NORMAL_AXIS 2016-05-23 13:58:40 -07:00
Scott Lahteine
5172d4ba40 COREYZ stepper, planner, endstop, babysteps 2016-05-23 13:58:40 -07:00
Scott Lahteine
6c7f4909b1 COREYZ Conditionals, SanityCheck for only a single kinematic 2016-05-23 13:58:40 -07:00
Scott Lahteine
95fee8ca81 Add option for CoreYZ kinematics 2016-05-23 13:58:40 -07:00
Scott Lahteine
678cbad76a Merge pull request #3819 from jbrazio/bugfix/followup-3813 
Followup for #3813
 2016-05-23 13:56:11 -07:00
AnHardt
bb66ffb2ae Correct hardware endstops default 
All credits to RicardoGA
 2016-05-23 10:54:22 +02:00
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
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
Scott Lahteine
0c7c45063b PID_ADD_EXTRUSION_RATE based on MarlinKimbra 2016-05-20 16:15:05 -07:00
Scott Lahteine
92ac133f2b Conditionals and Sanity Check for SINGLENOZZLE 2016-05-20 15:48:27 -07:00
Scott Lahteine
69abfef82e Add "SINGLENOZZLE" extruder option 2016-05-20 15:45:11 -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
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
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
14652bb141
Moves shared helper scripts to the buildroot 2016-05-20 02:25:13 +01: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
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
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
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
esenapaj
56d5ae596c Update Japanese trasration 
・Add new translation
・Change translation
 2016-05-18 20:42:50 +09: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
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
754b0152f5 Fix MBL zigzag calls 2016-05-15 12:35:01 -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
Scott Lahteine
13175ce7da Fix error checking in M421 2016-05-14 17:12:44 -07:00
Scott Lahteine
bc5a547d55 More robust MBL index / point conversion 2016-05-14 16:45:56 -07:00
Scott Lahteine
a3520b6f01 More precision in M503 output for MBL's M421 2016-05-14 16:19:37 -07:00
Scott Lahteine
1b90682617 Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 
Remove need to define unused pins as -1 in pins files
 2016-05-14 15:49:22 -07:00
Scott Lahteine
c8a40f06a6 Merge pull request #3759 from thinkyhead/rc_more_printcounter 
Printcounter bugfix and some new features
 2016-05-14 15:36:31 -07:00
Scott Lahteine
585c8a918f Merge pull request #3758 from thinkyhead/rc_verbiage 
Tweaks to some verbiage
 2016-05-14 15:27:11 -07:00
João Brázio
f9a62f6a8e Added PRINTJOB_TIMER_AUTOSTART section to example config files 2016-05-14 15:22:45 -07:00
João Brázio
8a18c52002 Adds an option to disable print job timer auto start 2016-05-14 15:22:44 -07:00
João Brázio
a79267217b M78 now allows stats reset using the S78 argument 2016-05-14 15:22:44 -07:00
João Brázio
b660f1bdb8 Bugfix: Multiple M77 no longer increment the print counter 2016-05-14 15:22:43 -07:00
Scott Lahteine
c63f95f2fe Merge pull request #3748 from clexpert/patch-1 
Lastest changes in Czech translate
 2016-05-14 15:12:39 -07:00
Scott Lahteine
e01e52969e Merge pull request #3757 from thinkyhead/rc_fix_auto_fans 
Don't try to enable unused auto fans
 2016-05-14 15:09:24 -07:00
Scott Lahteine
ddf3e1e22d Tweaks to some verbiage 2016-05-14 15:06:09 -07:00
Scott Lahteine
a713043acd Merge pull request #3749 from esenapaj/patch-3 
Enclose all #error strings by double-quotes
 2016-05-14 15:01:56 -07:00
Scott Lahteine
3cfea3ff12 Merge pull request #3752 from AnHardt/fix-FIX_MOUNTED_PROBE 
G29 missing FIX_MOUNTED_PROBE condition
 2016-05-14 15:00:42 -07:00
Scott Lahteine
08dfe08f9a Merge pull request #3754 from jbrazio/feature/update-pt_PT 
Updated pt_PT language pack
 2016-05-14 15:00:12 -07:00
Scott Lahteine
596ebccd54 Merge pull request #3753 from jbrazio/feature/followup-3740 
Warn user about useless of individual axis homing and DELTA kinematics
 2016-05-14 14:59:49 -07:00
Scott Lahteine
6e3556cb75 Merge pull request #3746 from esenapaj/patch-2 
Update Japanese translation
 2016-05-14 14:57:43 -07:00
Scott Lahteine
ddac17a195 Add BEZIER_CURVE_SUPPORT (G5 XYZEFIJPQ) 2016-05-14 14:52:08 -07:00
Scott Lahteine
b4c891dfd2 Remove obsolete reference to prepare_arc_move 2016-05-14 14:51:09 -07:00
Scott Lahteine
9f6b8f7d5b Remove extra @section directive from configs 2016-05-14 14:51:09 -07:00
Scott Lahteine
4d6bb52b26 Don't try to enable unused auto fans 
Addressing #3743
 2016-05-14 14:46:14 -07:00
Scott Lahteine
f13c4a9ec4 Merge pull request #3720 from jbrazio/feature/host-keepalive 
Removes the DISABLE from HOST_KEEPALIVE
 2016-05-14 14:39:31 -07:00
João Brázio
596f15348d
Updated pt_PT language pack 2016-05-14 01:45:15 +01:00
João Brázio
d7522152e1
Warn user about useless of individual axis homing and DELTA kinematics 2016-05-14 01:35:05 +01:00
AnHardt
8a4376d51f Idle during long arcs 
Idle during long arcs
to prevent from watchdog resets during high segmented fast arcs.
 2016-05-14 00:29:13 +02:00
esenapaj
888443ca1e Enclose all #error strings with apostrophes 2016-05-13 21:10:23 +09:00
Petr Zahradnik
50b1a6bb2b Lastest changes in Czech translate 2016-05-13 13:51:13 +02:00
AnHardt
b74af78736 Make arc support (G2/G3) configurable 
Saves about 2669 bytes when deactivated. (About 1% for a AT2560, about __4%__ for a AT644!)
 2016-05-13 13:27:45 +02:00
AnHardt
aef2559bd8 fix-FIX_MOUNTED_PROBE 
Add a forgotten condition
 2016-05-13 12:07:17 +02:00
esenapaj
e9d851137d Update Japanese translation 
・Add new translation
 2016-05-13 18:52:35 +09:00
Scott Lahteine
14cd0f4c92 Merge pull request #3740 from thinkyhead/rc_lcd_home_options 
Individual Axis Homing LCD menu items
 2016-05-12 11:59:46 -07:00
esenapaj
69511b5e5e Follow-up the PR #3719(Harmonize LCD comment section) 
It update forgotten Configuration_DUAL.h.
 2016-05-12 19:16:36 +09:00
Scott Lahteine
675e92ab1f Merge pull request #3738 from thinkyhead/rc_limit_i2c_request 
Print an error on bad i2c request
 2016-05-11 19:36:49 -07:00
João Brázio
09150cae79 Individual Axis Homing LCD menu items 2016-05-11 19:28:19 -07:00
Scott Lahteine
4dc4e2063f Add REVERSE_ENCODER_DIRECTION option 2016-05-11 15:39:28 -07:00
Scott Lahteine
aaeadf0cbd If no "B" parameter given, get 1 byte 2016-05-11 15:30:08 -07:00
Scott Lahteine
a6d594665b Print an error on bad i2c request 
Reference: https://github.com/MarlinFirmware/Marlin/pull/3713#issuecomment-218333678
 2016-05-11 15:30:02 -07:00