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

6634 commits

Author SHA1 Message Date
Scott Lahteine 0282452cea Make Parser::seen volatile 2017-06-02 23:45:52 -05:00
Scott Lahteine 9a305a467b Patch LCD Contrast menu item 2017-06-02 23:45:52 -05:00
Scott Lahteine 90ccac4bcf Clean up after recent commits 2017-06-02 23:45:52 -05:00
Bob-the-Kuhn 2130f10de8 allow space between parameter and value 2017-06-02 19:57:22 -05:00
Bob-the-Kuhn ebda4663c3 for discusion 2017-06-02 19:42:43 -05:00
FATALHERMIT 911079104e Support for ZRIB v2.0 Control Board 2017-06-02 12:05:46 -05:00
Scott Lahteine 65a0212866 Easier override of FILWIDTH_PIN 2017-06-02 12:05:46 -05:00
Scott Lahteine 147d9d76fc Merge pull request #6928 from Bob-the-Kuhn/Fix-case-light-logic-on-Azteeg-X3-boards 
Fix case light logic on Azteeg_X3 boards.
 2017-06-01 20:14:15 -05:00
guntherv73 4288c4fb4f Configurations for Malyan M150 2017-06-01 19:26:29 -05:00
Scott Lahteine 1919cb0d1e Config cleanups 2017-06-01 19:26:16 -05:00
Bob-the-Kuhn 9a9bbfc57c Fix case light logic on Azteeg_X3 boards. 2017-06-01 12:33:24 -05:00
Thomas Moore a32f7b329c Fix heater status display for advanced pause 2017-06-01 12:29:47 -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 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 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 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 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 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 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 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 a3645ec921 Reference op with variable name 2017-05-28 11:33:22 -05:00
Scott Lahteine 71367fd518 Scrolling status message option 2017-05-28 11:26:28 -05:00
Scott Lahteine b0eae68f57 Prevent bed temperature being set too high 2017-05-28 11:11:17 -05:00
Scott Lahteine 493f0b0c62 Fix some compiler warnings 2017-05-28 11:06:33 -05:00
christianh17 f379a326cc enable DEACTIVATE_SERVOS_AFTER_MOVE with switching nozzle 
When using switching nozzle it should be possible to disable the servo after move. Do it only if you do not need the servo power to keep the position.
 2017-05-28 15:33:28 +02:00
Scott Lahteine 33279a1e02 Code style tweak to gcode.h 2017-05-27 19:47:26 -05:00
Ernesto Martinez ac959b12ee Updates to language_es.h based on latest updates. (#6871) 
Spanish language updates
 2017-05-27 19:08:39 -05:00
Scott Lahteine 55c700d537 Tweak to gcode.h 2017-05-26 22:11:31 -05:00
Bob-the-Kuhn 868e7db4ae value check was looking at the code 2017-05-26 14:49:42 -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 78af2b1444 Fix PROBE_MANUALLY via G-code 2017-05-25 23:53:31 -05:00
Scott Lahteine 082da23391 One fewer EOL in M503 output 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
Thomas Moore 44e657766e Add incompatibility error to Sanity Check for MIXING_EXTRUDER and LIN_ADVANCE 2017-05-25 08:06:27 -05:00
Scott Lahteine 735405b2a4 Merge pull request #6848 from thinkyhead/bf_scara_M665 
Add M665 for SCARA
 2017-05-24 20:51:51 -05:00
Scott Lahteine ffa901f373 Merge pull request #6839 from thinkyhead/bf_day_ending_in_y 
UBL ultralcd.cpp patches
 2017-05-24 17:55:44 -05:00
Scott Lahteine 361cbba113 Use M665 to set SCARA angle offsets 2017-05-24 17:49:24 -05:00
Scott Lahteine 5ed63a5724 Apply const in prepare_kinematic_move_to 2017-05-24 17:49:24 -05:00
Scott Lahteine 5cbe0244c5 Fixes for spindle/laser and SCARA probe bounds 2017-05-24 17:49:23 -05:00
Scott Lahteine 1f52c9f5df Neater Megatronics 3 pins 2017-05-24 17:49:23 -05:00
Scott Lahteine af81cb4cbb Patch for M503 output 2017-05-24 17:49:09 -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 f4028fe088 New GCode Parser - Implementation 2017-05-23 14:15:10 -05:00
Scott Lahteine 002a06c507 New GCode Parser - Configuration 2017-05-23 14:15:07 -05:00
Scott Lahteine ad915b667e One more mesh_index_to_npos update 
Followup to #6827
 2017-05-23 13:02:50 -05:00
Scott Lahteine 2881f0a48d Fix, extend G42 with P (probe) parameter 
- Also fix handling of SCARA and misuse of `codenum`.
 2017-05-23 04:55:42 -05:00
Scott Lahteine d252d1b6a2 Merge pull request #6831 from thinkyhead/bf_move_g7 
Move G7 to G42
 2017-05-23 03:02:57 -05:00
Brian 82ca6248e2 Move G7 to G42 
See: #6777
 2017-05-22 23:21:35 -05:00
Scott Lahteine 26ffa558a3 Use redraw flag for both types of LCD 2017-05-22 18:34:54 -05:00
Scott Lahteine 3ff7515527 Merge pull request #6817 from cbusillo/patch-1 
missing enable for M605 for duplication mode
 2017-05-22 18:07:11 -05:00
Scott Lahteine 34cfbc90cd Use new attribute macros in more places 2017-05-22 17:38:58 -05:00
Scott Lahteine 85b967657e Embed G26/G29 in ubl class, with enhancements 2017-05-22 17:38:58 -05:00
Scott Lahteine c99bd69889 Apply const float & more 2017-05-22 17:38:36 -05:00
Scott Lahteine ad5638f78c Cleanup some fastio code 2017-05-22 17:38:36 -05:00
Scott Lahteine e271521c39 Single user_canceled function in G26 2017-05-22 17:38:36 -05:00
Scott Lahteine c2ea22da49 Clean up whitespace 2017-05-22 17:38:36 -05:00
Scott Lahteine ceb62fc7e1 Fixes #6828: M428 bug 2017-05-22 17:34:03 -05:00
oldmcg 48f7652143 UBL G29 -P3.1 smart fill (#6823) 
* UBL G29 -P3.1 mesh fill with distance-weighted least squares fit.

* Back to original -O0 on G29 for now.
 2017-05-22 12:33:50 -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
cbusillo 3b4116e73b missing enable for M605 for duplication mode 
I believe gcode_M605 will not be called when using DUAL_NOZZLE_DUPLICATION_MODE without this change.
 2017-05-21 13:54:20 -04:00
Scott Lahteine 5e8892d6b5 Show Restore Failsafe item with EEPROM off 2017-05-21 12:52:44 -05:00
Scott Lahteine 76af9ac7c5 tweaks 2017-05-21 12:51:58 -05:00
Scott Lahteine ba5910ab6c Constrain LCD status message rendering 2017-05-21 12:35:16 -05:00
MagoKimbra 2c309a8f7c Fix set_lcd_contrast 2017-05-21 19:01:44 +02:00