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

834 commits

Author SHA1 Message Date
Scott Lahteine b3f59ec945 Merge pull request #7519 from thinkyhead/bf1_cleanups_aug_16 
Add "Level Corners" menu item
 2017-08-16 15:58:15 -05:00
Tannoo b33739d493 UBL_Language_Update (#7520) 
* UBL_Language_Update

Translatable strings

* Use slightly better wording...

* Use slightly better wording...
 2017-08-16 09:49:04 -05:00
Scott Lahteine a1878cd1c0 Add "Level Corners" menu option 2017-08-16 02:54:33 -05:00
Thomas Moore 257b693ab0 Advanced pause fixes (#7518) 
* Disallow filament change while paused

* Use kinematic movemements in pause_print and resume_print
 2017-08-15 22:57:13 -05:00
Tannoo ab2ac1af71 UBL_LCD_storage_corrections (#7517) 
Correcting the storage selection.
Also EEPROM error handling on the LCD.
 2017-08-15 21:01:11 -05:00
Scott Lahteine 06541ec885 Merge pull request #7448 from thinkyhead/bf1_delta_fixes 
Prevent damage if DELTA_HEIGHT is set badly
 2017-08-15 16:35:09 -05:00
Scott Lahteine 3be9c19f12 Hold on move axis screens 2017-08-14 22:51:47 -05:00
Thomas Moore f54e0fc90f Prevent damage if DELTA_HEIGHT is incorrect 2017-08-11 16:09:14 -05:00
Scott Lahteine dd841a3675 Merge pull request #7410 from benlye/user-script-feedback 
Make audible user script feedback optional
 2017-08-05 02:59:56 -05:00
Florian Heilmann 0fd2923a9f Fix compilation with ADVANCED_PAUSE_FEATURE without SDSUPPORT (#7412) 
* Fix compilation of ADVANCED_PAUSE_FEATURE without SDSUPPORT

* Fix Identation

* Make use of IS_SD_PRINTING macro

as per @MagoKimbra
 2017-08-05 02:58:38 -05:00
benlye 24af9e1bf4 Make audible user script feedback optional 
Add a parameter to enable/disable audible user script feedback
 2017-08-04 17:24:10 +01:00
Kai ffe3013bb5 Fix for #7395 
Filament change causes freeze during paused print. This PR disables Filament change in the prepare menu when a print from SD Card is paused. See #7395
 2017-08-01 21:45:41 +02:00
Scott Lahteine 08b0456d91 Merge pull request #7379 from thinkyhead/bf_manual_bed_level_floor 
Manual Bed Leveling: Goto previous Z height at each probe point
 2017-07-30 05:41:12 -05:00
Scott Lahteine 29eef360d0 Merge pull request #7308 from thinkyhead/bf_cleanup_config_adv 
Fixes for FWRETRACT
 2017-07-29 21:20:19 -05:00
Wilfried Chauveau 894608f8a3 Manual Bed Leveling: Goto previous Z height at each probe point 2017-07-29 21:15:37 -05:00
Scott Lahteine ff06e1a030 Merge pull request #7372 from tcm0116/delta_calib_menu 
Move Delta Calibration menu to the Prepare menu
 2017-07-29 21:05:03 -05:00
Thomas Moore 15e009b6ca Move Delta Calibration menu to the Prepare menu 2017-07-28 08:33:18 -05:00
Scott Lahteine bfd396c13a Patch to fix some compiler warnings 2017-07-28 02:27:16 -05:00
Scott Lahteine 4eff18854b Rename options with swap_ prefix 2017-07-27 04:14:29 -05:00
Scott Lahteine b0173ccdb9 Drop extra initializers for vars initialized by EEPROM code 2017-07-20 22:57:49 -05:00
Jamie Bainbridge 00e4ced58e Stay in User Menu after command. Add feedback. 
When a user executes a User Menu command, the LCD returns to the main menu. If the user has multiple menu items they want to run, such as one menu item per bed leveling corner, then it's better to stay in the User Menu rather than return to the main menu.

This PR modifies Marlin to stay in the User Menu after a command.
 2017-07-10 13:47:12 -05:00
Scott Lahteine 1066b17457 Merge pull request #7260 from thinkyhead/bf_G33_update_27 
Updates to G33 and its LCD code
 2017-07-10 13:39:36 -05:00
Tannoo aaacef9441 Corrections (#7231) 
20x4 map integration.    Also some minor changes to the UBL Menu layout.     Both 20x4 LCD's and Graphical LCD panels should have similar functionality now.
 2017-07-07 11:05:08 -05:00
LVD-AC 4bc79ec877 Updates for G33-LCD interface 2017-07-07 05:00:59 -05:00
LVD-AC 3efe4aeef8 Add PROBE_MANUALLY support to G33 2017-07-04 18:06:54 -05:00
Scott Lahteine 4cb45c10dd Patch ubl lcd mesh map indentation 2017-07-01 19:47:52 -05:00
Scott Lahteine abd6ba62b4 Some cleanups for ubl lcd mesh map 2017-07-01 19:47:49 -05:00
Scott Lahteine f17bae1f70 Changes for ubl_lcd_map_control patch 2017-07-01 19:47:02 -05:00
Tannoo 8e0f3b7eba UBL radar map corrections 2017-07-01 19:00:44 -05:00
Scott Lahteine b492e0878d Changes to reduce and simplify 2017-06-28 01:10:30 -05:00
Tannoo e90cbf5c16 UBL Map Cleanup 2017-06-27 22:51:58 -05:00
Scott Lahteine fe7e890b09 Fix issues with ADC_KEYPAD 
Fixes #7150
 2017-06-26 16:08:31 -05:00
Scott Lahteine e687782875 Merge pull request #7134 from thinkyhead/bf_skynet_a3_ready 
Add Skynet/ANET A10 support
 2017-06-25 14:35:22 -05:00
dot-bob b3c36c98fd Edit digipot currents via LCD, save to EEPROM 2017-06-25 01:02:36 -05:00
Bob-the-Kuhn 9651d01e1a Add Skynet/ANET A10 support 2017-06-24 19:07:03 -05:00
Scott Lahteine 5fb0d401eb Formatting tweaks 2017-06-23 14:53:02 -05:00
MagoKimbra d26c8cc5c8 fix_planner_refresh_e_positioning (#7103) 
* fix_planner_refresh_e_positioning

* Fix
 2017-06-22 12:59:22 -05:00
Scott Lahteine 424d0bae8b Merge pull request #7100 from thinkyhead/bf_HAL_prepare 
Apply maths macros and type changes ahead of HAL
 2017-06-20 01:15:23 -05:00
Scott Lahteine 6c45d0fd81 Apply maths macros and type changes ahead of HAL 2017-06-19 22:57:42 -05:00
Scott Lahteine 8a51e2960c Improve the experience of editing steps_per_mm 2017-06-19 22:17:15 -05:00
Scott Lahteine 499bb85a95 Clean up, put ubl menu itemization closer at hand 2017-06-19 22:17:14 -05:00
Tannoo 90f5f82926 Step-by-Step Menu addition 2017-06-19 20:15:11 -05:00
Scott Lahteine 0c616700f3 Merge pull request #7097 from thinkyhead/bf_dac_percents_fix 
Convert DAC percent to uint8_t
 2017-06-19 17:58:55 -05:00
Bob-the-Kuhn a1c65fd3d5 convert DAC percent to uint8_t 
=====================

add test to Travis
 2017-06-19 17:46:41 -05:00
Scott Lahteine 4857a3ba48 Formatting and spelling 2017-06-18 23:01:12 -05:00
Thomas Moore 3d24c329af M600 fixes 2017-06-18 23:00:56 -05:00
Bob-the-Kuhn 6cb9bb27fe Move lcd_refresh_zprobe_zoffset definition 2017-06-16 21:46:33 -05:00
Scott Lahteine 062131554f Followup to #7045 2017-06-16 14:18:19 -05:00
Scott Lahteine 93da4e83f7 One more space on a short status message 2017-06-16 12:58:25 -05:00
Scott Lahteine 7c95f762f2 Show LCD bed options even without thermal protection 2017-06-15 15:29:56 -05:00