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

3319 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Scott Lahteine 71ff9adb12 Merge pull request #2132 from thinkyhead/fix_M120_M121 
M120 and M121 are reversed
 2015-05-21 16:20:03 -07:00
Scott Lahteine f39658c822 M120 and M121 are reversed 2015-05-21 00:17:44 -07:00
AnHardt d6c1285ab5 Merge pull request #2115 from AnHardt/_temp_error 
Use _temp_error() for all errors thrown by different heater sanity check mechanisms
 2015-05-21 00:36:30 +02:00
AnHardt 4422365a53 Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into _temp_error 2015-05-20 23:34:39 +02:00
AnHardt 4113762062 Merge pull request #2130 from AnHardt/kill2 
Add a string parameter to kill()
 2015-05-20 23:32:51 +02:00
AnHardt 89d2ee6f13 Make output on display dependant of ULTRA_LCD 2015-05-20 22:03:16 +02:00
AnHardt 120d4c7a8c Merge remote-tracking branch 'origin/kill2' into _temp_error 2015-05-20 21:25:32 +02:00
AnHardt cb6e82dc60 Change from kill() to kill(const char *) 
in temperature.cpp
 2015-05-20 21:22:48 +02:00
AnHardt 9d13942278 Use new kill() with parameter. 2015-05-20 21:18:52 +02:00
AnHardt 6398c5e28d Merge remote-tracking branch 'origin/kill2' into _temp_error 2015-05-20 21:08:19 +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
AnHardt 2990c6c45f Use new kill_() for _temp_error() 
instead of stop(). We really want to require a reset and no chance to set a new temperature.
 2015-05-20 14:03:14 +02:00
AnHardt 9b8c6ed254 Merge pull request #2120 from chris-bo/dogm_config 
move dogm font selection to configuration_adv.h
 2015-05-20 10:11:34 +02:00
AnHardt 06513565e9 Merge pull request #2105 from eboston/Development 
Add  ELB_FULL_GRAPHIC_CONTROLLER with ADAFRUIT_ST7565 display.
 2015-05-20 09:56:21 +02:00
Ed Boston 082ed3beed Propagate Configuration.h changes 
Updated all the example Configuration.h files for the new display type.
 2015-05-19 14:04:57 -07:00
Ed Boston 152b681bb5 Added link to controller github 
Added the link to the github information about the
ELB_FULL_GRAPHIC_CONTROLLER
 2015-05-19 04:14:55 -07:00
AnHardt 995b84944b Merge pull request #1982 from CONSULitAS/Development_Update_language.h 
language.h: update documentation / URL für K8200
 2015-05-19 12:13:35 +02:00
Scott Lahteine 7bc5fd8193 Merge pull request #2123 from AnHardt/Duemilanove 
Remove Duemilanove
 2015-05-18 20:36:05 -07:00
Scott Lahteine 94de1e0d93 Merge pull request #2116 from AnHardt/wording 
transpire -> expire
 2015-05-18 20:34:46 -07:00
AnHardt 23ee57c1c1 Remove DUEMILANOVE from Travis too. 2015-05-19 03:17:56 +02:00
AnHardt 4d4fa3607b Remove Duemilanove 
No way to fit Marlin into 32K.
 2015-05-19 02:46:37 +02:00
Ed Boston ca8d1756d5 Define fixes 
Fixed a couple defines that were not changed or commented out.
 2015-05-18 14:23:31 -07:00
CONSULitAS b96b28b7cc language.h: update documentation for LANGUAGE_INCLUDE 
language.h: update documentation for LANGUAGE_INCLUDE

@thinkyhead What do you think? I think there should be a warning like
this.
 2015-05-18 23:11:26 +02:00
Christian Bohn 258bcdefe0 move dogm font selection to configuration_adv.h 2015-05-18 22:54:53 +02:00
AnHardt 7750180c93 transpire -> expire 
Minor wording correction.
 2015-05-18 21:48:10 +02:00
AnHardt 70163dafb9 Use _temp_error() for all errors thrown by different mechanisms 
Now ending in an endless loop.
Tidy up the output format.
We now get:
ERRORTEXT ", system stopped! Heater_ID: " HEATERID

Where ERRORTEXT can be:
"Heating failed"
"Thermal Runaway"
"MAXTEMP triggered"
"MINTEMP triggered"
and soon
"Thermal Jump"

HEATERID can be
0, 1, 2 ,3 , "bed"

This messages are always followed by the common:
"Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
 2015-05-18 20:26:25 +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
Ed Boston a83bf18ee1 More functional seperation 
Moved SDCARDDETECTINVERTED and SDSLOW to Conditionals.h.
Added U8GLIB_LM6059_AF to define display specific actions.
Added reminder to compile in u8glib
 2015-05-18 05:37:46 -07:00
Scott Lahteine cad248fc55 Merge pull request #2111 from AnHardt/at 
Name magic value 20 to MAX_OVERSHOOT_PID_AUTOTUNE
 2015-05-18 05:25:51 -07:00
AnHardt 97ca1b3f4d Name magic value 20 to MAX_OVERSHOOT_PID_AUTOTUNE 
to make it better findable.
 2015-05-18 14:15:29 +02:00
Scott Lahteine 7ff18f6657 Merge pull request #2107 from thinkyhead/fix_issue_2106 
Have G92 set the nozzle position on Delta and SCARA
 2015-05-17 17:39:09 -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
Ed Boston 047e688e93 Changed ADAFRUIT_ST7565 to ELB_FULL_GRAPHIC_CONTROLLER 
Rename of define to avoid confusion between the controller and the
display which had similar names.
 2015-05-17 15:23:17 -07:00
Ed Boston 1999ac415c Formatting Changes 
Fixes for some code formatting changes and commenting out the
ADAFRUIT_ST7565 define that was left defined.
 2015-05-17 13:39:24 -07:00
Ed Boston 41f8cdb3a6 ADAFRUIT_ST7565 
Added support for new display type
 2015-05-17 12:47:41 -07:00
Scott Lahteine c5feb9c6a1 Merge pull request #2103 from Wurstnase/rework_out_bits 
rework out_bits
 2015-05-17 07:07:21 -07:00
wurstnase 21ff773832 rework out_bits 2015-05-17 14:33:09 +02: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 80d2c11f9d Merge pull request #2099 from thinkyhead/gcode_rename 
Rename gCode to codenum as a consistency
 2015-05-17 03:09:46 -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