CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,185 Commits 1 Branch 0 Tags 107 MiB
59d39d7655
Commit Graph

6185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine
5a8918c9ec Merge pull request #3911 from epatel/marlin/mbl_3903_example_configs 
MBL: Apply PR 3903 to example_configurations
 2016-05-30 01:01:04 -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
7ba8f2dbc3 Merge pull request #3906 from thinkyhead/rc_fix_travis_helpers 
Less greedy regex in travis helper scripts
 2016-05-30 00:27:41 -07:00
Scott Lahteine
2805bf3d82 Less greedy regex in travis helper scripts 2016-05-30 00:26:52 -07: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
189e60db55 Merge pull request #3909 from thinkyhead/fix_array_inits 
Fix some array initializations
 2016-05-29 21:02:20 -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
Scott Lahteine
6cdae35261 Merge pull request #3822 from jbrazio/cleanup/hires-logo 
Cleanup the Marlin logo with a hires svg version
 2016-05-23 13:55:42 -07:00
Scott Lahteine
714d526614 Merge pull request #3828 from AnHardt/hw-endstops-default 
Correct hardware endstops default
 2016-05-23 13:55:02 -07:00
João Brázio
05a041cb13
Cleanup the Marlin logo with a hires svg version 2016-05-23 14:50:54 +01: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
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
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
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