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

147 commits

Author SHA1 Message Date
Robby Candra
d2d71caa3b Clean up Touch pins. Better up/down touch response. (#14900) 2019-08-10 01:42:52 -05:00
Ludy
528c9885f2 Fix wait_for_user + PAUSE_BEFORE_DEPLOY_STOW issue (#14831) 2019-08-08 01:52:20 -05:00
Tim Moore
940c59d9da Overlord i2c LCD with LEDs and buzzer (#14801) 2019-08-02 06:19:45 -05:00
Robby Candra
128eed6b57 Option to reverse select direction/buttons (#14693) 2019-07-30 17:42:57 -05:00
Marcio Teixeira
eefe3f595a New options: Bootscreen as Info, game Easter-egg (#13829) 2019-07-28 22:47:20 -05:00
Ludy
c4bb458763 BUZZ cleanup (#14760) 2019-07-28 19:14:50 -05:00
Marcio Teixeira
ca4d6f4470 Fix compile error (bad return type) (#14660) 2019-07-17 19:49:26 -05:00
Robby Candra
c9aa68ef7a Encoder direction: Wrangle, Revert select screen change (#14628) 2019-07-17 19:41:15 -05:00
Marcio Teixeira
27c487bab7 Print progress enhancements (#14647) 2019-07-17 03:14:44 -05:00
Tanguy Pruvot
81d629bc47 Robin & Longer3D SPI TFT driver (#14595) 2019-07-14 18:16:26 -05:00
Scott Lahteine
750a16ad38 Fix MIN/MAX function collision with macros 2019-07-05 18:14:02 -05:00
Scott Lahteine
10b85be405 status_message_level => alert_level 2019-07-01 00:47:08 -05:00
Scott Lahteine
93cd66ac11 Tweaky change from (C) to (c) 2019-06-27 23:58:16 -05:00
Scott Lahteine
651f3eeed0 Clean up trailing whitespace 2019-06-17 20:22:07 -05:00
InsanityAutomation
b7eeb5b13b Move BLTouch options to adv config (#14131) 
Plus other BLTouch and menu enhancements.
 2019-06-10 17:46:42 -05:00
InsanityAutomation
f889cc6ea6 ExtUI parity with SPI LCDs (#14172) 2019-05-30 16:24:13 -05:00
Scott Lahteine
ad4ffa1d2f
Use C++ language supported 'nullptr' (#13944) 2019-05-09 11:45:55 -05:00
Scott Lahteine
23ec650410 Consolidate Malyan LCD and ExtUI 2019-05-07 21:31:30 -05:00
Scott Lahteine
5051909c3c
Update do_select_screen for general use (#13800) 2019-04-24 10:13:44 -05:00
Scott Lahteine
321a5e6580
Fix SD card reselect when scrolled (#13624) 
- Change encoder position to 16-bit integer.
- Fix `SD_REPRINT_LAST_SELECTED_FILE` when the screen is scrolled.
 2019-04-08 21:10:41 -05:00
Scott Lahteine
9abe9aff56
Confirm before starting SD print (#13616) 2019-04-08 13:44:35 -05:00
Scott Lahteine
7e0008f5b3 Fix SETCURSOR_RJ 2019-04-07 20:25:54 -05:00
Scott Lahteine
10b9632bed Fix menu history item selection 2019-04-04 02:41:23 -05:00
Scott Lahteine
d8329d858d Default argument to defer_status_screen 2019-03-23 16:33:37 -05:00
Scott Lahteine
58bca67883 Unify status scrolling further 2019-03-17 07:56:35 -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
Ludy
59353546e8 Fix BUTTON_EXISTS and misplaced comma (#13411) 
Fixes #13410 and redeclaration of `BUTTON_EXISTS`
 2019-03-16 11:59:12 -05:00
Scott Lahteine
9a515cbd32
Fix Pause Print message and behavior (#13394) 2019-03-14 02:26:07 -05:00
7eggert
10c8c034bd Allow both encoder and ADC keypad (#13355) 2019-03-11 18:10:56 -05:00
Scott Lahteine
0feeef2604 Update copyright in headers 2019-02-12 15:30:11 -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
Marcio Teixeira
902d5b0f8b Allow ExtUI to use LCD_SET_PROGRESS_MANUALLY (#12628) 2018-12-12 17:21:37 -06:00
Scott Lahteine
fd2998efd5
Revert ADC_KEYPAD direction behavior (#12508) 2018-11-22 06:00:00 -06:00
Scott Lahteine
c5642a894f
Fix ADC_KEYPAD middle button (#12493) 2018-11-20 21:39:30 -06:00
Scott Lahteine
817a37169a Apply/unapply const here and there 2018-11-20 06:44:21 -06:00
Ludy
1f93d2bcf7 Fix LCD compile error, etc. (#12472) 2018-11-18 20:39:49 -06:00
Scott Lahteine
826d570162
Combine Travis CI option-setting commands (#12474) 2018-11-18 19:58:02 -06:00
Marcio Teixeira
c1e17037e5 Various fixes for MarlinUI and ExtUI (#12439) 2018-11-17 22:21:44 -06:00
Ludy
93e958f695 Fix compile error with ZONESTAR_LCD+NO_LCD_MENUS (#12466) 2018-11-17 21:21:30 -06:00
Scott Lahteine
3e9ffaddb6
Consolidate, optimize some LCD menu code (#12450) 2018-11-16 21:44:48 -06:00
Scott Lahteine
f4c128ecaa
Move RRW keypad code to a common method (#12429) 2018-11-14 06:00:21 -06:00
Scott Lahteine
54ec5528a0 hasstatus => has_status 2018-11-14 01:34:28 -06:00
Scott Lahteine
0ee1a92971
Group status methods, share reset_status with Extensible UI (#12414) 
* Group status methods, share reset_status with Extensible UI
* Move common DOGM code to headers
 2018-11-13 01:47:45 -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
6093df11dc
Allow G26 to use the active extruder (#12387) 
* Make lcd_quick_feedback argument optional
* Add click_to_cancel option to wait_for_hotend/bed
* Have G26 use the active nozzle and wait_for_hotend/bed
* Use wait_for_release in UBL G29
* Add 'T' parameter to G26 for an initial tool-change
 2018-11-10 18:07:38 -06:00
Scott Lahteine
4ed6397e5d
More comprehensive NO_LCD_MENUS (#12367) 2018-11-09 00:07:16 -06:00
Scott Lahteine
e574f01568
More advanced pause tweaks (#12356) 
* Followup to LCD_TIMEOUT_TO_STATUS=0
* Make continuous purge screen fit 20x4
* Unify purge message modes
* Preserve last-set pause header mode
 2018-11-06 19:25:57 -06:00
Marcio Teixeira
8517d5f915 LCD menu code refactoring and cleanup (#12308) 2018-11-05 22:51:10 -06:00
Scott Lahteine
44fa7fb18c Cleanups for leveling-related code 2018-11-04 19:07:47 -06:00
Ludy
5ba6607181 Fix keypad-related compile error (#12306) 2018-11-02 22:29:32 -05:00
Scott Lahteine
eb5600acd2 Add parentheses to LCD_CLICKED 2018-11-01 15:06:14 -05:00
N95JPL
b780b69c62 Use font ascent and descent for line positioning (#12224) 2018-10-30 22:39:44 -05:00
Scott Lahteine
3583e2b449
Followup to Menu Refactor (#12275) 2018-10-30 16:34:45 -05:00
Scott Lahteine
a489c9fa52 Move Motion Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
a964f098b3 Make dogm status screen a CPP 2018-10-28 15:46:45 -05:00
Scott Lahteine
774a6e8199 Drop TALL_FONT_CORRECTION 2018-10-28 15:46:45 -05:00
Scott Lahteine
c825c419d4 Convert DOGM / HD44780 impl to CPP files 2018-10-28 15:46:45 -05:00
Scott Lahteine
2bf18950ab Refactor LCD menus 2018-10-28 15:46:45 -05:00
Scott Lahteine
bf9dd4f4cf
Add helpers for custom text in menu items (#12214) 
For some features it can be useful to write custom text in a menu item. This commit provides helpers to make this easier.
 2018-10-25 15:17:53 -05:00
Marcio Teixeira
fc31da1114 Implement custom delay/millis for EXTENSIBLE_UI (#12188) 2018-10-22 19:37:48 -05:00
TheSFReader
1fb9b299d4 Add M524 to abort SD printing (#12155) 2018-10-19 14:25:07 -05:00
Marcio Teixeira
906a24fa81 Extensible user interface API (#11193) 2018-10-08 15:44:05 -05:00
Scott Lahteine
d6b0fbd771
Use uint8_t for all fan speeds (#12032) 2018-10-07 15:34:41 -05:00
Scott Lahteine
3019713402 Reorganize some enums 2018-10-01 05:32:55 -05:00
Scott Lahteine
11ac75edcb
Use PGM_P for PSTR pointers (#11977) 2018-09-30 23:44:33 -05:00
InsanityAutomation
1104054d73 2.0 IDEX Independent z offset and other fixes (#11862) 
* Add Formbot Raptor board

Co-Authored-By: InsanityAutomation <insanityautomation@users.noreply.github.com>

* Add a second Z probe Z offset

Co-Authored-By: InsanityAutomation <insanityautomation@users.noreply.github.com>

* Modify method to utilize live adjustment of hotend z offset

Should probably move config option to babystepping and rename as it may now apply to all multiextruder systems

* Move config item and catchup other code to current method
 2018-09-24 09:40:48 -05:00
Scott Lahteine
d882717d98
Save some PROGMEM with constexpr (#11798) 
When possible, make `active_extruder` a `constexpr` to save some PROGMEM.
 2018-09-10 23:09:26 -05:00
Scott Lahteine
ee333f6be2 Followup to endstops tweaks 2018-05-22 20:41:03 -05:00
Scott Lahteine
1af98519cd Group and adjust LCD buttons code 2018-05-22 00:37:45 -05:00
Scott Lahteine
0ea60d506a Clear up LCD-related compile issues 2018-05-15 00:06:59 -05:00
Scott Lahteine
05c33833e7
[2.0.x] Add NO_LCD_MENUS option (#10582) 2018-04-30 21:16:31 -05:00
xC0000005
24d23ce49b Fix function definitions for Malyan LCD 2018-04-23 16:56:37 -05:00
Scott Lahteine
3396671011
[2.0.x] Reset LCD status to fallbacks (#10470) 
* Remove obsolete strings
* Tweak some static consts
* Reset LCD status to fallbacks
 2018-04-22 00:16:30 -05:00
Scott Lahteine
6c7a17dba6
Abort SD printing more safely (#10407) 
Allow the current command to complete when aborting an SD print, otherwise some commands (G28, G29, etc.) will cause trouble.
 2018-04-15 18:27:54 -05:00
Yunhui Fu
c96412a78f [2.0.x] UTF-8 language translation support (#10213) 2018-04-12 20:14:01 -05:00
Luc Van Daele
646aa20b43 Overhaul of G33 Delta Calibration (#8822) 2018-04-11 21:14:48 -05:00
Scott Lahteine
bd0967ad87 Fix BTN_BACK 
Followup to #9835
 2018-02-28 03:26:28 -06:00
Scott Lahteine
35ec67885a
Add support for BACK button (RADDS) (#9835) 2018-02-26 22:52:57 -06:00
Scott Lahteine
e5ee0b6f6c Implement MALYAN_LCD 2018-02-04 18:52:44 -06:00
Roxy-3D
f5f1b069ad
Convert UBL mesh tilting to all use the same algorithm (#9204) 
A number of regressions were patched also. The UBL G29 P2 and P4 Press and Hold had stopped working. It is very possible this is broken in the bugfix_v1.1.x branch also.

The main purpose of the Pull Request is to get the 3-Point mesh tilting to use the LSF algorithm just like the grid based mesh tilt. This simplifies the logic and reduces the code size some what. But the real reason to do it is the 3-Point case can be solved exactly. And by feeding these numbers into the LSF algorithm it provides a way to check all that code for 'correctness'.
 2018-01-16 11:08:00 -06:00
Bob-the-Kuhn
e633ce06c7 LCD contrast type mismatch is back 
WORKS!
 2018-01-11 10:32:58 -06:00
Scott Lahteine
7541316bb4 Add M701/M702 Filament Load/Unload, M603 2018-01-04 15:07:37 -06:00
Scott Lahteine
c846388a65 Standardize LCD interface code for UBL a little 2017-12-06 21:50:54 -06:00
Scott Lahteine
3748c28924 Fix MBL G29 without LCD 
Addressing https://github.com/MarlinFirmware/Marlin/pull/8575#discussion_r154536617
 2017-12-05 01:57:45 -06:00
Scott Lahteine
276271e72f Make MBL work more like PROBE_MANUALLY 2017-11-27 02:12:29 -06:00
Scott Lahteine
c6b0c104bb Adapt G26 to work for all meshes 2017-11-23 22:31:37 -06:00
Scott Lahteine
25af9decfe Remove enum.h include of MarlinConfig.h 2017-11-19 15:43:38 -06:00
Scott Lahteine
6d6c3b1e97 Fix up REPRAPWORLD_KEYPAD defines 2017-11-13 22:14:54 -06:00
Scott Lahteine
82f45c3e6a Patch G33 misuse of PROBE_MANUALLY 2017-11-08 00:36:06 -06:00
Scott Lahteine
f8393a0908 Operate in Native Machine Space 2017-11-04 00:05:38 -05:00
Scott Lahteine
8949c8c0a5 Move SD_REPRINT_LAST_SELECTED_FILE to ultralcd.cpp 2017-10-29 22:45:18 -05:00
Scott Lahteine
5c4f3e0107 Add LCD_SET_PROGRESS_MANUALLY 2017-10-15 03:05:29 -05:00
Scott Lahteine
a8b8d4e85e Add a typedef for MENU_ITEM(function,…) functions 2017-10-02 23:33:57 -05:00
Scott Lahteine
381b17e6a9 Move M18_M84, M85 to cpp 2017-09-21 16:26:59 -05:00
Scott Lahteine
e0a189a481 Consolidate Buzzer 2017-09-21 16:26:45 -05:00
Scott Lahteine
0fcec02db5 LCD updates 2017-09-21 16:26:42 -05:00
Scott Lahteine
cc92e544a5 Move 'lcd' files 2017-09-12 14:51:04 -05:00
Renamed from Marlin/ultralcd.h (Browse further)