0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-02-17 06:48:05 +00:00
MarlinFirmware/Marlin
Rowan Meara 9850ba0cbd [1.1.x] Fix M303 thermal protection #8103 (#8126)
* Fixed M303 thermal protection

The temperature sanity checking logic was not being applied during M303
(pid autotuning) because instead of setting a target temperature, it
directly manipulated the pwm values.  When PIDTEMP/PIDTEMPBED is
enabled, PWM values rather than the target temperature determine whether
the heater is on.  I changed this to look directly at the PWM amount
when pid is enabled.

* Turn off heaters on M303 error

Currently, PID autotuning stops if it overshoots the temperature by 20C
or if if the temperature does not change for 20 minutes and it times
out.  I added calls to disable the heaters in these scenarios.

* Removed unnecessary if statement.

Added changes suggested by GMagician.

* Update temperature.cpp

* Update temperature.cpp

* Update temperature.cpp
2017-10-29 04:34:47 -05:00
..
example_configurations Revert default BABYSTEP_MULTIPLICATOR to 1 2017-10-27 19:42:51 -05:00
blinkm.cpp
blinkm.h
boards.h Added MKS GEN L board (#8088) 2017-10-27 02:13:41 -05:00
buzzer.h
cardreader.cpp Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
cardreader.h Prevent SDCARD_SORT_ALPHA from exploding 2017-10-20 19:14:11 -05:00
circularqueue.h
Conditionals.h
Conditionals_LCD.h BQ enables this in the config. Remove here 2017-10-18 23:23:56 -05:00
Conditionals_post.h Apply physical limits to mesh bounds 2017-10-24 16:49:00 -05:00
Configuration.h Clean up trailing whitespace 2017-10-27 00:02:35 -05:00
Configuration_adv.h Revert default BABYSTEP_MULTIPLICATOR to 1 2017-10-27 19:42:51 -05:00
configuration_store.cpp (1.1.x) auto tune calibration parameters (#8031) 2017-10-26 23:49:20 -05:00
configuration_store.h Expose DISABLE_M503 option as a test option 2017-07-01 21:31:28 -05:00
dac_mcp4728.cpp
dac_mcp4728.h
digipot_mcp4018.cpp
digipot_mcp4451.cpp
dogm_bitmaps.h Added option for graphical overlay for Z-offset 2017-08-31 14:21:39 -06:00
dogm_font_data_6x9_marlin.h
dogm_font_data_HD44780_C.h
dogm_font_data_HD44780_J.h
dogm_font_data_HD44780_W.h
dogm_font_data_ISO10646_1.h 1.1.x - save 1400 bytes of FLASH by using reduced font for some languages (#8095) 2017-10-25 18:32:38 -05:00
dogm_font_data_ISO10646_1_PL.h
dogm_font_data_ISO10646_1_tr.h
dogm_font_data_ISO10646_5_Cyrillic.h
dogm_font_data_ISO10646_CN.h
dogm_font_data_ISO10646_CZ.h UTF-8 mapper for Czech 2017-07-04 15:51:23 -05:00
dogm_font_data_ISO10646_Greek.h
dogm_font_data_ISO10646_Kana.h
dogm_font_data_ISO10646_SK.h Added Slovak C2C3C4 mapper implementation. 2017-10-06 14:40:15 -05:00
dogm_font_data_Marlin_symbols.h
duration_t.h
endstop_interrupts.h
endstops.cpp Prevent damage if DELTA_HEIGHT is incorrect 2017-08-11 16:09:14 -05:00
endstops.h
enum.h
fastio.h
fastio_168.h
fastio_644.h
fastio_1280.h
fastio_1281.h
fastio_AT90USB.h Tweaks for M43 2017-07-06 21:47:50 -05:00
G26_Mesh_Validation_Tool.cpp change to better (more clear) names (#8049) 2017-10-21 10:58:17 -05:00
gcode.cpp Fix compile issue with G38 2017-07-06 14:21:27 -05:00
gcode.h boolval revised (#8017) 2017-10-18 14:19:01 -05:00
hex_print_routines.cpp
hex_print_routines.h
I2CPositionEncoder.cpp Followup for I2C_POSITION_ENCODERS 2017-06-27 20:46:40 -05:00
I2CPositionEncoder.h Followup for I2C_POSITION_ENCODERS 2017-06-27 20:46:40 -05:00
language.h Unaccented French for Character Display 2017-10-14 20:17:29 -05:00
language_an.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_bg.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_ca.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_cn.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_cz.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_cz_utf8.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_da.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_de.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_el-gr.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_el.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_en.h Fix FWRETRACT logic, apply common sense 2017-10-26 22:36:41 -05:00
language_es.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_eu.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_fi.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_fr.h Fix FWRETRACT logic, apply common sense 2017-10-26 22:36:41 -05:00
language_fr_utf8.h give this language an unique name 2017-10-26 15:48:00 -05:00
language_gl.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_hr.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_it.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_kana.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_kana_utf8.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_nl.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_pl-DOGM.h Add some Polish translations 2017-10-26 22:44:23 -05:00
language_pl-HD44780.h Add some Polish translations 2017-10-26 22:44:23 -05:00
language_pl.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_pt-br.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_pt-br_utf8.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_pt.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_pt_utf8.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_ru.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_sk_utf8.h Added Slovak C2C3C4 mapper implementation. 2017-10-06 14:40:15 -05:00
language_test.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_tr.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_uk.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_zh_CN.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
language_zh_TW.h Update links to old wiki page 2017-09-23 22:06:45 -05:00
least_squares_fit.cpp Apply coding standards to recent merges 2017-07-13 00:46:16 -05:00
least_squares_fit.h Apply coding standards to recent merges 2017-07-13 00:46:16 -05:00
M100_Free_Mem_Chk.cpp Apply const, spacing, etc. 2017-06-27 05:23:49 -05:00
macros.h XON/XOFF corrections, tweaks, formatting, etc. 2017-10-02 03:52:42 -05:00
Makefile Add Max7219 LED Matrix Debug Support (#7563) 2017-08-25 17:03:07 -05:00
Marlin.h (1.1.x) auto tune calibration parameters (#8031) 2017-10-26 23:49:20 -05:00
Marlin.ino
Marlin_main.cpp (1.1.x) serious bug G33 2017-10-29 00:22:55 +02:00
MarlinConfig.h
MarlinSerial.cpp Fix Emergency Parser 2017-10-14 15:58:07 -05:00
MarlinSerial.h Tweak spacing in utf8_mapper.h 2017-10-06 15:11:27 -05:00
Max7219_Debug_LEDs.cpp Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
Max7219_Debug_LEDs.h Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
mesh_bed_leveling.cpp Move fade_scaling_factor_for_z to Planner 2017-10-14 02:10:46 -05:00
mesh_bed_leveling.h Move fade_scaling_factor_for_z to Planner 2017-10-14 02:10:46 -05:00
nozzle.cpp
nozzle.h
pca9632.cpp Fix hexadecimal number formatting 2017-08-14 22:50:44 -05:00
pca9632.h
pins.h Added MKS GEN L board (#8088) 2017-10-27 02:13:41 -05:00
pins_3DRAG.h
pins_5DPRINT.h Remove extraneous USBCON defines for AT90USB boards 2017-07-23 16:41:48 -07:00
pins_ANET_10.h Fix encoder pulses for G3D_PANEL 2017-09-27 00:12:20 -05:00
pins_AZTEEG_X1.h Tweak Sanguinololu-related pins files 2017-08-23 18:32:59 -05:00
pins_AZTEEG_X3.h Apply some tweaks based on 2.0.x 2017-10-09 17:39:03 -05:00
pins_AZTEEG_X3_PRO.h
pins_BAM_DICE_DUE.h
pins_BQ_ZUM_MEGA_3D.h Add support for BQ heated bed kit with Hephestos 2 2017-07-07 03:10:38 -05:00
pins_BRAINWAVE.h Remove extraneous USBCON defines for AT90USB boards 2017-07-23 16:41:48 -07:00
pins_BRAINWAVE_PRO.h Remove extraneous USBCON defines for AT90USB boards 2017-07-23 16:41:48 -07:00
pins_CHEAPTRONIC.h Assign -1 to LCD_PINS_D4-7 if not defined 2017-07-06 22:47:51 -05:00
pins_CHEAPTRONICv2.h
pins_CNCONTROLS_11.h
pins_CNCONTROLS_12.h
pins_ELEFU_3.h
pins_FELIX2.h
pins_GEN3_MONOLITHIC.h
pins_GEN3_PLUS.h
pins_GEN6.h Minor patches to pins files 2017-08-23 18:32:59 -05:00
pins_GEN6_DELUXE.h
pins_GEN7_12.h
pins_GEN7_13.h
pins_GEN7_14.h
pins_GEN7_CUSTOM.h
pins_GT2560_REV_A.h Fix spacing, use single instances of similar pins 2017-10-24 19:12:40 -05:00
pins_GT2560_REV_A_PLUS.h Move SERVO0 pin on GT2560 A+ with BLTOUCH enabled 2017-09-27 10:39:44 -05:00
pins_K8200.h
pins_K8400.h
pins_LEAPFROG.h
pins_MAKEBOARD_MINI.h Fix:EndStops doesn't working with BOARD_RAMPS_14_EFB on Micromake C1 (#8041) 2017-10-21 00:24:22 -05:00
pins_MEGACONTROLLER.h
pins_MEGATRONICS.h
pins_MEGATRONICS_2.h
pins_MEGATRONICS_3.h
pins_MELZI.h Tweak Sanguinololu-related pins files 2017-08-23 18:32:59 -05:00
pins_MELZI_CREALITY.h No need for LCD_PINS_Dn when unused 2017-09-27 00:12:20 -05:00
pins_MELZI_MAKR3D.h Tweak Sanguinololu-related pins files 2017-08-23 18:32:59 -05:00
pins_MIGHTYBOARD_REVE.h
pins_MINIRAMBO.h
pins_MINITRONICS.h Assign -1 to LCD_PINS_D4-7 if not defined 2017-07-06 22:47:51 -05:00
pins_MKS_13.h MKS 1.3+: Add pin mapping for PS_ON 2017-07-21 18:50:05 -05:00
pins_MKS_BASE.h
pins_MKS_GEN_L.h Added MKS GEN L board (#8088) 2017-10-27 02:13:41 -05:00
pins_OMCA.h
pins_OMCA_A.h
pins_PRINTRBOARD.h Remove extraneous USBCON defines for AT90USB boards 2017-07-23 16:41:48 -07:00
pins_PRINTRBOARD_REVF.h Clean up excess whitespace 2017-07-06 21:24:30 -05:00
pins_RAMBO.h
pins_RAMPS.h Add some new LCD displays 2017-10-09 17:39:03 -05:00
pins_RAMPS_13.h
pins_RAMPS_OLD.h
pins_RIGIDBOARD.h
pins_RIGIDBOARD_V2.h
pins_RUMBA.h
pins_SAINSMART_2IN1.h
pins_SANGUINOLOLU_11.h Fixed ST7920_DELAY typo 2017-09-27 03:01:09 -05:00
pins_SANGUINOLOLU_12.h Tweak Sanguinololu-related pins files 2017-08-23 18:32:59 -05:00
pins_SAV_MKI.h Remove extraneous USBCON defines for AT90USB boards 2017-07-23 16:41:48 -07:00
pins_SCOOVO_X9H.h
pins_SETHI.h
pins_STB_11.h Tweak Sanguinololu-related pins files 2017-08-23 18:32:59 -05:00
pins_TEENSY2.h Remove extraneous USBCON defines for AT90USB boards 2017-07-23 16:41:48 -07:00
pins_TEENSYLU.h Remove extraneous USBCON defines for AT90USB boards 2017-07-23 16:41:48 -07:00
pins_ULTIMAIN_2.h
pins_ULTIMAKER.h
pins_ULTIMAKER_OLD.h
pins_ZRIB_V20.h
pinsDebug.h Miscellaneous tweaks to serial outputs, code cleanups 2017-08-23 18:32:58 -05:00
pinsDebug_list.h
pinsDebug_plus_70.h
pinsDebug_Teensyduino.h
planner.cpp Move fade_scaling_factor_for_z to Planner 2017-10-14 02:10:46 -05:00
planner.h Fix FWRETRACT logic, apply common sense 2017-10-26 22:36:41 -05:00
planner_bezier.cpp
planner_bezier.h
point_t.h
printcounter.cpp
printcounter.h
SanityCheck.h Apply physical limits to mesh bounds 2017-10-24 16:49:00 -05:00
Sd2Card.cpp Patch goto labels for consistency 2017-08-14 22:51:47 -05:00
Sd2Card.h Fix hexadecimal number formatting 2017-08-14 22:50:44 -05:00
SdBaseFile.cpp Add SCROLL_LONG_FILENAMES advanced option 2017-10-20 19:14:10 -05:00
SdBaseFile.h Fix hexadecimal number formatting 2017-08-14 22:50:44 -05:00
SdFatConfig.h Add SCROLL_LONG_FILENAMES advanced option 2017-10-20 19:14:10 -05:00
SdFatStructs.h Fix hexadecimal number formatting 2017-08-14 22:50:44 -05:00
SdFatUtil.cpp
SdFatUtil.h
SdFile.cpp
SdFile.h
SdInfo.h Fix hexadecimal number formatting 2017-08-14 22:50:44 -05:00
SdVolume.cpp Patch goto labels for consistency 2017-08-14 22:51:47 -05:00
SdVolume.h Fix hexadecimal number formatting 2017-08-14 22:50:44 -05:00
serial.cpp
serial.h General code cleanup, spacing 2017-09-24 16:52:41 -05:00
servo.cpp Implement SERVO_DELAY as array 2017-08-15 00:28:47 -05:00
servo.h
softspi.h Fix hexadecimal number formatting 2017-08-14 22:50:44 -05:00
speed_lookuptable.h Spacing, cleanup in speed_lookuptable.h 2016-12-19 14:52:45 -08:00
spi.h
stepper.cpp Remove legacy ADVANCE feature 2017-10-09 04:27:45 -05:00
stepper.h Remove legacy ADVANCE feature 2017-10-09 04:27:45 -05:00
stepper_dac.cpp
stepper_dac.h
stepper_indirection.cpp Use float to init TMC2133 steps-per-mm 2017-08-05 03:48:52 -05:00
stepper_indirection.h
stopwatch.cpp
stopwatch.h
temperature.cpp [1.1.x] Fix M303 thermal protection #8103 (#8126) 2017-10-29 04:34:47 -05:00
temperature.h
thermistornames.h
thermistortable_1.h
thermistortable_2.h
thermistortable_3.h
thermistortable_4.h
thermistortable_5.h
thermistortable_6.h
thermistortable_7.h
thermistortable_8.h
thermistortable_9.h
thermistortable_10.h
thermistortable_11.h
thermistortable_12.h
thermistortable_13.h
thermistortable_20.h
thermistortable_51.h
thermistortable_52.h
thermistortable_55.h
thermistortable_60.h
thermistortable_66.h
thermistortable_70.h
thermistortable_71.h
thermistortable_75.h
thermistortable_110.h
thermistortable_147.h
thermistortable_998.h
thermistortable_999.h
thermistortable_1010.h
thermistortable_1047.h
thermistortables.h
twibus.cpp
twibus.h Clean up some trailing spaces 2017-07-01 22:32:20 -05:00
types.h
ubl.cpp Apply physical limits to mesh bounds 2017-10-24 16:49:00 -05:00
ubl.h Apply physical limits to mesh bounds 2017-10-24 16:49:00 -05:00
ubl_G29.cpp Apply physical limits to mesh bounds 2017-10-24 16:49:00 -05:00
ubl_motion.cpp (1.1.x) auto tune calibration parameters (#8031) 2017-10-26 23:49:20 -05:00
ultralcd.cpp (1.1.x) auto tune calibration parameters (#8031) 2017-10-26 23:49:20 -05:00
ultralcd.h Add LCD_SET_PROGRESS_MANUALLY 2017-10-15 02:21:09 -05:00
ultralcd_impl_DOGM.h Add SCROLL_LONG_FILENAMES advanced option 2017-10-20 19:14:10 -05:00
ultralcd_impl_HD44780.h lcd <20 disply Bed Temperature cast ty (#8068) 2017-10-23 23:46:26 -05:00
ultralcd_st7565_u8glib_VIKI.h Add support for ST7565-64128N 2017-10-09 17:39:03 -05:00
ultralcd_st7920_u8glib_rrd.h Add support for ST7565-64128N 2017-10-09 17:39:03 -05:00
utf_mapper.h Tweak spacing in utf8_mapper.h 2017-10-06 15:11:27 -05:00
utility.cpp
utility.h Updates for G33-LCD interface 2017-07-07 05:00:59 -05:00
vector_3.cpp
vector_3.h
Version.h Encourage users to re-examine their configs 2017-10-24 18:33:31 -05:00
watchdog.cpp
watchdog.h