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

47 commits

Author SHA1 Message Date
Bob-the-Kuhn
db89fc0304 Revert "bring my copy up to date" 
This reverts commit 503905c628.
 2019-04-25 17:38:41 -05:00
Bob-the-Kuhn
503905c628 bring my copy up to date 2019-04-25 12:08:49 -05:00
Bob-the-Kuhn
73726d56b3 Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x 2019-04-25 12:06:01 -05:00
Scott Lahteine
5051909c3c
Update do_select_screen for general use (#13800) 2019-04-24 10:13:44 -05:00
Bob-the-Kuhn
9dd4252b39 Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x 2019-04-12 22:07:12 -05:00
Scott Lahteine
9898f53361 Fix missing IS_SD_PRINTING 2019-04-10 21:48:16 -05:00
Scott Lahteine
1e59a2ac73 Hide pause/stop unless active printing 2019-04-10 19:46:59 -05:00
Scott Lahteine
240ea1bbb3 Split up games into separate files 2019-04-04 03:06:19 -05:00
Scott Lahteine
8b7c3eec83 Games, for fun (and stress-testing) (#13464) 2019-04-01 17:48:54 -05:00
Scott Lahteine
5de7b5b35e
Games, for fun (and stress-testing) (#13464) 2019-04-01 15:43:48 -05:00
Scott Lahteine
49cf92dc36
Extended condition macros (#13419) 
Allow `ENABLED`, `DISABLED`, `PIN_EXISTS`, and `BUTTON_EXISTS` to take multiple arguments. Also add:
- Alias `ANY(...)` for `!DISABLED(...)`
- Alias `ANY_PIN(...)` for `PIN_EXISTS(a) || PIN_EXISTS(b) ...`
- Alias `EITHER(A,B)` for `ANY(...)`
- Alias `ALL(...)` and `BOTH(A,B)` for `ENABLED(...)`
- `NONE(...)` for `DISABLED(...)`
 2019-03-16 23:43:06 -05:00
Scott Lahteine
9a515cbd32
Fix Pause Print message and behavior (#13394) 2019-03-14 02:26:07 -05:00
Scott Lahteine
4771e372a1
Update criteria for PAUSE/RESUME/STOP menu items (#13294) 2019-03-05 06:46:06 -06:00
revilor
e56c13670d Service interval watchdog (#13105) 2019-02-12 15:58:56 -06:00
InsanityAutomation
7f1b69b0c8 Add HOST_PROMPT_SUPPORT (#13039) 2019-02-12 15:55:47 -06:00
Scott Lahteine
0feeef2604 Update copyright in headers 2019-02-12 15:30:11 -06:00
Scott Lahteine
3e2a4c3b26 Show mixer and temperature menus while printing 2019-02-11 16:52:47 -06:00
Scott Lahteine
6de3d34378
M166 Gradients, LCD Menu for 2-channel Mixer (Geeetech A10M/A20M) (#13022) 2019-02-10 04:54:23 -06:00
Scott Lahteine
f269766408 Put the MMU2 menu with the others 2019-02-06 17:38:46 -06:00
Scott Lahteine
d97bb4c41c Followup to e10943d0 2019-02-04 06:11:31 -06:00
Scott Lahteine
e10943d0d8 Minor tweak to main menu 2019-02-04 04:58:31 -06:00
Scott Lahteine
0a7ea7063f Hide Resume Print when not relevant 2019-02-04 03:02:44 -06:00
revilor
6a57d0b381 Prusa MMU2 (#12967) 2019-01-31 19:10:52 -06:00
InsanityAutomation
7d927b6691 Move Z Probe Z Offset from Advanced to basic Configuration (#13056) 2019-01-30 21:08:36 -06:00
Giuliano Zaro
31e213e427 Always show Tune sub-menu (#13049) 2019-01-30 21:05:55 -06:00
Giuliano Zaro
a79d80c78e Minor cleanup of pause code (#13030) 2019-01-27 23:10:25 -06:00
InsanityAutomation
48a3502656 Remote streamer improvements (#12982) 2019-01-27 22:43:13 -06:00
Scott Lahteine
6453b82a5e Clean up trailing whitespace 2019-01-23 15:57:01 -06:00
InsanityAutomation
75f2665f2e LCD SD Card items near top when not using wheel (#12926) 2019-01-20 23:24:53 -06:00
InsanityAutomation
59b18aaeef Allow resume from pause with parking enabled (#12893) 
Currently, Pause of an SD-Memory card print does not work.    This has been verified to resolve the issue by multiple people.   

I understand more work needs to be done to resolve some of the concerns...
 2019-01-15 07:58:54 -07:00
Scott Lahteine
3644c940bf Tweak SD section of Main Menu 2019-01-13 18:00:07 -06:00
InsanityAutomation
082f6a27de ADAPTIVE_FAN_SLOWING extension to hotend thermal protection (#12853) 2019-01-12 00:41:48 -06:00
InsanityAutomation
a403d9a50c Improve menu pause / resume (#12876) 2019-01-11 20:42:11 -06:00
InsanityAutomation
14ddda285c Confirmation on Abort SD print (#12717) 2018-12-27 11:36:39 -06:00
Scott Lahteine
261c6f4b96 Fix pause/resume SD print 
Followup to #12551, addressing #12566
 2018-11-30 19:23:08 -06:00
Scott Lahteine
0c1cd9f590 Fix "No SD Card" indicator 2018-11-29 12:35:31 -06:00
Scott Lahteine
03ef2d6c82
Fix "paused" message and M125 called by M25 (#12551) 2018-11-28 19:28:31 -06:00
Scott Lahteine
cecc238f68 Save recovery info on SD pause 2018-11-27 14:42:19 -06:00
Marcio Teixeira
c1e17037e5 Various fixes for MarlinUI and ExtUI (#12439) 2018-11-17 22:21:44 -06:00
Scott Lahteine
8ebb4dc294 Followup to static CardReader 2018-11-17 07:52:35 -06:00
Scott Lahteine
66580f32c2
Make CardReader class static (#12451) 
* Make CardReader a static class
* Make CardReader flags into bitfields
 2018-11-16 22:39:16 -06:00
Scott Lahteine
d97e31db4c
Optimize Power-Loss Recovery (#12440) 2018-11-16 20:47:07 -06:00
Scott Lahteine
a0c795b097
Encapsulate common display code in a singleton (#12395) 
* Encapsulate common LCD code in a singleton
* Depend more UBL code on UBL_DEVEL_DEBUGGING
  - Since most users don't need the debugging on at all times, this helps reduce the default build size for UBL by over 2K, a little closer to fitting on 128K boards.
 2018-11-11 12:16:24 -06:00
Scott Lahteine
488a17b3f5 Use IS_SD_PRINTING() more 2018-11-06 20:55:17 -06:00
Scott Lahteine
0161d3f733 Move Custom User Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
a489c9fa52 Move Motion Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
829effc1fe Move Main Menu to its own file 2018-10-28 15:46:45 -05:00