3310 Commits (9b0fa9c309b472ab6cc263b0e6e0df5a6f213771)
 

Author SHA1 Message Date
AnHardt 9b0fa9c309 Changed dependency of start_watching_heater() in setTargetHotend() to THERMAL_PROTECTION_HOTENDS 10 years ago
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.
10 years ago
AnHardt d6c1285ab5 Merge pull request #2115 from AnHardt/_temp_error
Use _temp_error() for all errors thrown by different heater sanity check mechanisms
10 years ago
AnHardt 4422365a53 Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into _temp_error 10 years ago
AnHardt 4113762062 Merge pull request #2130 from AnHardt/kill2
Add a string parameter to kill()
10 years ago
AnHardt 89d2ee6f13 Make output on display dependant of ULTRA_LCD 10 years ago
AnHardt 120d4c7a8c Merge remote-tracking branch 'origin/kill2' into _temp_error 10 years ago
AnHardt cb6e82dc60 Change from kill() to kill(const char *)
in temperature.cpp
10 years ago
AnHardt 9d13942278 Use new kill() with parameter. 10 years ago
AnHardt 6398c5e28d Merge remote-tracking branch 'origin/kill2' into _temp_error 10 years ago
AnHardt f4a93ed997 Add a string parameter to kill()
Makes the output on the LCD adjustable.
10 years ago
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.
10 years ago
AnHardt 9b8c6ed254 Merge pull request #2120 from chris-bo/dogm_config
move dogm font selection to configuration_adv.h
10 years ago
AnHardt 06513565e9 Merge pull request #2105 from eboston/Development
Add  ELB_FULL_GRAPHIC_CONTROLLER with ADAFRUIT_ST7565 display.
10 years ago
Ed Boston 082ed3beed Propagate Configuration.h changes
Updated all the example Configuration.h files for the new display type.
10 years ago
Ed Boston 152b681bb5 Added link to controller github
Added the link to the github information about the
ELB_FULL_GRAPHIC_CONTROLLER
10 years ago
AnHardt 995b84944b Merge pull request #1982 from CONSULitAS/Development_Update_language.h
language.h: update documentation / URL für K8200
10 years ago
Scott Lahteine 7bc5fd8193 Merge pull request #2123 from AnHardt/Duemilanove
Remove Duemilanove
10 years ago
Scott Lahteine 94de1e0d93 Merge pull request #2116 from AnHardt/wording
transpire -> expire
10 years ago
AnHardt 23ee57c1c1 Remove DUEMILANOVE from Travis too. 10 years ago
AnHardt 4d4fa3607b Remove Duemilanove
No way to fit Marlin into 32K.
10 years ago
Ed Boston ca8d1756d5 Define fixes
Fixed a couple defines that were not changed or commented out.
10 years ago
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.
10 years ago
Christian Bohn 258bcdefe0 move dogm font selection to configuration_adv.h 10 years ago
AnHardt 7750180c93 transpire -> expire
Minor wording correction.
10 years ago
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)"
10 years ago
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
10 years ago
Scott Lahteine cad248fc55 Merge pull request #2111 from AnHardt/at
Name magic value 20 to MAX_OVERSHOOT_PID_AUTOTUNE
10 years ago
AnHardt 97ca1b3f4d Name magic value 20 to MAX_OVERSHOOT_PID_AUTOTUNE
to make it better findable.
10 years ago
Scott Lahteine 7ff18f6657 Merge pull request #2107 from thinkyhead/fix_issue_2106
Have G92 set the nozzle position on Delta and SCARA
10 years ago
Scott Lahteine 3feaef6526 Have G92 set the nozzle position on Delta and SCARA 10 years ago
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.
10 years ago
Ed Boston 1999ac415c Formatting Changes
Fixes for some code formatting changes and commenting out the
ADAFRUIT_ST7565 define that was left defined.
10 years ago
Ed Boston 41f8cdb3a6 ADAFRUIT_ST7565
Added support for new display type
10 years ago
Scott Lahteine c5feb9c6a1 Merge pull request #2103 from Wurstnase/rework_out_bits
rework out_bits
10 years ago
wurstnase 21ff773832 rework out_bits 10 years ago
Scott Lahteine 6c27eaf864 Merge pull request #2101 from thinkyhead/code_style
Code style and a dangling "else"
10 years ago
Scott Lahteine 80d2c11f9d Merge pull request #2099 from thinkyhead/gcode_rename
Rename gCode to codenum as a consistency
10 years ago
Scott Lahteine d580a0d186 Use "+=" in plane rotation 10 years ago
Scott Lahteine 2f3a410cb0 Fix a potential hanging "else" bug 10 years ago
Scott Lahteine b83e3f0905 Combine "Bed X: " strings 10 years ago
Scott Lahteine 7dfb8becdb Adjust some names and types in Marlin_main.cpp 10 years ago
Scott Lahteine c966aa26ff Comments in Marlin_main.cpp 10 years ago
Scott Lahteine c54a2ea042 Adjust spacing in Marlin_main.cpp and stepper.* 10 years ago
Scott Lahteine 072625ccad Update headings in Marlin_main.cpp and stepper.cpp 10 years ago
Scott Lahteine 16032f149f Rename to codenum as a consistency 10 years ago
Scott Lahteine 273a4a253f Merge pull request #2096 from thinkyhead/cherry_picking3
Hide M117 with no LCD
10 years ago
Scott Lahteine 64825a3d1e Merge pull request #2095 from thinkyhead/cherry_picking2
Add gcode_line_error to reduce code size
10 years ago
Scott Lahteine ea3df2b0b3 Merge pull request #2094 from thinkyhead/cherry_picking
Rename process_commands to process_next_command
10 years ago
Scott Lahteine ca79282eaf Hide M117 with no LCD 10 years ago