zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
11081 commits 1 branch 0 tags 156 MiB
Commit graph

11081 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine ac33a378c0 Merge pull request #6922 from thinkyhead/bf_probe_options 
Prevent illegal leveling combinations
 2017-06-01 11:12:02 -05:00
Scott Lahteine 445865ea03 REPRAPWORLD_KEYPAD is NEWPANEL but not ULTIPANEL 2017-05-31 23:48:03 -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
Scott Lahteine 8d69394ae1 Fix LCD printing of progmem strings 2017-05-31 23:36:57 -05:00
Scott Lahteine c74d4dede6 Prevent illegal leveling combinations 
Addressing issue #6901
 2017-05-31 23:36:57 -05:00
Scott Lahteine 155aa62fb0 Merge pull request #6912 from thinkyhead/bf_better_pulse_delay 
Account for dual XYZ in pulse delay cycles estimate
 2017-05-31 22:21:47 -05:00
Scott Lahteine a5fa586642 Preferred patch to gcode.h 2017-05-31 21:18:16 -05:00
Bob-the-Kuhn 4ecd41ef90 Merge pull request #6915 from Bob-the-Kuhn/gcode.h-2 
gcode.h - another compile error
 2017-05-31 14:03:33 -05:00
Bob-the-Kuhn 1b41e1f645 another compile error 
only seen if

#if ENABLED(TEMPERATURE_UNITS_SUPPORT)
      ...
    #if
ENABLED(ULTIPANEL) && DISABLED(DISABLE_M503)
 2017-05-31 13:59:49 -05:00
Bob-the-Kuhn 65bd4c8c94 Merge pull request #6797 from Bob-the-Kuhn/M355-case-lightimprovements-(1.1.x) 
M355 case light improvements (replaces PR #5685)
 2017-05-31 13:33:59 -05:00
Bob-the-Kuhn 7ed0761e09 Merge pull request #6914 from Bob-the-Kuhn/Gcode.h-bug-fix 
gcode.h - fix compile error
 2017-05-31 13:29:19 -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
Bob-the-Kuhn 8206bb9bb9 fix compile error 
invalid conversion from 'const char*' to 'char*' [-fpermissive]
 2017-05-31 13:17:01 -05:00
Scott Lahteine df91346188 Account for dual XYZ in pulse delay cycles estimate 2017-05-31 12:23:28 -05:00
Scott Lahteine 6354b40231 Merge pull request #6903 from thinkyhead/bf_fix_delta_m24_m125 
Patch M24 / M125 for delta
 2017-05-31 00:03:20 -05:00
Scott Lahteine 7236109f2a Patch M24 / M125 for delta 2017-05-30 23:07:29 -05:00
Scott Lahteine be17033762 Fix case light menu toggle 2017-05-30 14:03:45 -05:00
Scott Lahteine 89b93058e3 Merge pull request #6887 from christianh17/PR-sanitycheck 
enable DEACTIVATE_SERVOS_AFTER_MOVE with switching nozzle
 2017-05-30 13:43:39 -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 84a0a77c59 Merge pull request #6852 from tcm0116/mixing_extruder_lin_advance 
Generate error if MIXING_EXTRUDER and LIN_ADVANCE are both enabled
 2017-05-30 13:37:51 -05:00
Scott Lahteine d33ae33103 Merge pull request #6897 from thinkyhead/bf_fix_lcd_scrolling 
Fix LCD scrolling character counting
 2017-05-30 03:45:59 -05:00
Scott Lahteine 266ae8912a Formatting in _draw_heater_status 2017-05-30 03:32:16 -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 d9c8072037 Edit PROPORTIONAL_FONT_RATIO comment 2017-05-30 01:29:39 -05:00
Scott Lahteine bad432add7 Merge pull request #6894 from thinkyhead/bf_lcd_draw_order 
Fix LCD to draw after value changes
 2017-05-30 00:02:00 -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 5d6366d4e6 Merge pull request #6893 from thinkyhead/bf_lcd_leveling_fixes 
Patch PROBE_MANUALLY + LCD_BED_LEVELING
 2017-05-29 18:15:22 -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 c6a7adc293 Patch G29 A and Q arguments to bypass setup 2017-05-29 17:51:10 -05:00
Scott Lahteine 4cece2d72e Use NAN for G29 W omitted parameters 2017-05-29 17:51:10 -05:00
Scott Lahteine 2d71569138 Fix spacing in JSON output 2017-05-29 17:51:10 -05:00
Scott Lahteine b2d3c8aedd Have G28 do a refresh of the display 2017-05-29 17:51:10 -05:00
Scott Lahteine 50ab9c2e04 General cleanup of spacing, comments 2017-05-29 15:34:14 -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 eb39d6e3e2 Don't draw progress bar until it has 1% 2017-05-29 15:31:01 -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 25114414cd Merge pull request #6860 from thinkyhead/bf_case_light_toggle 
Case light as a toggle menu item
 2017-05-28 18:30:55 -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 58556991da Merge pull request #6877 from thinkyhead/bf_scrolling_status 
Scrolling status message (option)
 2017-05-28 14:12:36 -05:00
Scott Lahteine 01e7e234c6 Add more options to the Bed Leveling menu 2017-05-28 14:04:28 -05:00