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

289 commits

Author SHA1 Message Date
Scott Lahteine
b0d8ba3894 Fix ANIM_CHAMBER 
Co-Authored-By: alexscarbro <alexscarbro@users.noreply.github.com>
 2019-07-11 14:36:02 -05:00
Scott Lahteine
fe02241044 NONE on combined options 2019-07-05 18:20:24 -05:00
Scott Lahteine
67e0238c89 Reduce type warnings 2019-07-05 18:20:24 -05:00
Scott Lahteine
750a16ad38 Fix MIN/MAX function collision with macros 2019-07-05 18:14:02 -05:00
Scott Lahteine
b6546ea33a Add include guards to some headers 2019-07-05 04:02:08 -05:00
Scott Lahteine
ae9232962e Use heater index defines 2019-07-02 23:29:43 -05:00
Scott Lahteine
a8d68b7c8a Common method for scaled fan speed 2019-06-28 15:34:17 -05:00
Scott Lahteine
93cd66ac11 Tweaky change from (C) to (c) 2019-06-27 23:58:16 -05:00
Tanguy Pruvot
75aeb41ab7 SKRmini support for Fysetc Mini Panel (#14319) 2019-06-18 19:34:16 -05:00
Tanguy Pruvot
287df7a61f STM32F1: various small changes 
- init the led pin as output (like other HALs)
- reduce sdio dma priority to normal.. highest is never the best...
- allow fsmc only on compatible STM32F1 (like HAL fsmc)
- fsmc: remove an useless C style cast
 2019-06-17 10:27:30 +02:00
Scott Lahteine
2a96d4e23a Move number-to-string functions to libs 2019-06-11 07:51:47 -05:00
thisiskeithb
662e7da8a4 Fix USE_BIG_EDIT_FONT bug (#14252) 2019-06-09 19:37:14 -05:00
InsanityAutomation
123e58d9c3 Heated Chamber for Graphical LCD (#14190) 2019-05-30 18:31:50 -05:00
Scott Lahteine
44caf70917 Improve editing, fix some small value editing 2019-05-25 15:29:00 -05:00
Scott Lahteine
a613bcad2d Fix some spelling 2019-05-10 20:39:19 -05:00
Scott Lahteine
ad4ffa1d2f
Use C++ language supported 'nullptr' (#13944) 2019-05-09 11:45:55 -05:00
Scott Lahteine
a36782ac1d Define more u8g command macros 2019-05-06 17:26:34 -05:00
Bob Kuhn
c48e6be366 Fysetc panel, RUMBA and ReARM pins, SPI mode 3 (#13900) 2019-05-04 17:59:36 -05:00
Luu Lac
39ebca6b5f Fix FYSETC, MINIPANEL, MKS_MINI_12864 display (#13864) 2019-05-01 00:37:52 -05:00
Scott Lahteine
5051909c3c
Update do_select_screen for general use (#13800) 2019-04-24 10:13:44 -05:00
Bob Kuhn
81ca5a4cd4 Fix and improve FYSETC LCD support (#13767) 2019-04-21 20:48:53 -05:00
jmdearras
b65cb5704d Fix, improve FYSETC_MINI_12864 support (#13730) 2019-04-19 20:11:51 -05:00
Marcio Teixeira
2e3d121ac4 Squelch compiler warning (#13739) 2019-04-18 13:18:49 -05:00
Marcio Teixeira
08f21335a6 Fix bad opcode in LIGHTWEIGHT_UI; add 32-bit HAL and Due compatibility (#13751) 2019-04-18 13:10:58 -05:00
Antonio Pérez
bf28ad4b6c Fix clear of Z position last digit (#13731) 2019-04-17 14:52:20 -05:00
Bob Kuhn
9b578ca343 Support FYSETC_MINI_12864 on Re-ARM, RAMPS_FD, MKS SBASE (#13717) 2019-04-15 22:54:11 -05:00
Marcio Teixeira
bdfffee037 Modify Z-offset overlay for clarity (#13660) 2019-04-12 15:43:29 -05:00
Scott Lahteine
f2ba0a5ae7 Tweak some formatting 2019-04-12 13:15:37 -05:00
Scott Lahteine
cee3b172b9
Fix Marlin splash screen logic (#13646) 2019-04-10 17:14:57 -05:00
Scott Lahteine
5018fdacbe
Support FYSETC_MINI_12864_PANEL (#13365) 2019-04-09 18:34:29 -05:00
Scott Lahteine
9abe9aff56
Confirm before starting SD print (#13616) 2019-04-08 13:44:35 -05:00
Roxy-3D
9cee81d47e Option to show babysteps total since G28 (#13580) 2019-04-06 18:04:34 -05:00
Scott Lahteine
5d2c5877f7 DOGM bootscreen cleanup 2019-04-03 18:10:50 -05:00
Alexander Gavrilenko
6d9aaca082 Fix compilation error for MKS Robin (#13506) 2019-03-29 12:40:24 -05:00
Scott Lahteine
b376c7e374 Group DISABLED items 2019-03-17 07:56:35 -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
Scott Lahteine
6214c997c0 Remove includes of <binary.h> 2019-03-13 05:32:33 -05:00
Scott Lahteine
d94e077901 Apply HAS_HOTEND_OFFSET where needed 2019-03-11 20:58:27 -05:00
Scott Lahteine
aa1d587128 Some LCD code cleanup 2019-03-11 05:07:31 -05:00
3dlabsio
645ca7af7a M141 Heated Chamber, Temperature rework (#12201) 2019-03-07 02:09:39 -06:00
Scott Lahteine
4fbbce9a35 Marlin Dev Mode for DOGM status screen 2019-02-28 22:10:26 -06:00
Scott Lahteine
50917ccda6 Tweak some u8g interface code 2019-02-20 04:26:34 -06:00
Scott Lahteine
3a1b6fe8c1 Coding standards 2019-02-19 14:58:39 -06: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
Scott Lahteine
2f8e89adc3 Remove extraneous ui. prefixes 2019-02-05 19:04:37 -06:00
revilor
6a57d0b381 Prusa MMU2 (#12967) 2019-01-31 19:10:52 -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
jmz52
813a4ea107 Add support for Mks Robin TFT display (#12706) 
* Add support for MKS Robin TFT display

- Add support for MKS Robin TFT display and encoder for MKS Robin board.
- Generic 128x64 UI with x2 upscale is used (for now).
- Tested on MKS Robin TFT V2.0 with ST7789V controller.
 2019-01-03 10:38:39 -06:00
kAdonis
637fb20c75 Allow 4 fan animation frames (#12772) 2019-01-03 06:03:06 -06:00
Scott Lahteine
daf07e4200 Align classic bed icon consistently 2018-12-09 12:00:10 -06:00
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
69d869c3d9 Tweak FR icon. Update font data. 2018-11-29 12:59:30 -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
4a7c6f7241 NUM_ARRAY => COUNT 2018-11-24 00:27:45 -06:00
Scott Lahteine
b57343c255 Put status screen options in Configuration_adv.h 2018-11-23 23:15:07 -06:00
Scott Lahteine
82c96c971e Bring superscripts slightly lower in BDF fonts 2018-11-23 20:02:34 -06:00
Scott Lahteine
ee423dcdd0 Invert hotend bitmaps, by default 2018-11-21 01:02:06 -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
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
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
Marcio Teixeira
c1e17037e5 Various fixes for MarlinUI and ExtUI (#12439) 2018-11-17 22:21:44 -06:00
Scott Lahteine
3e9ffaddb6
Consolidate, optimize some LCD menu code (#12450) 2018-11-16 21:44:48 -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
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
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
b99f0776d6 Clean up some U8G files 2018-11-04 18:30:10 -06:00
Scott Lahteine
9c0e05552e Suppress some compile warnings 2018-11-04 15:25:31 -06:00
Scott Lahteine
56d2dcb184 Use first_page flag in place of page.page == 0 2018-11-03 06:59:21 -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
MasterPIC
6e041b9c61 Use blink to show more info on LCD (#12256) 2018-11-01 15:56:12 -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
Karl Andersson
1946f729fd STM32 FastIO using register access (#12276) 2018-10-30 19:25:44 -05:00
Scott Lahteine
3583e2b449
Followup to Menu Refactor (#12275) 2018-10-30 16:34: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
dacb5324e8 Fix display of Y on Graphical LCD 2018-10-26 01:43:47 -05:00
Karl Andersson
b640b3b0d6 Define ST7920 delays for board ARMED (#12161) 2018-10-20 13:12:54 -05:00
Scott Lahteine
c6a5c74208 Add parentheses to SD macros 2018-10-19 13:52:57 -05:00
Scott Lahteine
67a3c5a16a
Alternative info screen (Prusa-style) (#12132) 
* Fix Z value display
* Add HAS_PRINT_PROGRESS
* Alternative Info Screen option
* Add LCD_INFO_SCREEN_STYLE to example configs
 2018-10-18 11:34:52 -05:00
Scott Lahteine
6bdbe3299e Fix a comment 2018-10-17 10:33:54 -05:00
Scott Lahteine
9b6be0ae0f Fix lite status screen SD % 2018-10-12 17:02:59 -05:00
Marcio Teixeira
ec9aa4f468 [2.0.x] Miscellaneous fixes (#12039) 
* Allow override of soft SPI pins in `pins_*.h`
* Add default case to avoid compiler warning.
* Additional pin definitions for Archim 2.
* Einsy Retro has same timings as Einsy Rambo.
 2018-10-08 18:14:52 -05:00
Scott Lahteine
d5017e2788 Add status screen with 4 nozzles 2018-10-08 01:27:21 -05:00
Scott Lahteine
d6b0fbd771
Use uint8_t for all fan speeds (#12032) 2018-10-07 15:34:41 -05:00
Scott Lahteine
517b4f4cd4 Fix lightweight UI hotends display 2018-10-04 14:37:24 -05:00
Scott Lahteine
348004c34f
STM32F7 HAL using the official STM32 Arduino Core (#11750) 2018-10-03 03:26:07 -05:00
brian park
2abf3d258d Korean language translation support (#11987) 2018-10-03 01:53:34 -05:00
Scott Lahteine
11ac75edcb
Use PGM_P for PSTR pointers (#11977) 2018-09-30 23:44:33 -05:00
Marcio Teixeira
0f14977b5d LIGHTWEIGHT_UI: Allow feedrate % to exceed 255% (#11656) 
- Changed type of integer used for feedrate percentage from uint8_t to uint16_t.
 2018-08-27 21:26:32 -05:00
Scott Lahteine
a15e570d3b Fix SD progress with Lite Status Screen 
Co-Authored-By: Lê Hoàng <icy.lord.love.angel@gmail.com>
 2018-08-26 17:12:05 -05:00
jneilliii
3671c63cde Einsy Full Graphic LCD Fix (#11604) 
Fixed issue with LCD timings for Einsy RAMBo board.
 2018-08-21 23:43:52 -05:00
Dave Johnson
c64199941e Compile only selected PIO environment (#11519) 2018-08-14 03:28:52 -05:00
Marcio Teixeira
f2224755ad Fix jumping progress bar. (#11439) 
- When LCD_SET_PROGRESS_MANUALLY was disabled and an SD print was not active (i.e. the printer was idle), progress_bar_percent would read uninitialized memory from stack and cause progress bar to jump wildly.
- Also updated conditions in `#ifdef` to match `ultralcd.cpp`
 2018-08-03 17:17:02 -05:00
etagle
1367df2875 Replace double with float, optimize calculation 2018-07-04 22:28:56 -05:00
Scott Lahteine
f2c3b0d476 Use bit flags for homed/known 2018-06-11 22:05:16 -05:00
Scott Lahteine
779d4a17a0 Highlight 64128N and common ST7565 difference 
Followup to #10920, addressing #10962
 2018-06-09 19:18:41 -05:00
Scott Lahteine
334341c632
Hephestos config updates (#10960) 2018-06-07 21:23:55 -05:00
Giuliano
eb1026d438 [2.0.x] Fix compile warning (#10931) 2018-06-05 22:44:34 -05:00
Scott Lahteine
61181b7f24 Add macros for ST7565 commands 2018-06-02 20:48:44 -05:00
Scott Lahteine
d259070980 Clean up trailing spaces from vim, etc. 2018-05-31 00:09:41 -05:00
Eduardo José Tagle
6f330f397e [2.0.x] Buffer overflow and scroll fix, UTF8 cleanup (#10844) 2018-05-25 23:32:37 -05:00
Scott Lahteine
d74e333c0f Make sure FAN_ANIM_FRAMES is defined 2018-05-25 05:28:50 -05:00
Scott Lahteine
5f8591528e Remove #pragmas that don't help c files 2018-05-23 23:47:16 -05:00
Scott Lahteine
c89649b46e Suppress U8glib build warnings 2018-05-23 02:47:36 -05:00
Scott Lahteine
fb608938f8 Prevent compilation of unused u8g-oriented code 2018-05-14 13:31:04 -05:00
Scott Lahteine
083ec9963e Tweaks to heater / lcd conditions 2018-05-13 04:52:56 -05:00
etagle
9d98a62699 Followup to HAL optimizations and delays 
- Cleanups, fixes for Due HAL code.
- TC_IER is write-only. Use TC_IMR to test ISR state.
 2018-05-13 00:46:23 -05:00
Scott Lahteine
a1062eec5b
Better handling of DELAY_NS and DELAY_US (#10716) 
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
 2018-05-12 08:34:04 -05:00
Scott Lahteine
265161ba30
Blink the value for unhomed/unknown axes (#10670) 2018-05-10 01:19:20 -05:00
Scott Lahteine
d1b619be52 Standardize some hexadecimals 2018-05-08 09:19:18 -05:00
Scott Lahteine
ec05408453
Add 3-frame fan animation to bitmaps (#10654) 2018-05-08 09:06:01 -05:00
Bob-the-Kuhn
410b023b50 [2.0.x] Add Viki support to RAMPS_FD_V1 (DUE) (#10598) 2018-05-02 07:54:06 -05:00
Scott Lahteine
9e0d99c0c6
Round all floats in string conversion functions (#10566) 2018-04-29 00:51:36 -05:00
Scott Lahteine
cb46cb8480
Add HAS_HEATED_BED conditional (#10495) 2018-04-23 17:13:01 -05:00
Scott Lahteine
8ca3c43d73 Updated language_data spacing, headers 2018-04-19 06:16:16 -05:00
Scott Lahteine
184c077c58 Correct includes (u8g.h) and spelling 2018-04-19 06:16:16 -05:00
Yunhui Fu
77bc653524 Use X windows 6x12 bitmap font to support western languages. 2018-04-19 06:16:15 -05:00
Yunhui Fu
d81649b365 Update language data for sk. 2018-04-19 06:15:19 -05:00
Chris Pepper
744bcaee61 [2.0.x] Fix problems compiling with Arduino IDE (#10441) 
* Fix problems compiling u8glib utf8 support on Arduino
* Change header in auto-generated font data
* Change include in font gen scripts
 2018-04-17 17:28:55 -05:00
Scott Lahteine
584735c994 u8g.h => clib/u8g.h 2018-04-14 12:26:01 -05:00
Yunhui Fu
c96412a78f [2.0.x] UTF-8 language translation support (#10213) 2018-04-12 20:14:01 -05:00
Scott Lahteine
a6485456df Fix LIGHTWEIGHT_UI with UBL 
See https://github.com/MarlinFirmware/Marlin/issues/10317#issuecomment-379100702
 2018-04-08 03:24:22 -05:00
Marcio Teixeira
c24dbcbfe1 When STATUS_EXPIRE_SECONDS is 0, hide the position. (#10081) 
Some users may prefer to hide the position updates on the `LIGHTWEIGHT_UI` altogether. This leads to an even less cluttered display (it also saves on SPI traffic and one byte of RAM).
 2018-03-14 02:44:30 -05:00
Bob-the-Kuhn
0d8c15c01f restore PR 9661 files & V1 fix 2018-03-10 22:46:32 -06:00
Bob-the-Kuhn
bf59a4a6df
Revert "[2.0.x] DUE compatibility with shared SPI LCDs, USB mass storage, add pin defs & update examples\MakerParts\Configuration.h" 2018-03-10 17:22:20 -06:00
Bob-the-Kuhn
914bb80bde removed SDSS init 
added device & comm drivers for shared SPI LCDs

mistyped some updates in ultralcd_impl_DOGM.h

remove unwanted changes in onfiguration.h

still can't type

Update HAL_LCD_class_defines.h

include USB mass storage & misc
 2018-03-09 23:06:11 -06:00
Scott Lahteine
ca577c1638 Fix up various spacing, comments, and typos 2018-03-07 21:09:08 -06:00
Marcio Teixeira
fd883c909a Improvements to Lightweight ST7920 status screen. (#9952) 
- Show units on lightweight status screen.
- Fixed progress bar so it works with M73
 2018-03-06 01:49:36 -06:00
Scott Lahteine
8f9262f3fe Fix path to _Statusscreen.h 2018-02-23 09:06:06 -06:00
Scott Lahteine
0542b03750 Fix bootscreen include path 
Fix #9759
 2018-02-23 01:59:35 -06:00