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

2737 commits

Author SHA1 Message Date
Richard Wackerbarth 5ea139fd79 Revised Versioning mechanism 2015-05-25 15:53:14 -05:00
AnHardt da246f5cb1 Activate BED_MINTEMP error. 
And call _temp_error() directly for ERR_MAXTEMP_BED to avoid the only one time use of bed_max_temp_error().

Includes #2156.
 2015-05-25 13:23:19 +02:00
AnHardt 959da98d8e Call kill() only once when triggered by a temperature error 
to avoid stack overflow when called from interrupt.

Some clean up for calls of disable_all_heaters().
'disable_all_heaters()' is called in kill() and again when 'killed' is already set inside _temp_error().
 2015-05-25 12:44:03 +02: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
wurstnase 94120740d8 faster compare 
!(~(ab)&0x3) and ab == 0x3 are equal
 2015-05-23 07:55:15 +02:00
Scott Lahteine c9141e604a Merge pull request #2145 from thinkyhead/gcode_folding 
Indentation in process_commands
 2015-05-22 18:47:37 -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 672b0c1fd3 Cleanup pins in RAMPS_13_EFB boards 2015-05-22 16:20:54 -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 38cc0b93c6 Merge pull request #1874 from AnHardt/Bulgarian 
Introduction of Bulgarian - language_bg.h
 2015-05-22 13:59:50 -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 81c2ca3e10 Merge pull request #2131 from thinkyhead/bq_is_ramps_13_efb 
Witbox and Hephestos are RAMPS EFB
 2015-05-21 18:39:02 -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
Scott Lahteine 063881b5bd Fix a couple of doubled semicolons 2015-05-21 18:15:29 -07:00
AnHardt 94dff5b36a Merge pull request #2137 from thinkyhead/tweak_swh 
Move millis call in start_watching_heater
 2015-05-22 02:02:07 +02:00
Scott Lahteine 70d2f48d4e Merge pull request #2136 from thinkyhead/M303_suppress_error 
Suppress the line mismatch error after M303
 2015-05-21 16:46:30 -07:00
AnHardt 0c0ace2a04 Remove start_watching_heater() fom M104 and M109 2015-05-22 01:44:50 +02:00
Scott Lahteine 00716d0ca0 Small start_watching_heater adjustment 2015-05-21 16:44:49 -07:00
Scott Lahteine 834747deb7 Merge pull request #2135 from Wurstnase/new_endstop_bits 
new endstop bits
 2015-05-21 16:35:54 -07: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
wurstnase ff98b8632b new endstop bits 2015-05-21 23:16:43 +02:00
AnHardt 9b0fa9c309 Changed dependency of start_watching_heater() in setTargetHotend() to THERMAL_PROTECTION_HOTENDS 2015-05-21 21:07:37 +02:00
AnHardt bc0764894a Shift call of start_watching_heater() into setTargetHotend() 
to warrant watching is set or reset.

Make setTargetBed() in _lcd_preheat() dependant of TEMP_SENSOR_BED.
Use disable_all_heaters() in lcd_cooldown() and abort_on_endstop_hit.
 2015-05-21 20:36:11 +02:00
Richard Wackerbarth b878bc5620 Introducing the Kossel Pro Build Configuration 2015-05-21 11:47:34 -05:00
Richard Wackerbarth 1d8f61ca8a AT90USB is defined in pins.h 2015-05-21 11:46:54 -05: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
Scott Lahteine 6eb4f90ce7 Also synchronize configurator copies of configs 2015-05-20 21:34:00 -07:00
Scott Lahteine 9d1961ebe3 Witbox and Hephestos are just RAMPS_13_EFB 2015-05-20 21:33:23 -07: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 4d4fa3607b Remove Duemilanove 
No way to fit Marlin into 32K.
 2015-05-19 02:46:37 +02:00
AnHardt e353d27430 Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Bulgarian 2015-05-18 23:56:53 +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
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 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
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 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 513077c317 Minor change to fan kick 2015-05-16 19:42:28 -07:00
Scott Lahteine 76438195f0 NO_TIMEOUTS and ADVANCED_OK off by default 2015-05-16 02:47:20 -07:00
Scott Lahteine d2563804c8 Add LF to file errors 2015-05-15 04:37:22 -07:00
Scott Lahteine e114662cfa Adjust SdBaseFile spacing 2015-05-15 03:23:49 -07:00
Scott Lahteine 98e91f5253 Allow lsDive to recurse with minimal stack usage 2015-05-15 03:19:07 -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 95f5a68006 Merge pull request #2074 from thinkyhead/lcd_xyz_unknown 
Display unknown XYZ on the LCD as "---"
 2015-05-14 04:56:38 -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 a366e57385 Merge pull request #2075 from thinkyhead/mendel_inverting 
Use Mendel default for INVERT_Y_DIR
 2015-05-14 03:29:24 -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 78beef2d73 Use Mendel default for INVERT_Y_DIR 2015-05-14 00:25:47 -07:00