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

278 commits

Author SHA1 Message Date
InsanityAutomation
f889cc6ea6 ExtUI parity with SPI LCDs (#14172) 2019-05-30 16:24:13 -05:00
InsanityAutomation
0f04ba016f Adjust tool offset menus (#14153) 2019-05-27 21:29:08 -05:00
Scott Lahteine
c6d39319de Fix some whitespace 2019-05-26 16:18:43 -05:00
Robby Candra
df7733425c Shorten pause message for 4 line LCD (#14097) 2019-05-26 02:33:52 -05:00
InsanityAutomation
49e83dd7c8 BLTouch V3.1 changes (#14104) 2019-05-25 21:56:47 -05:00
teemuatlut
1c86fbc60b TMC updates, capture LCD changes (#14074) 2019-05-25 18:22:12 -05:00
Scott Lahteine
44caf70917 Improve editing, fix some small value editing 2019-05-25 15:29:00 -05:00
Scott Lahteine
612eaa87bd Fix "back" items in some sub-menus 2019-05-25 15:28:52 -05:00
Scott Lahteine
c5dc2e5a71 Update advanced BLTouch menu items 2019-05-25 15:26:25 -05:00
InsanityAutomation
9f69fbe5ee Move some menu items (#14118) 2019-05-25 15:16:00 -05:00
Scott Lahteine
cc862a8213 Replace some functions with lambdas 2019-05-22 16:54:35 -05:00
Scott Lahteine
7b4c3bd92a Fix call to synchronize in lcd_pause_job 2019-05-19 15:51:45 -05:00
FanDjango
85fb33a060 BLTOUCH tweaks, new v3.1 command (#14015) 2019-05-17 19:10:18 -05:00
InsanityAutomation
991ee7552b Restore menu edit to 32bit value (#13976) 2019-05-11 18:44:35 -05:00
InsanityAutomation
3f758d9e00 Fix some edit items for 16-bit encoder (#13948) 2019-05-09 18:28:47 -05:00
Scott Lahteine
ad4ffa1d2f
Use C++ language supported 'nullptr' (#13944) 2019-05-09 11:45:55 -05:00
InsanityAutomation
6811e2921b BLTouch v3 / 3DTouch Interoperability & performance (#13814) 2019-05-07 21:25:54 -05:00
Tanguy Pruvot
e7b3720b81 Menu edit accel in increments of 25 (#13850) 2019-05-04 17:21:58 -05:00
Marcio Teixeira
15357af67c Backlash cleanup (#13659) 
…And save backlash, fil. sensor, ExtUI userdata to EEPROM.
 2019-05-03 23:53:15 -05:00
Thomas Moore
ee243e4edf Fix mixing extruder filament change (#13803) 2019-05-01 21:55:58 -05:00
Chris Pepper
95beafa9a2
Fix typo 2019-05-01 16:30:21 +01:00
Clinton James
2740cc64d8 Add SD Release when no SD_DETECT_PIN exists (#13857) 2019-05-01 01:00:21 -05:00
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
Marcio Teixeira
ca7f6ff287 Fix MSG_En messages for consistency (#13788) 2019-04-23 13:31:51 -05:00
Jimmy Wennlund
e6f6ed76c8 Show UBL Activate/Deactivate menu for current state (#13744) 2019-04-18 13:13:05 -05:00
Bob-the-Kuhn
520585c5ed Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x 2019-04-17 15:34:29 -05:00
Marcio Teixeira
836435c5ef Fix action_edit int range bug (#13737) 2019-04-17 14:55:31 -05:00
Marcio Teixeira
866e2d41dc Correct range of LCD axis step editing (#13727) 2019-04-16 15:45:31 -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
7e58d33a2e Update some headers 2019-04-12 13:04:04 -05:00
Robby Candra
9e86fc3831 Require homing to toggle leveling (#13652) 2019-04-11 14:09:41 -05:00
chai-md
2adc37becc MAGNETIC_SWITCHING_TOOLHEAD (#13629) 2019-04-11 13:29:17 -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
ae42206500 Fix SD_REPRINT_LAST_SELECTED_FILE 2019-04-10 17:43:08 -05:00
InsanityAutomation
4900c28bf6 Fix IDEX tool-change, and more (#13614) 2019-04-09 18:33:40 -05:00
Scott Lahteine
9cb5c57b84 Adjustments to ui8tostr_percent 2019-04-08 21:47:50 -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
fae2b7edc3 Update MMU2 code style 2019-04-08 18:13:42 -05:00
Scott Lahteine
9abe9aff56
Confirm before starting SD print (#13616) 2019-04-08 13:44:35 -05:00
Ludy
c29820f649 Suppress compile warning (#13612) 2019-04-07 16:53:30 -05:00
Roxy-3D
9cee81d47e Option to show babysteps total since G28 (#13580) 2019-04-06 18:04:34 -05:00
Scott Lahteine
027a901bec Trim whitespace 2019-04-05 15:04:23 -05:00
drzejkopf
0992d1a4c8 Fix Invaders game compile error (#13575) 2019-04-04 23:13:11 -05:00
Scott Lahteine
83e214478e Click-hold to exit Invaders, fix Brickout compile 2019-04-04 17:07:50 -05:00
Scott Lahteine
240ea1bbb3 Split up games into separate files 2019-04-04 03:06:19 -05:00
Scott Lahteine
10b9632bed Fix menu history item selection 2019-04-04 02:41:23 -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
Marcio Teixeira
5679fae11e UltraLCD enhancements (lower fan resolution, backlash menu) (#13519) 2019-03-29 14:07:43 -05:00
Thomas Moore
13a12f8a87 Fix UBL mesh editor on delta (#13478) 2019-03-25 22:04:57 -05:00
Thomas Moore
02dc72acb6 Disable ABL when leveling corners (#13471) 2019-03-24 20:01:18 -05:00
InsanityAutomation
5eeffab5e5 Fix BLTouch Menus (#13441) 2019-03-23 22:58:34 -05:00
Scott Lahteine
d8329d858d Default argument to defer_status_screen 2019-03-23 16:33:37 -05:00
drzejkopf
70e6a3db8a Add LEVEL_CORNERS_HEIGHT to LEVEL_BED_CORNERS (#13439) 2019-03-20 18:26:12 -05:00
Scott Lahteine
b376c7e374 Group DISABLED items 2019-03-17 07:56:35 -05:00
InsanityAutomation
691e5c3bb8 BLTouch V3.0 support (#13406) 2019-03-17 05:57:25 -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
InsanityAutomation
09eb30dc05 IDEX Mirror mode based on Formbot / Vivedino Symmetric mode (#13404) 2019-03-15 22:46:27 -05:00
Scott Lahteine
9a515cbd32
Fix Pause Print message and behavior (#13394) 2019-03-14 02:26:07 -05:00
Scott Lahteine
f89b375fb9
Fixes and improvements for PWM pins (#13383) 2019-03-13 06:51:15 -05:00
Scott Lahteine
87162658c4
Fix and improve software endstops (#13386) 2019-03-13 05:48:36 -05:00
Scott Lahteine
d94e077901 Apply HAS_HOTEND_OFFSET where needed 2019-03-11 20:58:27 -05:00
Scott Lahteine
e52bcc9408 Limit top bed temp to BED_MAXTEMP - 10 
The chances of a 10° overshoot is pretty minimal.
 2019-03-11 16:32:34 -05:00
3dlabsio
645ca7af7a M141 Heated Chamber, Temperature rework (#12201) 2019-03-07 02:09:39 -06:00
Scott Lahteine
44571775bd Further support for 6 extruders 2019-03-07 01:00:56 -06:00
Scott Lahteine
4771e372a1
Update criteria for PAUSE/RESUME/STOP menu items (#13294) 2019-03-05 06:46:06 -06:00
Scott Lahteine
2f1e1dcb42 Gradual step towards EXTRUDERS 0 support 2019-03-01 01:51:24 -06:00
InsanityAutomation
eb4bf93ea4 Add more Babystep options (#13262) 2019-02-27 04:38:56 -06:00
AnHardt
31b0be74af Fix autotemp_factor menu setting (#13226) 
Fix #12643
Only factors above 1 can have a 'positive' effect.
 2019-02-22 15:30:17 -06:00
InsanityAutomation
d4ed9b3ef1 Babystep also requires homing (#13191) 2019-02-17 14:35:45 -06:00
InsanityAutomation
ca7b2f574f Fix condition on tool change filament swap menu (#13190) 2019-02-17 12:33:46 -06:00
Roman Moravčík
567d03a269 Update Slovak language (#13187) 2019-02-17 12:29:49 -06:00
Scott Lahteine
7cf9b93f26 Add HAS_FILAMENT_SENSOR ahead of 12962 2019-02-12 20:13:20 -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
3983cacbcf No extern needed for func decl 2019-02-10 05:38:27 -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
LinFor
7ee35c2611 PID_MENU option to save PROGMEM in LCD menus (#13095) 2019-02-10 04:03:18 -06:00
Scott Lahteine
f269766408 Put the MMU2 menu with the others 2019-02-06 17:38:46 -06:00
InsanityAutomation
413e303ad5 More Advanced Pause options (#12984) 2019-02-06 06:39:42 -06:00
Scott Lahteine
2f8e89adc3 Remove extraneous ui. prefixes 2019-02-05 19:04:37 -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
Marcio Teixeira
f6edd2c472 Move stepper settings to "Advanced Settings" menu (#13063) 2019-02-01 18:07:04 -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
Scott Lahteine
17a8c37148 Label menu edit items 2019-01-28 20:20:46 -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
teemuatlut
e5801b75f8 Fix TMC-related compile issues. (#12971) 
- `STEALTHOP_[XYZE]` configuration options now set the default state.
 2019-01-20 23:54:57 -06:00
InsanityAutomation
a1cf49935d Add laser control menu (#12883) 2019-01-20 23:41:47 -06:00
InsanityAutomation
75f2665f2e LCD SD Card items near top when not using wheel (#12926) 2019-01-20 23:24:53 -06:00
Scott Lahteine
0495fcd475 Minor spacing fix 2019-01-20 00:10:50 -06:00
Ludy
acf266fe78 Fix a compile warning, etc. (#12955) 2019-01-19 18:47:29 -06:00
teemuatlut
e6805582a6 M569 to change stepping mode. Add new TMC section to LCD. (#12884) 2019-01-17 13:17:16 -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
mikeshub
7fde8d9d1e Add CreatorPro / Makerbot / QIDI / etc and Mightboard RevE support (#12855) 
- Fix a bug in MAXxxxx thermocouple temp reporting.
- Add support for 3-wire HD44780.
- Add support for PCA9533 RGB driver.
- Add configuration examples for FlashForge CreatorPro.
 2019-01-14 14:29:55 -06:00
Scott Lahteine
3644c940bf Tweak SD section of Main Menu 2019-01-13 18:00:07 -06:00
teemuatlut
1a79878dff Remove TMC_Z_CALIBRATION in favor of Z_STEPPER_AUTO_ALIGN 2019-01-12 18:07:28 -06:00
Scott Lahteine
eb78aed863
Rename LCD menus according to variable types (#12892) 2019-01-12 16:01:04 -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
Scott Lahteine
19fea772e5 Use E_AXIS_N where it makes sense 2019-01-11 19:42:34 -06:00
Ondřej Nový
a0ef6198ff Level bed corners Z-hop height option (#12858) 2019-01-10 19:15:17 -06:00
Scott Lahteine
e6484d9dab Return to status when SD card is removed 2019-01-10 15:43:31 -06:00
Marcio Teixeira
60cb36bef3 Misc. improvements (#12747) 
* Make ExtUI respect MAXTEMP limits
  - Temperatures are now clamped by MAXTEMP limits rather than arbitrary values.
* Speed up USB init, add status
  - Speed up USB initialization
  - Show status message if init failed
* Enable status messages for EXTENSIBLE_UI
* Adjust max limit to MAX_TEMP - 15
* Misc. tweaks to formatting, const, etc.
 2019-01-01 15:17:48 -06:00
InsanityAutomation
14ddda285c Confirmation on Abort SD print (#12717) 2018-12-27 11:36:39 -06:00
Luc Van Daele
c6e09c2689 [2.0.x] G33 clean up (#12648) 
Remove obsolete workarounds in G33 for the now fixed zprobe_zoffset bug
 2018-12-18 12:43:38 -06:00
Scott Lahteine
18fedafbc5 Refresh screen on SD Init 2018-12-08 15:31:59 -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
c986239837
A single SERIAL_ECHO macro type (#12557) 2018-11-29 16:58:58 -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
Scott Lahteine
fd2998efd5
Revert ADC_KEYPAD direction behavior (#12508) 2018-11-22 06:00:00 -06:00
Scott Lahteine
d51e5690f4 Don't show updir with no card present 2018-11-20 07:01:46 -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
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
d82c350de7
Miscellaneous LCD code renaming, reordering (#12430) 
* Move special characters to language.h
* Apply some naming standards
* Clean up menu item draw functions
* Rename some Temperature methods
* UI => ExtUI
 2018-11-14 13:13:51 -06:00
Scott Lahteine
143b2896e0
Add M412 to enable/disable filament runout detection (#12406) 2018-11-12 21:29:46 -06:00
AnHardt
be6271767f Fix BABYSTEP_ZPROBE_OFFSET (#12408) 
Fix #12399

Did not compile without  `WATCH_HOTENDS || WATCH_THE_BED`.
Add condition to include "../../module/temperature.h".
 2018-11-12 17:44:21 -06:00
Scott Lahteine
50af1d1e08 Differentiate translated On/Off from Serial ON/OFF 2018-11-12 17:23:08 -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
InsanityAutomation
6471a75a22 Combine more tool-change variables (#12137) 2018-11-06 22:22:20 -06:00
Scott Lahteine
488a17b3f5 Use IS_SD_PRINTING() more 2018-11-06 20:55:17 -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
Roman Moravčík
34ea458667 Fixed advanced pause messages (#12353) 2018-11-06 15:27:19 -06:00
Scott Lahteine
4c5ca89d8c
Show the appropriate pause message (#12348) 2018-11-06 04:13:48 -06:00
Marcio Teixeira
8517d5f915 LCD menu code refactoring and cleanup (#12308) 2018-11-05 22:51:10 -06:00
Scott Lahteine
93d5b945dd Hide mesh editing until a valid mesh exists 2018-11-05 05:13:34 -06:00
Scott Lahteine
fed84f2961 Use multiplier edit item for mesh point editing 2018-11-05 04:17:37 -06:00
KangDroid
82ff7c6542 Add a mesh edit menu for MBL / ABL-Bilinear 2018-11-04 19:07:47 -06:00
Scott Lahteine
fc84878cba MSG_UBL_EDIT_MESH_MENU => MSG_EDIT_MESH 2018-11-04 19:06:10 -06:00
Scott Lahteine
60dbd8161c Fix VMAX editing 
Fix #12326
 2018-11-04 07:06:14 -06:00
Scott Lahteine
d1ff22b983 Revive SCARA's home offset (unimplemented) 2018-11-03 06:24:41 -05:00