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

757 commits

Author SHA1 Message Date
Scott Lahteine ff6081be3a Parse N[0-9]+[ ]* differently (PR #2263) 
More general solution to skip N[0-9]+[ ]* in the parser as in #2218
 2015-06-08 17:06:49 -05:00
Scott Lahteine 96a3fba8ac Reverse the sign of zprobe_zoffset 
- When editing on the LCD, minus now means below the nozzle
- Stores the opposite sign in EEPROM, so bumped to “V20”
 2015-06-08 05:09:27 -05:00
paclema 8d295547be * Auto filament change on CHANGEFILAMENT feature. Now you can activate this option that extrude filament until you press the button. 2015-06-06 19:45:45 -05:00
Richard Wackerbarth ad09d6a60f 3 Step Allen Key Probe 2015-06-06 17:48:27 -05:00
AnHardt e400fce271 Merge pull request #2221 from MagoKimbra/Dryrun 
Insert Debug DRYRUN Repetier Host compatible
 2015-06-03 12:30:48 +02:00
AnHardt c3fe6e61ae Merge pull request #2229 from AnHardt/position-out-of-range 
Fix out_of_range_error()
 2015-06-03 09:46:22 +02:00
AnHardt d1f4471000 Merge pull request #2146 from Wackerbarth/Versioning 
Versioning
 2015-06-02 18:31:21 +02:00
AnHardt 17b0ec84ed Fix out_of_range_error() 
For sprintf_P() the first parameter has to be a `char*` not `const char*`.
 2015-06-02 11:50:32 +02:00
AnHardt 35af5ef23e Merge pull request #2225 from Wurstnase/naming 
consistency name for multiplier
 2015-06-02 10:18:22 +02:00
wurstnase e7e964432b consistency name for multiplier 
replace extruder_multiply with extruder_multiplier
like feedrate_multiplier or volumetric_multiplier
 2015-06-01 22:33:22 +02:00
MagoKimbra 76306f9073 Insert Debug DRYRUN Repetier Host compatible 2015-06-01 18:34:45 +02:00
MagoKimbra 881146bc22 Fix problem Width Cura 2015-06-01 17:25:32 +02:00
AnHardt 9d2a980bcf Merge pull request #2170 from thinkyhead/beep_M600_elsewise 
Slight size reduction by adding idle()
 2015-05-30 12:42:32 +02:00
AnHardt 2728dc0606 Merge pull request #2194 from thinkyhead/reduce_strings 
Redo "invalid extruder" to save 304 bytes
 2015-05-30 11:05:08 +02:00
Scott Lahteine be5236e839 Reduce setTargetedHotend by removing the switch 2015-05-29 18:03:58 -07:00
Scott Lahteine 06f401e7e5 Redo "invalid extruder" to save 264 bytes 
- Use `setTargetedHotend` in `M200`, as with other commands that use
`T` for the extruder
- Synthesize the "invalid extruder" message, obviating several long
strings
 2015-05-28 22:25:28 -07:00
Scott Lahteine 1a882bcc2e Merge pull request #2193 from thinkyhead/ignore_unrecognized_commands 
Ignore unknown commands if they start with G, M, or T
 2015-05-28 22:03:48 -07:00
Scott Lahteine a672872717 Merge pull request #2187 from AnHardt/MAX6675M105 
Print active extruder with M105 for MAX6675
 2015-05-28 18:12:48 -07:00
Scott Lahteine 9beed830eb Drop commented code_is_good lines 2015-05-28 17:53:47 -07:00
Scott Lahteine 068d4a1eb2 Ignore unknown commands if they start with G, M, or T 2015-05-28 17:44:09 -07:00
Scott Lahteine c5c9d12630 Merge pull request #2183 from AnHardt/displayinit 
Initialize the display earlier
 2015-05-28 16:29:18 -07:00
Scott Lahteine 0564625757 Update M33 for new gcode parser 2015-05-28 14:17:39 -07:00
AnHardt af7e3f5076 Print active extruder with M105 for MAX6675 
Was omitted when T0 is a MAX6675.
 2015-05-28 19:03:16 +02:00
AnHardt f0523b5816 Initialize the display earlier 
to have it ready to display errors during (temperature)-setup.
 2015-05-28 16:08:17 +02:00
Scott Lahteine 03d5709b09 M110 is a known command 
- The command parser now displays “unknown command” in more cases.
Known commands must be added to the `switch` inside `process_commands`
to suppress the error.
 2015-05-26 20:31:18 -07:00
Scott Lahteine d76a01194d Slight size reduction by adding idle() 2015-05-26 20:08:21 -07:00
Richard Wackerbarth 5ea139fd79 Revised Versioning mechanism 2015-05-25 15:53:14 -05:00
Scott Lahteine 68f6f149d0 Reduce code size with out_of_range_error function 
- Affects code size when automatic bed leveling is enabled
 2015-05-24 20:18:02 -07:00
Scott Lahteine b55f8718c3 Indent G90/G91, G92 2015-05-22 17:34:08 -07:00
Scott Lahteine b0d520b109 Indent G30, G31/G32 2015-05-22 17:33:17 -07:00
Scott Lahteine ffe27a6225 Indent G29 2015-05-22 17:32:46 -07:00
Scott Lahteine 86083badc2 Indent G4, G10/G11, G28 2015-05-22 17:32:27 -07:00
Scott Lahteine 47d7a9cb5e Indent G2/G3 2015-05-22 17:31:38 -07:00
Scott Lahteine 350f239d84 Indent G0/G1 2015-05-22 17:31:24 -07:00
Scott Lahteine 15a2351675 No need for +1 on initial seen_pointer 2015-05-22 15:31:30 -07:00
Scott Lahteine 550dd87b2a Set seen_pointer before calling code_value 2015-05-22 15:11:48 -07:00
Scott Lahteine 04a1622172 Merge pull request #2127 from Wackerbarth/Kossel_Pro 
Kossel Pro
 2015-05-21 18:43:26 -07:00
Scott Lahteine f919a2fed1 Merge pull request #2134 from AnHardt/preheat-all 
Shift call of start_watching_heater() into setTargetHotend()
 2015-05-21 18:36:28 -07:00
AnHardt 0c0ace2a04 Remove start_watching_heater() fom M104 and M109 2015-05-22 01:44:50 +02:00
Scott Lahteine bde9c70d42 Suppress the line mismatch error after M303 2015-05-21 16:27:22 -07:00
Scott Lahteine 50bd7493cc Merge pull request #2108 from thinkyhead/m33_long_filename_host_support 
M33 LONG_FILENAME_HOST_SUPPORT
 2015-05-21 16:22:47 -07:00
Scott Lahteine 4d11b29959 Merge pull request #2113 from thinkyhead/command_sanitizer 
Command sanitizer
 2015-05-21 16:21:58 -07:00
Richard Wackerbarth 735bf2d35f Describe Custom M Code 2015-05-21 08:06:33 -05:00
Scott Lahteine f39658c822 M120 and M121 are reversed 2015-05-21 00:17:44 -07:00
AnHardt 89d2ee6f13 Make output on display dependant of ULTRA_LCD 2015-05-20 22:03:16 +02:00
AnHardt f4a93ed997 Add a string parameter to kill() 
Makes the output on the LCD adjustable.
 2015-05-20 20:53:48 +02:00
Scott Lahteine a0f362c735 Simplify & optimize with current_command_args 2015-05-18 07:08:04 -07:00
Scott Lahteine adc8fcb77f More parser comments, optimize code_seen, save with goto 2015-05-18 07:08:04 -07:00
Scott Lahteine c6d8dd19d9 use fetched value 2015-05-18 07:08:04 -07:00
Scott Lahteine 1116e13f5a Further optimization of command parser 2015-05-18 07:08:03 -07:00
Scott Lahteine 3a4c3ab76e Pre-sanitize the command before handling 
- Use a global pointer for the current sanitized command
- Pre-sanitize the current command to bypass `N` and nullify `*`,
removing the need for handlers to bypass, ignore, or nullify these
parts, and reducing overhead for `code_seen`, etc.
- Pre-skip leading whitespace.
- Only look for G, M, T codes at the start of the command.
- Verify that G, M, T codes are followed by command codes.
 2015-05-18 07:06:51 -07:00
Scott Lahteine 0f2c9bacfd M33 LONG_FILENAME_HOST_SUPPORT 2015-05-17 17:36:32 -07:00
Scott Lahteine 3feaef6526 Have G92 set the nozzle position on Delta and SCARA 2015-05-17 17:08:05 -07:00
Scott Lahteine 6c27eaf864 Merge pull request #2101 from thinkyhead/code_style 
Code style and a dangling "else"
 2015-05-17 03:39:08 -07:00
Scott Lahteine d580a0d186 Use "+=" in plane rotation 2015-05-17 01:51:14 -07:00
Scott Lahteine 2f3a410cb0 Fix a potential hanging "else" bug 2015-05-17 01:50:30 -07:00
Scott Lahteine b83e3f0905 Combine "Bed X: " strings 2015-05-17 01:49:52 -07:00
Scott Lahteine 7dfb8becdb Adjust some names and types in Marlin_main.cpp 2015-05-17 01:48:51 -07:00
Scott Lahteine c966aa26ff Comments in Marlin_main.cpp 2015-05-17 01:47:53 -07:00
Scott Lahteine c54a2ea042 Adjust spacing in Marlin_main.cpp and stepper.* 2015-05-17 01:47:02 -07:00
Scott Lahteine 072625ccad Update headings in Marlin_main.cpp and stepper.cpp 2015-05-17 01:44:53 -07:00
Scott Lahteine 16032f149f Rename to codenum as a consistency 2015-05-16 23:17:35 -07:00
Scott Lahteine 273a4a253f Merge pull request #2096 from thinkyhead/cherry_picking3 
Hide M117 with no LCD
 2015-05-16 21:10:28 -07:00
Scott Lahteine 64825a3d1e Merge pull request #2095 from thinkyhead/cherry_picking2 
Add gcode_line_error to reduce code size
 2015-05-16 21:09:15 -07:00
Scott Lahteine ca79282eaf Hide M117 with no LCD 2015-05-16 20:59:04 -07:00
Scott Lahteine ce218cafdb Add gcode_line_error to reduce code size 2015-05-16 20:54:58 -07:00
Scott Lahteine 46d59784ad Rename preocess_command to process_next_command 2015-05-16 20:47:40 -07:00
Scott Lahteine 19166a92e4 Merge pull request #2057 from Wurstnase/serial_wait 
add plan buffer remaining for 'P' and block buffer remaining 'B'
 2015-05-14 04:57:08 -07:00
Scott Lahteine e97fcafd0e Merge pull request #2076 from thinkyhead/mendel_inverting 
Use MSG_OK in M105
 2015-05-14 04:54:11 -07:00
Scott Lahteine 0f6cd3640b Drop extraneous ok_to_send 2015-05-14 04:38:09 -07:00
Scott Lahteine 0ce355d9e7 Use MSG_OK in M105 2015-05-14 03:33:38 -07:00
Scott Lahteine 7b3acfbb6f Merge pull request #2072 from thinkyhead/better_arc_code 
Consolidate arc code, remove motion_control.*
 2015-05-14 00:27:22 -07:00
Scott Lahteine 68ce419147 Note on segment size 2015-05-13 19:11:36 -07:00
Scott Lahteine 8b92249f18 Bring arc_offset into auto scope 2015-05-13 19:00:46 -07:00
Scott Lahteine 80807b2d71 Consolidate arc code, remove motion_control.* 2015-05-13 18:52:41 -07:00
Scott Lahteine f65833931d Formatting tweaks 2015-05-13 02:02:19 -07:00
Scott Lahteine 747fd5801c Merge pull request #2055 from thinkyhead/thermal_unified 
Combine thermal runaway and watch-period
 2015-05-12 08:04:29 -07:00
Scott Lahteine 6e5572228d Merge pull request #2064 from thinkyhead/wait_before_g28 
Split up prepare_move by type
 2015-05-12 07:53:11 -07:00
Scott Lahteine 27ad381e25 Allow fractional seconds in G4 and M0 2015-05-12 07:52:08 -07:00
Scott Lahteine b2bd9aae7c SCARA_SEGMENTS_PER_SECOND 2015-05-12 04:18:15 -07:00
Scott Lahteine bd20bd5444 Merge pull request #2063 from chris-bo/autobed_sled 
improve sled handling
 2015-05-12 03:29:21 -07:00
Scott Lahteine 9e95ceb3fc Split up prepare_move by type 
- For better encapsulation add inlines for each prepare_move type
- Move controllerFan vars inside the function as statics
- Some formatting cleanup
- Rename `ClearToSend` as `ok_to_send`
 2015-05-12 02:08:20 -07:00
Christian Bohn f48599f172 add pin definition to some motherboards 2015-05-12 10:02:23 +02:00
Scott Lahteine b5200e184c Remove extra setup_for_endstop_move 2015-05-12 01:01:53 -07:00
Scott Lahteine 8d814de558 Return void in prevent_dangerous_extrude 2015-05-12 00:55:00 -07:00
Scott Lahteine 367e2eb9f4 Global setup_for_endstop_move 2015-05-12 00:51:22 -07:00
Scott Lahteine fa951f8a0b Always do st_synchronize() before G28 2015-05-12 00:31:51 -07:00
Christian Bohn 27a3b1d895 disable sled pin by default 2015-05-12 08:51:01 +02:00
Christian Bohn fb44b53ae3 sled improvements 
- create sled pin definition
- G28 Works with sled
 2015-05-11 23:22:19 +02:00
Wurstnase 46d1932380 add plan buffer remaining for 'P' and block buffer remaining 'B' 2015-05-11 13:04:00 +02:00
Scott Lahteine 8a0dc4d54a Merge pull request #1922 from Wurstnase/serial_wait 
Serial wait
 2015-05-10 23:10:25 -07:00
Wurstnase 526ad82d20 activate advanced_ok and no_timeout 2015-05-11 08:01:51 +02:00
Scott Lahteine 2445ae3d3a Combine thermal runaway and watch-period 
- Make thermal protection for all hotends and/or bed into simple
switches
- Now enable `WATCH_TEMP_PERIOD` when `THERMAL_PROTECTION_HOTENDS` is
enabled
- Move detailed thermal parameters to `Configuration_adv.h`
- Add sanity checks to warn about old configurations
- Change `WATCH_TEMP_PERIOD` to seconds instead of milliseconds
 2015-05-10 22:52:01 -07:00
Scott Lahteine 4097207c75 Merge pull request #2041 from thinkyhead/watch_temp 
More thermal protection
 2015-05-10 21:39:05 -07:00
Scott Lahteine 9b3d4380d3 Only watch the heater that was set 2015-05-10 20:26:45 -07:00
Scott Lahteine f73f4ce555 Make some z probe and servo code tweaks 2015-05-09 19:11:19 -07:00
Scott Lahteine 54deb9eea3 Enable WATCH_TEMP_PERIOD by default 2015-05-08 22:36:02 -07:00
Wurstnase 0cb87795a3 advanced 'ok' 
ok N(linenumber) P(bufferremaining)
the host can use this to send the data much faster.

Some pseudo code:
If (bufferremaining > 0)  send command
## as long there is free buffer send command

Also
if (linenumber > lastsend - bufferremaining) send command
## as long last linenumber received is bigger than lastsend (host) - last bufferremaining received
 2015-05-08 22:28:51 +02:00
Wurstnase 182e0d99c9 Merge remote-tracking branch 'Marlin8bit/Development' into serial_wait 2015-05-08 21:27:18 +02:00
Scott Lahteine 7f3252eea9 Merge pull request #1999 from paclema/Filrunout_configurable_script 
Added configurable script for filrunout from configuration.h
 2015-05-08 04:39:59 -07:00
Scott Lahteine 79633a74ab Fix MBL compile error 2015-05-06 14:25:13 -07:00
Scott Lahteine 777f2d3820 Merge pull request #2018 from fmalpartida/bugFixing 
Bug corrected: persistent HOMING message when HOME button pressed for homing.
 2015-05-05 00:12:32 -07:00
Scott Lahteine ecb46de349 Merge pull request #2013 from bq/Fix_lowercase 
Fixed lowercase change missing on commit a22a228b.
 2015-05-04 23:50:56 -07:00
fmalpartida 150a35eff8 Bug corrected: 
Persistent homing message.
Message was declared as an alert, therefore it was persistent.
Updated to message.
 2015-05-04 19:48:49 +02:00
Gina Häußge ab246ab032 Reverting changes to error messages on serial console 
This reverts the changes done to the error message for line number mismatches done in commit d43cc2dd5f
 2015-05-04 15:03:00 +02:00
Ivan Galvez Junquera 59529b755d Fixed lowercase change missing on commit a22a228b. 
Servo.cpp and Servo.h were changed to lowercase in Makefile but not their actual filenames.
 2015-05-04 09:44:34 +02:00
Scott Lahteine 1f039cde61 Merge pull request #1992 from thinkyhead/too_many_probes 
Stow Z probe on M402 without extra raise
 2015-05-03 20:40:26 -07:00
Scott Lahteine ca8cec8e8a Merge pull request #1998 from paclema/Filament_runout_fix 
Fixed sintaxis error of filament runout
 2015-04-29 19:53:25 -07:00
Scott Lahteine d4c74b8f8c Don't apply M428 if an error occurs 
- Also move audio feedback into the command
- Added shorthand for `lcd_buzz` availability
 2015-04-29 19:05:48 -07:00
Scott Lahteine d065d37822 Add M428 to set home_offset logically 2015-04-29 18:26:16 -07:00
paclema 013a09dbe6 Added configurable script for filrunout form configuration.h 2015-04-29 21:38:40 +02:00
paclema 4dcc0fd55a Fixed sintaxis error of filament runout 2015-04-29 21:32:27 +02:00
Scott Lahteine ce3caf447b Tweak how homeaxis deploys and stows 2015-04-28 19:17:48 -07:00
Scott Lahteine a235dca79c Stow z on M402 without extra raise 2015-04-28 19:10:07 -07:00
Scott Lahteine 3688256f86 Merge pull request #1974 from thinkyhead/eeprom_in_gcode 
Make EEPROM reproducible in GCode
 2015-04-27 22:35:41 -07:00
Scott Lahteine 31516e2a3b Merge pull request #1985 from Arengorn/Development 
Update of servo.h
 2015-04-27 22:10:02 -07:00
Scott Lahteine 0f687b5dda Merge branch 'Development' into eeprom_in_gcode 
Latest upstream commits
 2015-04-27 21:47:47 -07:00
Scott Lahteine 28aef684b4 Merge pull request #1957 from Voxel8/sjk/home_y_before_x 
Allow Y to home before X with option in Configuration_adv.h.
 2015-04-27 21:41:14 -07:00
Scott Lahteine 71a0b1a5bb Disable endstops between homing bumps 2015-04-27 21:14:30 -07:00
Scott Lahteine c36226c4dc Fix homing Z position 
Add `sync_plan_position()` after `axis_is_at_home(axis)` to keep the
planner position in sync when homing.
 2015-04-27 20:55:19 -07:00
Scott Lahteine ff178d8cf7 Change M421 to take coordinates 
This makes `M421` more amenable for irregular matrices
 2015-04-27 19:48:34 -07:00
Bernardo ff67ee73fc Update Marlin_main.cpp 
Corrected "servo.h" to "Servo.h" because of the updated filename.
 2015-04-27 23:29:16 -03:00
Steve Kelly 98ca46006c Allow Y to home before X with option in Configuration_adv.h. 
This addresses comments in #1956 and #1079. In particular, this is useful
when both endstops are stationary on a CoreXY system, and the Y axis needs
to be homed before the X so the flags are aligned.
 2015-04-27 16:17:30 -04:00
Scott Lahteine 0fca084ea6 Make EEPROM reproducible in GCode 
With these changes the output of `M503 S0` is all you need to restore
the EEPROM. Building on this it is straightforward to save and restore
the EEPROM state using the SD card or external GCode file.

- Added `M145` to set “heatup states” for the LCD menu
- Added `M420` to toggle Mesh Bed Leveling
- Added `M421` to set a single Mesh coordinate
- Extended `Config_PrintSettings` with added M codes
- Cleaned up some comments here and there
 2015-04-26 20:56:33 -07:00
Scott Lahteine d43cc2dd5f M111 - Debug Level 
- Add `M111` as a standard option to set the debug level
- Implement `DEBUG_ECHO` in `process_commands`
- Other debug levels (e.g., `DEBUG_DRYRUN`) need more work
 2015-04-26 20:08:45 -07:00
Scott Lahteine a22a228bcc Rename files to move them in the IDE 2015-04-25 21:04:54 -07:00
Scott Lahteine 0438f0d835 Merge pull request #1924 from thinkyhead/raise_z_for_m401_m402 
Raise Z for M401 and M402
 2015-04-24 22:41:12 -07:00
Scott Lahteine b275946a52 Merge pull request #1966 from thinkyhead/g4_dwell_message 
G4 shows status message only if no message is set already
 2015-04-24 22:02:37 -07:00
Scott Lahteine 182f2cda35 Minor cleanup of M48 2015-04-24 21:26:36 -07:00
Scott Lahteine 3a6fd912cd Latest upstream commits, merged 2015-04-24 21:14:13 -07:00
Scott Lahteine 3c9e94e035 Merge pull request #1964 from AnHardt/Max6675again 
Add variant for MAX6675 in M104
 2015-04-24 20:44:45 -07:00
Scott Lahteine 56ff46eb8b Improve code_has_value test 2015-04-24 20:43:16 -07:00
Scott Lahteine ce142afdda G4 shows status message only if no message is set already 
- Address issue raised in #1961
 2015-04-24 20:13:01 -07:00
Scott Lahteine 35e79d56a5 Remove set-coordinate extension of G28 2015-04-24 19:23:12 -07:00
Scott Lahteine 3a74bb5039 Merge pull request #1945 from Wurstnase/max_endstopp 
Max endstopp
 2015-04-24 19:17:38 -07:00
AnHardt 0fed46360c Add variant for MAX6675 in M104 
Else will throw error:
@:0 B@:0
Error:No thermistors - no temperature
[ERROR] Error:No thermistors - no temperature

when no bed is defined
 2015-04-24 16:43:19 +02:00
Scott Lahteine 588ed70d4a Latest upstream commits, merged 2015-04-23 21:18:48 -07:00
Scott Lahteine 0165560333 Apply zprobe_zoffset in axis_is_at_home 
Ensure the probe offset will always be included when homing Z.
 2015-04-23 21:12:38 -07:00
Scott Lahteine 075386e7fe Merge pull request #1959 from thinkyhead/lcd_move_rate 
Include axis parameter to ultralcd's line_to_current
 2015-04-23 21:06:57 -07:00
Scott Lahteine 2558c10c6c Use the slower feedrate for XY axes 2015-04-23 20:06:17 -07:00
Scott Lahteine 64268f3312 Fixup axis_is_at_home a little 2015-04-23 18:16:44 -07:00
Scott Lahteine 996d0a9185 Squish the code down a little 2015-04-23 18:06:36 -07:00
Scott Lahteine 8534bc376c Fix homing of YZ with DUAL_X_CARRIAGE 2015-04-23 17:56:37 -07:00
Scott Lahteine 3b97a7d446 Merge pull request #1944 from AnHardt/beep2 
More Beeper clean up
 2015-04-23 17:50:02 -07:00
Wurstnase be9e4ceddc fix typo 
c'n'p ftw :/
 2015-04-23 10:35:14 +02:00
unknown c26d816839 filter any 0 2015-04-22 12:09:57 +02:00
Wurstnase 61ae43f35e v <-> code_value 2015-04-20 23:31:10 +02:00
Wurstnase da0d91a79b max endstopp 
no user will home to 0 with a max endstopp
 2015-04-20 23:28:46 +02:00
AnHardt 064f2b37d0 More Beeper clean up. 
Centralised beep code to lcd_buzz().
From gcode_M300() and lcd_quick_feedback().

Enforced max. duration for M300 to 5 seconds.

Corrected description in 'Configuration.h'

LCD_FEEDBACK_FREQUENCY_HZ 0 gives now a silent delay of
LCD_FEEDBACK_FREQUENCY_DURATION_MS.
 2015-04-20 11:11:13 +02:00
Wurstnase 92575cecca new timout/add adv_ok 2015-04-20 00:22:40 +02:00