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

702 commits

Author SHA1 Message Date
Scott Lahteine
ef81b5f03e Link to font docs in ultralcd_DOGM.cpp 2018-12-07 19:10:55 -06:00
Scott Lahteine
64389acdf1 Print a space after scrolling status 2018-12-03 06:17:09 -06:00
Scott Lahteine
7a361ad36a
Alternative fan image option (#12579) 
* Alternative fan bitmap
* Move bed over by 3px
 2018-12-03 05:55:33 -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
2224a4d61a Remove AVR-only MARLIN_DEV_MODE code 2018-11-30 17:54:24 -06:00
Scott Lahteine
c986239837
A single SERIAL_ECHO macro type (#12557) 2018-11-29 16:58:58 -06:00
Scott Lahteine
69d869c3d9 Tweak FR icon. Update font data. 2018-11-29 12:59:30 -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
61db0b65b6 Followup to heating progress 2018-11-28 14:47:43 -06:00
Scott Lahteine
4f9ec9ab45
Add heating progress bars (#12543) 2018-11-27 21:15:52 -06:00
Scott Lahteine
01b5c810d5 Space out multiple edit lines a bit 2018-11-27 18:10:19 -06:00
Scott Lahteine
cecc238f68 Save recovery info on SD pause 2018-11-27 14:42:19 -06:00
Ludy
e5019a0481 Fix English special symbols (#12529) 2018-11-25 18:19:12 -06:00
Roman Moravčík
d545f984b0 Update Slovak translation (#12523) 2018-11-25 17:44:51 -06:00
Yücel Temel
d857cdfb27 Update Turkish language (#12524) 2018-11-25 17:26:26 -06:00
Scott Lahteine
4a7c6f7241 NUM_ARRAY => COUNT 2018-11-24 00:27:45 -06:00
Giuliano Zaro
31113c5adf Update Italian language (#12512) 2018-11-24 00:26:54 -06:00
Scott Lahteine
b57343c255 Put status screen options in Configuration_adv.h 2018-11-23 23:15:07 -06:00
Scott Lahteine
f1efcfed14 Fix backslash in language_test.h 2018-11-23 20:39:23 -06:00
Yücel Temel
3b186a55ac Don't show superscript ³ with NOT_EXTENDED_ISO10646_1_5X7 (#12513) 2018-11-23 20:16:51 -06:00
Scott Lahteine
82c96c971e Bring superscripts slightly lower in BDF fonts 2018-11-23 20:02:34 -06:00
Scott Lahteine
fd2998efd5
Revert ADC_KEYPAD direction behavior (#12508) 2018-11-22 06:00:00 -06:00
Yücel Temel
5b1d52671c Use superscript 3 in language_en.h (#12504) 2018-11-22 02:27:28 -06:00
Scott Lahteine
ee423dcdd0 Invert hotend bitmaps, by default 2018-11-21 01:02:06 -06:00
Scott Lahteine
c5642a894f
Fix ADC_KEYPAD middle button (#12493) 2018-11-20 21:39:30 -06:00
Scott Lahteine
0946cbcdca Revert some const changes (for now) 2018-11-20 08:19:48 -06:00
Scott Lahteine
4def8b3b5e Expanded options for _Statusscreen.h (#12455) 
See the PR for full details. The updated system will be documented on the website in the near future.
 2018-11-20 07:50:37 -06:00
Scott Lahteine
d51e5690f4 Don't show updir with no card present 2018-11-20 07:01:46 -06:00
Scott Lahteine
ec9d21a234 Shift YZ on graphical display to fit Z+123.45 2018-11-20 06:58:18 -06:00
Scott Lahteine
817a37169a Apply/unapply const here and there 2018-11-20 06:44:21 -06:00
Marcio Teixeira
50ee747787 Fix compilation errors. Followup to #12439 (#12481) 2018-11-20 00:02:13 -06:00
Scott Lahteine
fc3f1c4572 Get u8g reference for lcdprint 2018-11-19 06:23:15 -06:00
Scott Lahteine
88c57eaf55
Clean up some u8g code (#12476) 2018-11-19 01:33:59 -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
Scott Lahteine
7f225b9421 Fix MAX_MESSAGE_LENGTH 2018-11-18 01:11:26 -06:00
Scott Lahteine
06674a321a Remove extra include 2018-11-18 00:34:07 -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
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
3e9ffaddb6
Consolidate, optimize some LCD menu code (#12450) 2018-11-16 21:44:48 -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
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
thiagodesacosta
075a22ed65 Update Portuguese-Brazilian translation (#12402) 2018-11-13 19:42:25 -06:00
Marcio Teixeira
3ceab8474c Add required "cardreader.h" include (#12419) 2018-11-13 17:12:44 -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
143b2896e0
Add M412 to enable/disable filament runout detection (#12406) 2018-11-12 21:29:46 -06:00
Scott Lahteine
a163c89c6a Followup to 50af1d1 2018-11-12 20:31:53 -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
471f403a67 Reduce code size with plain inlines 2018-11-11 08:36:10 -06:00
Scott Lahteine
4e0c935959 Update HAL and libs formatting 2018-11-10 19:43:23 -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
Ludy
24c5e57bb6 Update German language (#12379) 2018-11-09 15:25:29 -06:00
Giuliano Zaro
ccdbf20f60 Update Italian language (#12368) 2018-11-09 04:04:02 -06:00
Roman Moravčík
d08847b1a6 Update Slovak translation (#12376) 2018-11-09 04:03:07 -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
Giuliano Zaro
959ed32636 Update Italian language (#12352) 2018-11-06 19:30:24 -06:00
Roman Moravčík
812bfec65e Update Slovak translation (#12354) 2018-11-06 19:29:28 -06:00
Ludy
1624722566 Update German translation (#12355) 2018-11-06 19:28:40 -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
Giuliano Zaro
f7e682eeee Update Italian language (#12344) 2018-11-05 22:46:59 -06:00
Scott Lahteine
93d5b945dd Hide mesh editing until a valid mesh exists 2018-11-05 05:13:34 -06:00
Ludy
f34f09c821 Update German language (#12336) 2018-11-05 04:33:31 -06:00
Roman Moravčík
eefd7676a3 Updated slovak translation (#12338) 2018-11-05 04:31:12 -06:00
Scott Lahteine
3866aeac52 Clean up ENCODER_RATE_MULTIPLIER config 2018-11-05 04:17:37 -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
44fa7fb18c Cleanups for leveling-related code 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
0c85869c26 Clean up file endings 2018-11-04 18:30:10 -06:00
Scott Lahteine
b99f0776d6 Clean up some U8G files 2018-11-04 18:30:10 -06:00
Scott Lahteine
8014e1cc9d Allow disable of LCD_TIMEOUT_TO_STATUS (when 0) 2018-11-04 18:30:10 -06:00
Giuliano Zaro
bd05816fd8 Update Italian language (#12327) 2018-11-04 16:43:02 -06:00
Scott Lahteine
9c0e05552e Suppress some compile warnings 2018-11-04 15:25:31 -06:00
Scott Lahteine
60dbd8161c Fix VMAX editing 
Fix #12326
 2018-11-04 07:06:14 -06:00
tharts
f5e8e8b53d Fix broken LPC176x build (#12317) 
* Fix broken LPC176x build
* Add UBL+HD44780 test for LPC1768
 2018-11-04 04:25:03 -06:00
Scott Lahteine
f5eab912ed
Apply #pragma once, misc cleanup (#12322) 
* Apply #pragma once in headers
* Adjust some thermistors formatting
* Misc cleanup and formatting
 2018-11-04 02:25:55 -06:00
Scott Lahteine
8696f882a9
Merge pull request #12313 from thinkyhead/bf2_scara_home_offset 
Revive SCARA home offset (not fully implemented)
 2018-11-03 07:05:24 -05:00
Scott Lahteine
56d2dcb184 Use first_page flag in place of page.page == 0 2018-11-03 06:59:21 -05:00
Scott Lahteine
d1ff22b983 Revive SCARA's home offset (unimplemented) 2018-11-03 06:24:41 -05:00
Scott Lahteine
6e3caf23b6 IS_DELTA => ENABLED(DELTA) 2018-11-03 03:57:11 -05:00
Scott Lahteine
19f49db96f Tweak / reduce menu items 2018-11-03 01:18:59 -05:00
Ludy
5ba6607181 Fix keypad-related compile error (#12306) 2018-11-02 22:29:32 -05:00
Scott Lahteine
2fb2e286ee Followup to #12256 2018-11-02 01:32:24 -05:00
Scott Lahteine
31c28d0dd2
Drop pgm_read_*_near and let headers choose (#12301) 
- Drop `pgm_read_*_near` and let headers choose.
- Define `USE_EXECUTE_COMMANDS_IMMEDIATE` as a conditional.
- Add `process_subcommands_now` for SRAM-based commands.
 2018-11-02 00:42:16 -05:00
Ludy
9f77df2590 Followup to menu refactor. TMC warnings, sanity. (#12288) 
- Followup fixes for menu refactor
- Fix TMC sanity checks, unused var warnings
 2018-11-01 16:13:33 -05:00
MasterPIC
6e041b9c61 Use blink to show more info on LCD (#12256) 2018-11-01 15:56:12 -05:00
Scott Lahteine
eb5600acd2 Add parentheses to LCD_CLICKED 2018-11-01 15:06:14 -05:00
Scott Lahteine
2cff0d1f39 Move menu_level_bed_corners to its own file 2018-10-31 17:44:42 -05:00
Scott Lahteine
44f2a82a56 Move axis_homed, axis_known_position to motion.* 2018-10-31 17:44:42 -05:00
Ludy
f2adb4b9cc Update German language (#12280) 2018-10-31 16:40:41 -05:00
N95JPL
b780b69c62 Use font ascent and descent for line positioning (#12224) 2018-10-30 22:39:44 -05:00
Scott Lahteine
9cd3529108 Organize language data, fix Korean and Danish 2018-10-30 20:41:16 -05:00
Marcio Teixeira
72d8adfd1e Cleanup and refactor EXTENSIBLE_UI (#12227) 
- Add `axis_t`, `extruder_t`, `heater_t`, and `fan_t` to eliminate ambiguity, improve type safety.
- Regularized getter/setter argument order and naming.
- `setAxisPosition` no longer stacks moves in the buffer, allowing it to be called repeatedly on each touch ui tap.
- Implement better manual moves for `EXTENSIBLE_UI` (#12205)
- Calling `setAxisPosition_mm` no longer buffers the entire move to the new position, but instead causes small moves towards it to be made during the idle loop. This allows the user to adjust the destination even after the move has started and makes the UI feel much more responsive.
- As suggested by @ejtagle, the new code keeps the planner buffer full to ensure smooth motion without stops and starts.
- Change `En`, `Hn` and `FANn` to zero-based indices.
- Labels consistent with the rest of Marlin code.
 2018-10-30 19:42:26 -05:00
Karl Andersson
1946f729fd STM32 FastIO using register access (#12276) 2018-10-30 19:25:44 -05:00
Scott Lahteine
56057bcecd Fix lcd_impl_status_screen_1 2018-10-30 19:24:16 -05:00
Scott Lahteine
3583e2b449
Followup to Menu Refactor (#12275) 2018-10-30 16:34:45 -05:00
TheLongAndOnly
5536228359 G34 Auto-align multi-stepper Z axis (#11302) 2018-10-29 14:01:36 -05:00
Scott Lahteine
f9b80e7217 Make getfilename_sorted standard for listings 2018-10-29 13:54:21 -05:00
Scott Lahteine
5ead026967 Fix menu_temp_xx_filament_change menu items 2018-10-28 20:43:33 -05:00
Scott Lahteine
d632e44c8c
[Merge] Refactor LCD menus / screens (#12199) 2018-10-28 18:18:22 -05:00
Ludy
1f9806875c Update German language (#12261) 2018-10-28 18:11:55 -05:00
Scott Lahteine
3a935fd72b Reduce repetition in menu edit items 2018-10-28 15:46:45 -05:00
Scott Lahteine
b063b1b722 Reorganize includes and declarations 2018-10-28 15:46:45 -05:00
Scott Lahteine
43cf913048 Move SD Card Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
0161d3f733 Move Custom User Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
3b0d2330b6 Move Delta Calibrate Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
6896847210 Move LED Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
9cd5471202 Move Job Recovery Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
9f11e0284c Move Filament Change Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
d87ab3ed20 Move Advanced Settings Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
587a64d80c Move Bed Leveling Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
96f313fb41 Move Info Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
423ab029b2 Move Temperature Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
489017995e Move UBL 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
3a9ad9f2b1 Move Configuration Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
143d4ec043 Move Tune 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
Scott Lahteine
37ff663b02 Convert LIGHTWEIGHT_UI to CPP 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
8055ed24ff Move font data to a subfolder 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
Karl Andersson
c1e8bd6add Remove STM32 board-specific delays (#12243) 
...and replace with delays for all HAL_STM32 boards.
 2018-10-27 17:26:12 -05:00
Scott Lahteine
3c9daf322a MSG_CNG_SDCARD => MSG_CHANGE_SDCARD 2018-10-27 13:56:29 -05:00
Scott Lahteine
dacb5324e8 Fix display of Y on Graphical LCD 2018-10-26 01:43:47 -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
Scott Lahteine
53c535a0c1 Remove trailing whitespace 2018-10-25 09:46:33 -05:00
Roman Moravčík
55dec02ca1 Allow X, Y, Z manual move when cold. (#12209) 2018-10-25 09:13:52 -05:00
Scott Lahteine
9613f00877 Fix getProgress_seconds_elapsed to return seconds 2018-10-24 18:05:15 -05:00
gjdodd
5d487ef40e Fix null exception due to duration_t of zero (#12207) 2018-10-24 17:59:33 -05:00
Giuliano Zaro
a9061714f2 Update Italian language (#12196) 2018-10-24 16:40:48 -05:00
gjdodd
0a549fd1f2 Fix EXTENSIBLE_UI compile errors (#12206) 2018-10-24 16:36:11 -05:00
Roman Moravčík
a80ba8fc6e Slovak translation update (#12202) 2018-10-24 16:02:38 -05:00
Scott Lahteine
7a04eb3a8b Fix some comment formatting 2018-10-23 22:35:44 -05:00
Scott Lahteine
2f873a119f Revert some UBL strings 2018-10-23 15:39:59 -05:00
Ludy
a93e9e6e9b Use preheat labels in place of PLA/ABS (#12194) 2018-10-23 15:38:17 -05:00