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

9410 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Roxy-3DPrintBoard
3d7d034fad Merge pull request #3932 from boelle/patch-1 
initial changes to DA
 2016-05-31 07:34:29 -05: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
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