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

9465 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dave Johnson
4718c09c48 Remove extraneous USBCON defines for AT90USB boards 
USBCON is definied by serial.h pullikng in MarlinConfig.h which in turn pulls in Arduino.h.  Defining in later includes has shown to cause compile issues so removing all extraneous calls for and potentially easier future linker troubleshooting.
more USBCON unification
 2017-07-23 16:41:48 -07:00
Scott Lahteine
21591352d7 Merge pull request #7340 from thinkyhead/bf_neopixel_rgbw 
Add support for Printrbot Neopixel RGBW strip.
 2017-07-22 16:19:12 -05:00
C. Scott Ananian
890e7a16a9 Add support for Printrbot Neopixel RGBW strip. 
Connected as described at http://printrbot.com/shop/led-strip/

Based on patch by Kelly Anderson <kelly@xilka.com> at
http://www.xilka.com/printrbot/marlin/1.1.4/20170707/
 2017-07-22 16:07:55 -05:00
Scott Lahteine
a059e95463 Bring Infitary i3 config up to date 2017-07-21 20:49:19 -05:00
Scott Lahteine
d6d6043548 Merge pull request #7338 from thinkyhead/bf_mks_ps_on_pin 
MKS 1.3+: Add pin mapping for PS_ON
 2017-07-21 20:00:26 -05:00
Scott Lahteine
03989824fa Merge pull request #7339 from thinkyhead/bf_russian_part_1 
Update Russian translation - Part 1
 2017-07-21 19:57:18 -05:00
Alexey Shvetsov
851f9f5399 Update Russian translation - Part 1 
Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
 2017-07-21 19:32:37 -05:00
Scott Lahteine
b7a16e4468 Merge pull request #7315 from fixoid/patch-1 
Fixing SWITCHING_EXTRUDER feature to work with HOTENDS > 1
 2017-07-21 19:10:54 -05:00
Alexey Shvetsov
f38b8c5bf8 MKS 1.3+: Add pin mapping for PS_ON 
This allows the use of D4 as PS_ON since MKS Gen doesn't have a PS_ON pin. However this effectively allows only 3 servos (instead of 4).

Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
 2017-07-21 18:50:05 -05:00
Scott Lahteine
60cb2bd4e7 Merge pull request #7332 from thinkyhead/bf_before_fwretract 
Improve FWRETRACT comments
 2017-07-21 00:20:56 -05:00
Scott Lahteine
8a3bc6be4d Improve FWRETRACT config options and commentary 
Add more details as requested in #7198
 2017-07-20 22:57:50 -05:00
