Commit Graph

884 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
Scott Lahteine
d9da126776 Cleanups for UBL / ultralcd.cpp 2017-06-15 15:22:36 -05:00
Roxy-3D
824f71d503 LCD Panel Interactive Mesh Editing (#7045)
Original Mesh Bed Leveling replacement put at top of UBL Menu Options to
help facilitate the removal of the Original Mesh Bed Leveling.

Radar display (and control) of the UBL Interactive Mesh Editing.
2017-06-12 18:26:49 -05:00
Luc Van Daele
896dfa0577 G33 eccentric probe fixes (#6850)
* excentric probe config fix

* undo last commit

* eccentric probe fix

* oops

* !stow after each probe

* deploy/stow fix

* E parameter + bit of cleanup

* comment

* LCD menu fix
2017-06-12 01:07:19 -05:00
Scott Lahteine
b378deaf89 Unify AVR90USB: fastio changes 2017-06-09 18:21:57 -05:00
Scott Lahteine
e94f79ccea Patch some serial macros 2017-06-09 17:17:23 -05:00
Scott Lahteine
1419126721 Merge pull request #6965 from thinkyhead/bf_save_more_sram
Use createChar_P to save SRAM in bootscreen
2017-06-07 17:34:19 -05:00
Scott Lahteine
1d615e0a67 Merge pull request #6976 from Tannoo/Leveling_in_About_Printer
Leveling type in About Printer
2017-06-07 17:26:21 -05:00
Scott Lahteine
707707d71a Fix LCD status message padding 2017-06-07 16:07:38 -05:00
Scott Lahteine
2a41f0ff84 Save 28b PROGMEM in ultralcd.cpp (line_to_current) 2017-06-07 16:07:38 -05:00
Scott Lahteine
5d5ff36446 Fix a compile error with _lcd_set_z_fade_height 2017-06-07 10:29:56 -05:00
Tannoo
b88957e0d4 Leveling type in About Printer
Show the Leveling system in use on the About Printer screen.
2017-06-07 06:28:33 -06:00
Tannoo
2c2b991b59 UBL Manual Build Menu Option (#6972)
One click option to manually build UBL mesh.
2017-06-06 22:14:18 -05:00
Scott Lahteine
eb8af486d2 Ensure safe temperature for M600 2017-06-04 17:25:16 -05:00
Scott Lahteine
9a305a467b Patch LCD Contrast menu item 2017-06-02 23:45:52 -05:00
Scott Lahteine
4296a8b74e For status scrolling, pad a short message 2017-05-31 23:48:03 -05:00
Scott Lahteine
4a96433b7e Simplify counting of printable characters 2017-05-31 23:45:41 -05:00
Bob-the-Kuhn
9657e7d3ee copied file changes from PR #5685
==============================

Configuration_adv.h changes

==============================

add "live" LCD update

==============================

P & S version

==============================

final (hopefully) tested version

==============================

update M115 capabilities print

==============================

Menu changes portion of the requested changes

==============================

changed USEABLE_HARDWARE_PWM from a function to a series of macros

==============================

changes per review
2017-05-31 13:22:38 -05:00
Scott Lahteine
be17033762 Fix case light menu toggle 2017-05-30 14:03:45 -05:00
Scott Lahteine
05b66234ae Merge pull request #6895 from thinkyhead/bf_user_commands
Custom user commands menu
2017-05-30 13:40:50 -05:00
Scott Lahteine
6b9ca16f36 Patch lcd_print edge limit code 2017-05-30 03:32:15 -05:00
Tannoo
74d6dee920 User Command (Script) Menu
The menu (commands / scripts) is configurable in `Configuration_adv.h`.

- Added conditionals.
- Changed script handling.
- Slimmed and working!
- Added Status message.
- Returning to lcd status screen now!
- Example Configs Updated.
- Cleanups by @thinkyhead
2017-05-30 02:33:57 -05:00
Scott Lahteine
46b32e4548 Cleanup LCD interface, add lcd_reset_status 2017-05-29 22:16:13 -05:00
Scott Lahteine
ca99d67ede Fix UBL "Info screen" menu items 2017-05-29 19:55:26 -05:00
Scott Lahteine
2c7a39bc0e Fix LCD print aborted message 2017-05-29 19:52:01 -05:00
Scott Lahteine
0f1e8c195d Draw on LCD after value has changed 2017-05-29 19:42:30 -05:00
Scott Lahteine
51587c4b43 Rename Feedrate to Velocity to match prior naming 2017-05-29 17:54:15 -05:00
Scott Lahteine
9677f3f2f5 Patch up LCD Bed Leveling menu 2017-05-29 17:51:11 -05:00
Scott Lahteine
fc2eaab7f3 Show home option in level bed menu 2017-05-29 17:51:10 -05:00
Scott Lahteine
f1e33afda4 Return to Bed Leveling menu when done 2017-05-29 15:31:02 -05:00
Scott Lahteine
78d8c598e1 Fix lcd_synchronize with message 2017-05-29 15:31:02 -05:00
Scott Lahteine
194f8b2f55 Start at Z=0 in manual probing 2017-05-29 15:31:01 -05:00
Scott Lahteine
6f89db11f0 Allow lcd_setstatusPGM to reset the alert level 2017-05-29 15:31:00 -05:00
Scott Lahteine
3fe333143c Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
Scott Lahteine
d013bddfa8 Merge pull request #6876 from thinkyhead/bf_extend_leveling_menu
Extend the ABL/MBL Bed Leveling menu
2017-05-28 14:19:02 -05:00
Scott Lahteine
01e7e234c6 Add more options to the Bed Leveling menu 2017-05-28 14:04:28 -05:00
Scott Lahteine
0cbe448edf Split up Control > Motion submenu 2017-05-28 12:52:24 -05:00
Scott Lahteine
71367fd518 Scrolling status message option 2017-05-28 11:26:28 -05:00
Thomas Moore
fb5e0ffe16 Unify M600 and M125 pause features (#6407)
* Unify M600 and M125 pause features
* Cleanup per thinkyhead's comments
* Rename filament_change_menu_response to advanced_pause_menu_response
* Include HAS_BED_PROBE in QUIET_PROBING
* Update gMax example file
* is_idle() is out of scope without the braces
* Convert FT-i3-2020 to Advance Pause names...
* Allow pause even if not printing
2017-05-26 13:01:02 -05:00
Scott Lahteine
b3a97b5013 Patch up LCD level bed menus 2017-05-25 23:53:31 -05:00
Scott Lahteine
b15e531464 Fix screen change on character display 2017-05-25 15:29:14 -05:00
Scott Lahteine
1d167a6874 Some cleanup, fixes for ultralcd.cpp UBL code
- Free up 30 bytes of SRAM in UBL LCD code
- Fix BUILD_ABS_MESH temperature
- Fix UBL indentation in ultralcd.cpp
- UBL vars lowercase, "convert to positive" sensibly
2017-05-24 01:10:42 -05:00
Scott Lahteine
26ffa558a3 Use redraw flag for both types of LCD 2017-05-22 18:34:54 -05:00
Scott Lahteine
e271521c39 Single user_canceled function in G26 2017-05-22 17:38:36 -05:00
Scott Lahteine
850203fb3a Merge pull request #6816 from thinkyhead/bf_lcd_live_editing
Constrain LCD status message rendering
2017-05-22 11:15:35 -05:00
Roxy-3D
3129260c44 Misc. Clean Up (#6822)
* Misc. Clean Up

Mostly UBL related clean up.
- But fixed a bug in the thermistortables.
- Made G26 more responsive to user aborts.
- Added sanity checks for older name for UBL_MESH_VALIDATION.
- Made G29 P4 able to edit invalidated mesh points
- Restore a reasonable Fade Height for UBL when creating new state information
- Get UBL's Topology Map to look a little bit better
- Make sure the user doesn't see a blank screen when doing Mesh Editing.

* Huh???   GitHub Desktop screwed up!

* get the planner object in scope

* Fix out of scope z_fade_height

* Travis timed out...

I need a change so I can force a new commit and sync.
2017-05-21 22:09:51 -05:00
Scott Lahteine
5e8892d6b5 Show Restore Failsafe item with EEPROM off 2017-05-21 12:52:44 -05:00
MagoKimbra
2c309a8f7c Fix set_lcd_contrast 2017-05-21 19:01:44 +02:00
Scott Lahteine
11fc9564c9 Add live editing option to LCD menu 2017-05-21 05:29:46 -05:00
Scott Lahteine
6ce2b1ff4a G33 evolutionary changes 2017-05-20 19:23:39 -05:00
Scott Lahteine
94a4af1d7f Merge pull request #6773 from thinkyhead/bf_lcd_patch_e5
Patch LCD code for 5th extruder
2017-05-18 15:26:55 -05:00