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

415 commits

Author SHA1 Message Date
Scott Lahteine
f07260c33f Don't babystep on long click unless printing 
As pointed out in #10731
 2018-05-13 08:11:35 -05:00
Scott Lahteine
99ecdf59af Smarter MIN, MAX, ABS macros 
Use macros that explicitly avoid double-evaluation and can be used for any datatype, replacing `min`, `max`, `abs`, `fabs`, `labs`, and `FABS`.

Co-Authored-By: ejtagle <ejtagle@hotmail.com>
 2018-05-13 04:52:56 -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
306f0f2135
Move Stepper::synchronize to Planner (#10713) 
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
 2018-05-12 01:38:02 -05:00
Scott Lahteine
325bbbc8c2
[2.0.x] Enable AD595 and AD8495 in concert (#10693) 
* Allow both AD595 and AD8495 in concert
* General temperature code tweaks
 2018-05-11 01:01:51 -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
Scott Lahteine
a1fab8336e Fix abort of SD printing 2018-05-07 02:52:26 -05:00
Scott Lahteine
81b632c255 Additional temp-oriented improvements 2018-05-02 08:43:22 -05:00
nightdemonx
e911635fb1 Add thermocouple with AD8495 support 2018-05-02 08:43:16 -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
b7e938a9fb LCD_BED_LEVELING enables a sub-menu for ABL 2018-05-01 07:13:56 -05:00
Scott Lahteine
a90d99c27c Rename float32 => float52, etc. 2018-05-01 07:08:47 -05:00
Scott Lahteine
05fca752d6 Clean up autostart handling 2018-05-01 01:35:57 -05:00
Scott Lahteine
05c33833e7
[2.0.x] Add NO_LCD_MENUS option (#10582) 2018-04-30 21:16:31 -05:00
Scott Lahteine
524cc392f4 Fix sd_status comparison 
Co-Authored-By: perkmeister <perkmeister@users.noreply.github.com>
 2018-04-30 21:09:50 -05:00
Scott Lahteine
9e0d99c0c6
Round all floats in string conversion functions (#10566) 2018-04-29 00:51:36 -05:00
Scott Lahteine
f423e54f77 Strip trailing spaces 2018-04-23 18:00:43 -05:00
Scott Lahteine
8177c4334e
Merge pull request #10498 from xC0000005/MalyanLCDFix 
Fix overridden Malyan LCD functions
 2018-04-23 17:22:43 -05:00
Scott Lahteine
cb46cb8480
Add HAS_HEATED_BED conditional (#10495) 2018-04-23 17:13:01 -05:00
xC0000005
24d23ce49b Fix function definitions for Malyan LCD 2018-04-23 16:56:37 -05:00
Scott Lahteine
9e07df5c1b
Extra options for LEVEL_BED_CORNERS (#10483) 2018-04-22 02:50:48 -05:00
Scott Lahteine
023385ca59
Merge pull request #10479 from thinkyhead/bf2_creality_power_loss_resume 
[2.0.x] Creality3D Power-Loss Recovery
 2018-04-22 00:17:44 -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
d58450c82a Russian language update 
Co-Authored-By: anton-piliugin <34044202+anton-piliugin@users.noreply.github.com>
 2018-04-22 00:14:20 -05:00
Scott Lahteine
11ab017dd0 Creality3D Power-Loss Recovery 2018-04-21 21:56:50 -05:00
Scott Lahteine
78ea4871f9 Fix up enqueue now functions 
…and apply to MALYAN_LCD.
 2018-04-19 19:45:53 -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
627348b46c move the TALL_FONT_CORRECTION to language files 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
Yunhui Fu
41839746a2 Removed unused macros 2018-04-19 06:15:19 -05:00
Scott Lahteine
df2f24617b Use 0 as the bed position (not Z_MIN_POS) 2018-04-17 20:32:56 -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
e4acd2c40e One fewer compare in _lcd_move_xyz 2018-04-17 16:03:15 -05:00
Scott Lahteine
6cb83758d7 Fix Brazilian Portuguese language duplicates 2018-04-15 19:18:08 -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
Scott Lahteine
9f8a96fb8a
Brazilian Portuguese update (#10409) 2018-04-15 13:13:46 -05:00
Yunhui Fu
93273a4c9e Fix u8g.h search path error (#10419) 
Support env MARLIN_LANGS for user select generated language, and update doc; update script to generate dogm_font_data_ISO10646_1.h automatically.
 2018-04-15 13:12:02 -05:00
Scott Lahteine
584735c994 u8g.h => clib/u8g.h 2018-04-14 12:26:01 -05:00
KangDroid
6c535081ec [2.0.x] Add optional menu item to toggle software endstops (#10389) 2018-04-13 00:24:09 -05:00
Scott Lahteine
0535ebc4d2 MESH_BED_LEVELING before PROBE_MANUALLY 2018-04-12 22:45:52 -05:00
Luc Van Daele
12785583d0 [2.0.x] G33 MIN_STEPS_PER_SEGMENT (#10386) 2018-04-12 20:22:29 -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
a6485456df Fix LIGHTWEIGHT_UI with UBL 
See https://github.com/MarlinFirmware/Marlin/issues/10317#issuecomment-379100702
 2018-04-08 03:24:22 -05:00
Scott Lahteine
4dc7e64789 Update Slovak language 
Based on #10313 by @rmoravcik
 2018-04-06 20:23:20 -05:00
GMagician
6ce060cfe0 [2.0.x] Update language_it.h (#10322) 
Updated to #10296
 2018-04-06 20:07:46 -05:00
Scott Lahteine
051303ad42 Russian language updates 
From #10311 by @anton-piliugin
 2018-04-05 00:46:46 -05:00
Sean
2fa0a73c2c Implement filament change continuous purge 2018-04-04 20:57:51 -05:00
Marcio Teixeira
8bc93c6f2b Improve heating/cooling LCD messages (#10293) 2018-04-04 18:29:27 -05:00
Yunhui Fu
a019eebdd6 support utf8 unicode for test language (#10220) 2018-04-02 20:03:25 -05:00
Scott Lahteine
adcb87f0db Z Endstop Servo => Z Probe Servo 2018-04-01 23:54:21 -05:00
Scott Lahteine
31df43212c Use lcd_printPGM_utf in more places 
Fix #10256
 2018-03-31 20:49:20 -05:00
Scott Lahteine
6098efcc59 Use float62 for LCD edit of Z Fade 2018-03-31 20:03:09 -05:00
Scott Lahteine
f04be05a14 "G28 Z Forbidden" => "Home XY first" 
Some languages will need to be updated for proper phrasing
 2018-03-28 21:51:15 -05:00
Scott Lahteine
9d2ea5d64b Undo German changes 
See 941e9bd329 (commitcomment-28262166)
 2018-03-28 17:05:14 -05:00
xC0000005
7dc256432f Restore STM32F1 series to working order. (#10229) 
The `_O2` attribute is no longer needed on the malyanlcd function, and the macros have broken timer numbers - reset this to a function to return the right device. Also fix the bit order cast in SPI.
 2018-03-28 14:07:52 -04:00
Scott Lahteine
aa6dacbbdf German update 
Based on #10216
 2018-03-25 15:21:13 -04:00
Yunhui Fu
8322a79bb9 update the UTF-8 C strings for Chinsee languages, for Simplified and Traditional Chinese (#10211) 2018-03-25 12:37:54 -04:00
Scott Lahteine
1cb810ff1c
[2.0.x] Automatically reset stepper timeout (#10179) 
* Automatically reset stepper timeout in manage_inactivity

Any code that adds moves to the planner can skip resetting the stepper timeout. We can let `idle` / `manage_inactivity` reset the timer whenever it detects any moves in the planner.

* blocks_queued => has_blocks_queued
 2018-03-21 19:30:06 -05:00
Bob-the-Kuhn
7308ef7809 Add conditional, give DUE SPI a unique name, fix compiler warnings (#10168) 2018-03-20 15:53:21 -05:00
Scott Lahteine
fbdc5ad962 Prevent lcd_update stack overflow on SD Card change 2018-03-18 18:58:10 -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
Scott Lahteine
f1327fd5f9 Use lcd_goto_previous_menu_no_defer more 2018-03-14 00:50:15 -05:00
Scott Lahteine
65ce0303f8 Fix MKS_12864_OLED blank issue 
Fixes #10071
 2018-03-13 04:54:23 -05:00
Scott Lahteine
5dec828abc Add MKS_12864OLED to lcd_implementation_init 
Followup to #7914
 2018-03-12 08:54:17 -05:00
Scott Lahteine
51ebdf3b7d Finish scroll_screen with menu direction/multiplier 
Fixes #10041
 2018-03-11 04:41:12 -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
3c2bfa5e53
Update powersupply_on in power_on/off (#10015) 
Fix #10004
 2018-03-08 18:56:47 -06:00
Scott Lahteine
1913c37a91 Tweak to manual move eindex arg 2018-03-08 16:20:24 -06:00
Scott Lahteine
03e3011332 Fix compile error with MAX_MESSAGE_LENGTH 
Fix #9988
 2018-03-07 21:57:01 -06:00
Scott Lahteine
ca577c1638 Fix up various spacing, comments, and typos 2018-03-07 21:09:08 -06:00
Scott Lahteine
be0e100fed Fix sd subdirectory encoder position 
Followup to 7e386c7
 2018-03-07 16:54:19 -06:00
Bob-the-Kuhn
04dedc7ed8 always completely initialize display (#9981) 2018-03-07 16:40:59 -06:00
Scott Lahteine
0149680f54 Fix compile error with char LCD 2018-03-07 16:25:37 -06:00
Scott Lahteine
7e386c7e98 Fix encoder position for sddirectory 2018-03-07 05:23:03 -06:00
Scott Lahteine
22a017a856
Rebuild SD file sort array on Stop SD Print (#9976) 
Thanks Chuck Hellebuyck.
 2018-03-07 01:42:11 -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
f9cafc4001
Fix menu highlight glitch, tweak scrolling code (#9957) 2018-03-05 23:05:15 -06:00
Scott Lahteine
2d1233b86c Fix lcd_quick_feedback call for BTN_BACK 2018-02-28 20:24:11 -06:00
AnHardt
eb8b758226 Fix some mapper, charsize problems (#9866) 2018-02-28 18:57:05 -06:00
Scott Lahteine
8bffb26c23 Fix manual move position display 
Manual moves now correctly include the workspace offset.
 2018-02-28 17:33:23 -06:00
Scott Lahteine
bd0967ad87 Fix BTN_BACK 
Followup to #9835
 2018-02-28 03:26:28 -06:00
Scott Lahteine
d9a98b5814 Russian language update 
From #9849
 2018-02-28 03:07:39 -06:00
Scott Lahteine
35ec67885a
Add support for BACK button (RADDS) (#9835) 2018-02-26 22:52:57 -06:00
geigerg
4817c78a65 Add files via upload (#9828) 2018-02-26 15:44:01 -06:00
TheSFReader
eb079959fb Report sd card progress [FR] #9751 (#9832) 
* SD Status auto-report feature
Feature Request #9751
 2018-02-26 15:38:27 -06:00
Scott Lahteine
19ba91f77a Fix lcd_custom_bootscreen compiler warning 2018-02-25 04:38:17 -06:00
Scott Lahteine
2024775e07
Spanish (UTF8) Language (#9786) 
From #7314 by @MrAmericanMike
 2018-02-23 20:24:02 -06:00
Scott Lahteine
43ff15244d Fix a progress bar condition 2018-02-23 19:43:44 -06:00
Zachary Hill
4d588b2d6a Further fix of LCD_PROGRESS_BAR (#9783) 2018-02-23 18:53:04 -06:00
Scott Lahteine
e749945317
Un-pause print on cancel (#9780) 2018-02-23 13:42:15 -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
Scott Lahteine
2bd252b501
[2.0.x] LIN_ADVANCE v1.5 (#9712) 2018-02-23 00:53:29 -06:00
Scott Lahteine
a6b7e721cf Slovak language update 2018-02-23 00:49:07 -06:00
Scott Lahteine
2c9775313a Fix Z position on HD44780 
Fix #9732
 2018-02-23 00:42:42 -06:00
Studiodyne
9c9cd54ef3 Add Z Fade Height edit to UBL and Tune submenus (#9738) 2018-02-23 00:29:58 -06:00
Scott Lahteine
3851ffce0f
Merge pull request #9637 from marcio-ao/pr-lite-st7920-status 
[2.0.x] Light-weight status screen for ST7920 based printers
 2018-02-22 23:55:02 -06:00
Scott Lahteine
424b9a83cd Slovak language update 
From @rmoravcik at #9760
 2018-02-22 03:00:47 -06:00
Marcio Teixeira
532bb3aaa1 Lightweight status screen for ST7920 
- This status screen uses the ST7920 character generator to greatly
  reduce SPI traffic and MCU load when updating the status screen.

- Has been tested with the RepRapDiscount Full Graphics Smart Controller
  but should work with any LCD that uses an ST7920 or fully compatible
  controller.
 2018-02-22 00:10:43 -06:00
Scott Lahteine
72f63a4980 Fix DOGM progress bar with LCD_SET_PROGRESS_MANUALLY 2018-02-21 19:47:04 -06:00
Scott Lahteine
343c17d5b3
Reduce Creality3D bootscreens flash usage (#9752) 2018-02-21 16:08:52 -06:00
Scott Lahteine
9f0907d40c Fix big edit font width calculation 
Fix #9685
 2018-02-20 16:24:23 -06:00
Scott Lahteine
4303f2e377 Fix MALYAN_LCD message bugs 
Fix #9711
Replacing #9731
 2018-02-20 05:40:19 -06:00
Bob-the-Kuhn
47d529aac5 move #include <U8glib.h> 2018-02-19 17:39:40 -06:00
Scott Lahteine
fc460fff94 Extend menu items for SWITCHING_EXTRUDER 
Reference #5367
 2018-02-19 11:12:42 -06:00
Scott Lahteine
25e3e62354 Null-terminate lcd_status_message 2018-02-19 10:12:16 -06:00
Scott Lahteine
83d7e95de0
Add MSG_THERMAL_RUNAWAY_BED (#9691) 2018-02-18 02:23:55 -06:00
Bob-the-Kuhn
e05673a379 [2.0.x] VIKI2 & RE_ARM changes (#9686) 
* VIKI2 & RE_ARM changes

1. Remove `DISABLED(SDSUPPORT)` from ST7565 in `ultralcd_impl_DOGM.h`. These LCDs share pins with the SD card and can run at the SD card rates.

2. Add SDSS definition to `pins_RAMPS_RE_ARM.h`.  Apparently the SDSS definition in `pins.h` is being processed before the one in `spi_pins.h` which resulted in not being able to read the SD card.
 2018-02-17 16:41:36 -06:00
Scott Lahteine
f6cc89ec7c LCD_PROGRESS_BAR w/out SDSUPPORT for character LCD 2018-02-17 08:17:22 -06:00
blye
168af8bacb Allow LCD_SET_PROGRESS_MANUALLY without SDSUPPORT 2018-02-17 07:54:24 -06:00
Scott Lahteine
bf5df306e1 Fix compile error with SHOW_BOOTSCREEN disabled 
Fix #9530
Fix #9524
 2018-02-17 00:52:08 -06:00
Scott Lahteine
3021058e6d Fix non-UTF8 Czech language 2018-02-16 22:23:29 -06:00
Scott Lahteine
1f8f8c9104
Merge pull request #9657 from petrzjunior/bugfix-2.0.x 
[2.0.x][Language] Update Czech (Advanced pause...)
 2018-02-16 02:54:06 -06:00
Thomas Moore
cff62042ee Fix LCD manual movement on kinematic machines (#9655) 2018-02-16 02:34:36 -06:00
Petr Zahradník
5d9e16ea49 Update Czech advanced pause 2018-02-15 20:22:22 +01:00
Bob-the-Kuhn
b648999528
Merge pull request #9624 from Bob-the-Kuhn/RRD-8-bit-code-to-2.0.x 
[2.0.x] Add delays to AVR driver for RRD Full Graphic Smart Controller
 2018-02-14 22:43:17 -06:00
Scott Lahteine
93c0198b2d Init LCD welcome message programmatically 2018-02-14 05:09:44 -06:00
Scott Lahteine
67a4cc610b French update 
Based on #9610
 2018-02-14 04:15:47 -06:00
Scott Lahteine
e7b50c89b0 Fix #9201 
FILAMENT_LCD_DISPLAY can work with SDSUPPORT
 2018-02-14 03:29:47 -06:00
Bob-the-Kuhn
9a423e9a89 tested 2018-02-13 21:59:18 -06:00
Scott Lahteine
f8912bb19f French update 
Based on #9590 by @studiodyne
 2018-02-12 01:07:47 -06:00
Scott Lahteine
e6b8207b03 Restore welcome message 2018-02-12 01:02:30 -06:00
Scott Lahteine
38c7d53bf7 Repair some spacing 2018-02-10 19:33:26 -06:00
gege2b
5785bbb491 Updated french translation (#9556) 2018-02-10 14:15:41 -06:00
GMagician
299606e4ae [2.0.x] Memory overflow protection (#9562) 2018-02-10 14:14:34 -06:00
Scott Lahteine
5a70887467
Size lcd_status_message based on language (#9545) 2018-02-08 23:03:47 -06:00
Scott Lahteine
545cd8fa60 Tweak malyanlcd.cpp 2018-02-08 22:00:23 -06:00
GMagician
9854262334 [2.0.x] Fix compile warning (#9539) 2018-02-08 17:59:03 -06:00
Scott Lahteine
d42a87cb31 Update language Italian 
From #9508 by @tnw513
 2018-02-08 02:10:15 -06:00
Scott Lahteine
2538f019d0 Update language Basque-Euskera 
From #9514 by @1138-4EB
 2018-02-08 02:08:41 -06:00
Scott Lahteine
16739264d3 Add UltiController v2.1 support 
Add compatibility with the original screen bord from Ultimaker 2 printer (UltiController v2.1 with the PG-2864ALBP I2C display)
 2018-02-05 22:30:03 -06:00
Scott Lahteine
38d62494ef Adjustment to DOG_CHAR_*_EDIT 2018-02-05 20:25:45 -06:00
Scott Lahteine
766faa05a9
sp 2018-02-05 15:57:29 -06:00
Scott Lahteine
e5ee0b6f6c Implement MALYAN_LCD 2018-02-04 18:52:44 -06:00
Scott Lahteine
2ea4e74ed3 Misc. comments 2018-02-04 17:40:39 -06:00
Thomas Moore
786746404b [2.0.x] Apply feedrate to nozzle movement for kinematic machines (#8778) 2018-02-04 00:26:05 -06:00
Thomas Moore
e1fd9c08b3 [2.0.x] Add support for LPC1769 at 120 MHz (#9423) 2018-02-03 19:33:26 -06:00
GMagician
9e13d1fad5 [2.0.x] Fix temperature out of LCD (#9461) 
Fix bug introduced in #9415
 2018-02-03 19:25:04 -06:00
Scott Lahteine
d6e29e9597 Update French language 
Based on #9373 by @nikkoura
 2018-02-02 01:56:25 -06:00
Scott Lahteine
79796b22ad Fix up _Bootscreen.h and _Statusscreen.h 2018-02-02 00:57:16 -06:00
Bob-the-Kuhn
21179f8300 Fix the "slow" version of the G-code parser 2018-02-02 00:35:58 -06:00