Scott Lahteine
b0173ccdb9 Drop extra initializers for vars initialized by EEPROM code 2017-07-20 22:57:49 -05:00
Scott Lahteine
7afafb05b8 Split G10/G11 into separate functions 2017-07-20 02:24:13 -05:00
Scott Lahteine
c45798694f Add some more requirements to the G-code list 2017-07-20 02:24:13 -05:00
Scott Lahteine
72de280c1e BARICUDA valve pressure consistently uint8_t 2017-07-20 02:21:40 -05:00
Scott Lahteine
4d98e3f0a7 General cleanup 2017-07-20 02:21:40 -05:00
fixoid
e530c67349 Fixing SWITCHING_EXTRUDER feature 2017-07-19 21:15:26 +03:00
Tannoo
2ad3ca5d8a Bugfix (#7310) 2017-07-18 22:55:14 -05:00
Roxy-3D
37a6833d7e Allow the sampled point to be added into the Least Squares Best Fit (#7289) 
Without this...  The LSF won't work because none of the sampled points
in this code block get added.
 2017-07-13 16:33:02 -05:00
C. Scott Ananian
a519b093b9 Fix build by replacing qr_solve by least_squares_fit. (#7285) 
This was broken by 9af67e2446.
 2017-07-13 12:02:15 -05:00
Scott Lahteine
b9809ea86c Merge pull request #7281 from thinkyhead/bf_seen_not_volatile 
Fixes for recent merges
 2017-07-13 00:54:10 -05:00
Scott Lahteine
0873c667fa Apply coding standards to recent merges 2017-07-13 00:46:16 -05:00
Scott Lahteine
8c2907d10f Fix ABL broken by recent change 2017-07-12 22:56:18 -05:00
Roxy-3D
9af67e2446 Save 7714 bytes of program memory when doing AUTO_BED_LEVELING_LINEAR (#7276) 
We can save more and a pile of RAM by eleminating the eqnBVector and
EqnAMatrix arrays next.
 2017-07-10 19:05:11 -05:00
Scott Lahteine
e5904c4df8 Merge pull request #7275 from thinkyhead/bf_seen_not_volatile 
Volatile keyword not needed for parser.seen
 2017-07-10 16:11:08 -05:00
Scott Lahteine
76e90b93b7 Volatile keyword not needed for parser.seen 2017-07-10 15:38:54 -05:00
Scott Lahteine
f63f1ff12c Merge pull request #7272 from thinkyhead/bf_user_menu_stay 
Stay in User Menu after command. Add feedback.
 2017-07-10 15:10:07 -05:00
Jamie Bainbridge
00e4ced58e Stay in User Menu after command. Add feedback. 
When a user executes a User Menu command, the LCD returns to the main menu. If the user has multiple menu items they want to run, such as one menu item per bed leveling corner, then it's better to stay in the User Menu rather than return to the main menu.

This PR modifies Marlin to stay in the User Menu after a command.
 2017-07-10 13:47:12 -05:00
Scott Lahteine
1066b17457 Merge pull request #7260 from thinkyhead/bf_G33_update_27 
Updates to G33 and its LCD code
 2017-07-10 13:39:36 -05:00
Tannoo
e927941c06 Bugfix (#7265) 
Fix compile error when UBL is enabled but there is no LCD Panel.
 2017-07-08 09:44:50 -05:00
Scott Lahteine
68aea9c01d Merge pull request #7261 from thinkyhead/bf_configs_by_vendor 
Arrange more example configs by vendor
 2017-07-07 15:46:22 -05:00
Tannoo
aaacef9441 Corrections (#7231) 
20x4 map integration.    Also some minor changes to the UBL Menu layout.     Both 20x4 LCD's and Graphical LCD panels should have similar functionality now.
 2017-07-07 11:05:08 -05:00
LVD-AC
4bc79ec877 Updates for G33-LCD interface 2017-07-07 05:00:59 -05:00
Scott Lahteine
186580b55f Arrange example configurations by vendor 2017-07-07 04:48:23 -05:00
Scott Lahteine
6be369f3ea Add some config names to AUTHOR 2017-07-07 04:46:33 -05:00
Scott Lahteine
7fc31a7940 Merge pull request #7258 from thinkyhead/bf_cleanups_jbrazio 
Add support for BQ heated bed kit with Hephestos 2
 2017-07-07 04:11:07 -05:00
Scott Lahteine
11e376e920 Merge pull request #7256 from thinkyhead/bf_cleanup_july_6 
Assign -1 to LCD_PINS_D4-7 if not defined
 2017-07-07 03:22:47 -05:00
Scott Lahteine
a3aa798f6d Merge pull request #7257 from thinkyhead/bf_Creality_CR10 
Support for Creality CR-10
 2017-07-07 03:22:27 -05:00
João Brázio
2065591daf Add support for BQ heated bed kit with Hephestos 2 2017-07-07 03:10:38 -05:00
essgcee
61be28133d Support for Creality CR-10 
Creality board is a Melzi / Sanguinololu variant, but using different pins for LCD control (and maybe other minor variations)
 2017-07-06 23:08:10 -05:00
Scott Lahteine
9248a90a4c Assign -1 to LCD_PINS_D4-7 if not defined 2017-07-06 22:47:51 -05:00
Scott Lahteine
ce834bb78e Merge pull request #7255 from thinkyhead/bf_cleanup_july_6 
Use FastIO for spindle, probe test, and case light
 2017-07-06 22:03:27 -05:00
Scott Lahteine
5ef1e5ef60 Tweaks for M43 2017-07-06 21:47:50 -05:00
Scott Lahteine
c7732db99d Fix: Use of digitalRead, digitalWrite breaks on AT90USB 2017-07-06 21:25:56 -05:00
Scott Lahteine
f713f25fa5 Clean up excess whitespace 2017-07-06 21:24:30 -05:00
Scott Lahteine
2cb308fb53 Merge pull request #7253 from thinkyhead/bf_busy_protocol 
"Keepalive" is now "Busy protocol"
 2017-07-06 16:39:50 -05:00
Scott Lahteine
fc9ce65095 Add BUSY_WHILE_HEATING for hosts that need it 2017-07-06 16:28:57 -05:00
Scott Lahteine
504d26341a Merge pull request #7251 from thinkyhead/bf_simplify3d_workaround 
Patch M23 to work around Simplify3D bug
 2017-07-06 14:45:04 -05:00
Scott Lahteine
c6d430670a Clear SHOW_BOOTSCREEN with no LCD 2017-07-06 14:21:27 -05:00
Scott Lahteine
11c589c3ec Fix compile issue with G38 
Fixes #7250
 2017-07-06 14:21:27 -05:00