304 Commits (aaaf4febafa6c4c095e919395ddcb722cfc4b166)

Author SHA1 Message Date
Scott Lahteine ccddc280be Apply three more commits
10 years ago
Scott Lahteine 27cb90da8b IsStopped / IsRunning inline
10 years ago
Scott Lahteine e502144eda Fixup formatting of last commit
10 years ago
Richard Miles 1a5293c2ce Prevents MINTEMP / MAXTEMP when no heaters present
10 years ago
Scott Lahteine b0f198c153 heater_index above its use
10 years ago
Scott Lahteine 60f8e0386f More thermal runaway states
10 years ago
Scott Lahteine f9dbd73652 Fix tr_target_temperature type - float!
10 years ago
Scott Lahteine a3e129e091 Merge pull request #1801 from thinkyhead/fixup_probing
10 years ago
Natealus a6ba40ae48 Compiling error temperature.cpp with multiple extruders defined
10 years ago
Scott Lahteine fc3c76fc16 Fix #1800
10 years ago
Scott Lahteine 9ba55baa5b Track target temperature separately for each heater
10 years ago
Scott Lahteine 528e32a1d4 Fix timeout in thermal_runaway when temperature is set higher
10 years ago
Scott Lahteine b98ebd517e disable / enable_all_steppers functions
10 years ago
Scott Lahteine c756b4cf07 Comment tweak
10 years ago
Scott Lahteine e96df67630 Clarify thermal_runaway_protection
10 years ago
AnHardt 488666832b Remove the previously introduced ()
10 years ago
AnHardt 3f2e863206 Improve conditions for HAS_TEMP
10 years ago
AnHardt 85f8a26ba4 Fix MIN&MAX temperatures again
10 years ago
Scott Lahteine 571652c49b Fix LCD click
10 years ago
AnHardt 7b2550a604 Times can't be negative.
10 years ago
Scott Lahteine ba871e46bf Fix compiler warnings
10 years ago
Scott Lahteine df02b992b0 Fix redundant_temperatrure_raw setting
10 years ago
Scott Lahteine ce485175eb Give all temp arrays 4 indices
10 years ago
Scott Lahteine 410f64782a Always 4 temp sensors
10 years ago
Scott Lahteine ad05a726c1 Merge pull request #1691 from AnHardt/PID_dt
10 years ago
AnHardt f680e509c4 Enclosed error-messages for TEMP_SENSOR_1_AS_REDUNDANT in PSTR()
10 years ago
AnHardt ac81b4084f Make variables and function static.
10 years ago
AnHardt 01cc97a3c3 Corected condition for PIDdT
10 years ago
AnHardt 94330705c7 Move definition of PIDdT back to temperature.h
10 years ago
AnHardt dd0067afa6 Fix MAX6675 again and introduce set_current_temp_raw()
10 years ago
Scott Lahteine 0d81abe1c9 Merge branch 'Development' into config_testing
10 years ago
Scott Lahteine fc53e43de6 Don't test raw temp for MAX6675
10 years ago
Scott Lahteine 1fac388664 Revert measurement loop
10 years ago
Scott Lahteine 6bdee87be3 Cleanup temperature code
10 years ago
Scott Lahteine 15eb5d35a2 Merge branch 'Development' into config_testing
10 years ago
Scott Lahteine 3703694e30 Fix temperature min/max test
10 years ago
Scott Lahteine 63d5d28085 Merge branch 'Development' into config_testing
10 years ago
Scott Lahteine 670006b919 Remove invariant code from Configurations
10 years ago
AnHardt 47c1ea72af Merge https://github.com/kieranc/Marlin into PIDdebug
10 years ago
AnHardt 28b1c37dea Fix for #1612
10 years ago
Scott Lahteine bb4cb1b15a Merge pull request #1606 from thinkyhead/cleanup_stepper
10 years ago
Scott Lahteine c37f7d15c9 - Rename WRITE_E_STEP for consistency
10 years ago
Scott Lahteine cb57fc727d Declare pid_output for PIDBEDTEMP
10 years ago
Scott Lahteine 3d6deb9bdf Simplify manage_heater
10 years ago
Scott Lahteine e3ca9137b5 Fix missing temp_error declarations
10 years ago
AnHardt 3024f6c706 Undubble MSG_MIN &MSG MAX
10 years ago
Scott Lahteine dfb38874f8 Some suggested changes for #1555
10 years ago
Scott Lahteine 1a7b0d9a37 Redo HAS_* macros to fix define error
10 years ago
Scott Lahteine 864dddc878 Macros to the top, a few HAS_* macros
10 years ago
Scott Lahteine fd1ea9d56f Move literal strings to language files
10 years ago
Scott Lahteine aa9c1f1bed Better name for ADC macro
10 years ago
Scott Lahteine 9c9726d469 Cleanup of temperature code
10 years ago
Scott Lahteine e3fd3e8fa4 Fix typos in checkExtruderAutoFans
10 years ago
Natealus ea9e49b20d ARRAY_BY_EXTRUDERS 4th hotend PID parameters
10 years ago
kieranc 0a19109476 Enable PID debugging for heated bed
10 years ago
Natealus f4b0a40abb Additional fixes to temperature.cpp and found another missing line
10 years ago
Natealus 697ee2dc50 Compiling errors with 4 Extruders defined
10 years ago
MagoKimbra 3021f7f743 Fix PID_dT
10 years ago
MagoKimbra ef5959a705 Fix Temperature
10 years ago
MagoKimbra 3d4ee6c868 Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders
10 years ago
MagoKimbra 986e723eeb Add 4th extruder
10 years ago
Scott Lahteine f16bdd2ff2 Borrow from Ultimaker to fix MAX6675 SPI conflict
10 years ago
MagoKimbra 0ebf896070 Add 4th extruder
10 years ago
Mark Hindess 0ce252ba7a This ifdef is for bed code so should use bed constants for testing.
10 years ago
daid 53f971095d Revert "Reduce PROGMEM warnings"
10 years ago
galexander1 d4880a9e60 Revert "Move Sd library out into library"
10 years ago
Bo Herrmannsen 4b51b5a46d Merge pull request #1357 from odewdney/SDlib
10 years ago
odewdney f84ff4ba7d Move SD Fat library out of main src
10 years ago
Bo Herrmannsen ab074dac17 Merge pull request #1344 from grob6000/independent_pid
10 years ago
Bo Herrmannsen d4a665694a Merge pull request #1350 from odewdney/Development
10 years ago
odewdney 538859669d Removing compiler warnings for progmem
10 years ago
grob6000 bf2c923db5 Make multiple PID parameters a config option
10 years ago
grob6000 37c7e8300f Independent PID parameters for each extruder
10 years ago
Dino Del Favero 038fccd7a1 I have added some code in the "temperature.cpp" for have the possibility of control the time of the states with the heater drived by relays, with this feature now it is possible use PID function in conjunction with relay to control the temperature. I have made some tests and the temperature stay always in the range of +-1°C from the setted temp.
10 years ago
Philippe L 30248214c7 temp runaway: proper cast to prevent any overflow.
10 years ago
Alexander Hirzel ae12ad0d6c Fix typo, PID_BED_POWER -> MAX_BED_POWER
10 years ago
alexborro 80b17ab573 Merge pull request #1285 from drf5n/PID_CI_v2
10 years ago
David Forrest 625860f086 temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
10 years ago
David Forrest 6583bb781d temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
10 years ago
Bo Herrmannsen 0d957872a0 Merge pull request #1234 from gregrebholz/issue_1069
10 years ago
David Forrest 984177c40c temperature.cpp:Add PID Conditional integration on heated bed.
10 years ago
David Forrest c9b8435749 heater.c: Limit PID I term with conditional integration.
10 years ago
Greg Rebholz 7ecb7cbd46 Added "auto fan" checks to PID_autotune
10 years ago
Denis Chertykov b086394178 Fix syntax errors in #ifdef.
10 years ago
Scott Lahteine f83d0f2a68 Defines for electronics boards
10 years ago
Erik van der Zalm 058e446531 Merge pull request #1037 from filipmu/Filament-Sensor
10 years ago
Filip Mulier 62db9848d3 Improvements and bug fixes in sensor delay buffer for filament sensor code
10 years ago
Filip Mulier 85649a4549 Real-time filament diameter measurement and control
10 years ago
Grogyan 82606354dd Update temperature.cpp
11 years ago
alexborro 43c298a7a9 Add "Thermal Runaway Protection" feature
11 years ago
Erik van der Zalm cfb98ef682 More coverity fixes
11 years ago
Erik van der Zalm 9db9842aea Fixed error found by the free coverity tool (https://scan.coverity.com/)
11 years ago
Cameron Lai 6460709d92 Fix bug in PID Autotune report
11 years ago
David Forrest 8c4377dd63 temperature.cpp: Fix PID_DEBUG compile error.
11 years ago
ErikZalm e8291ed728 Merge pull request #802 from Makers-Tool-Works/Marlin_v1
11 years ago
RoyOnWheels aee63afccd Clarify which PID values to enter
11 years ago
Christian Axelsson c00383f286 Fixed typo.
11 years ago
ErikZalm 0d81ae77bc Merge pull request #727 from drf5n/oversampling
11 years ago
David Forrest 476c7193d8 temperature.cpp: Use OVERSAMPLENR in oversampling calculation.
11 years ago
daid df194f75e1 Added PT100 support for Ultiboard2
11 years ago
Alex Borro 5c44f6c434 Bed Heater monitoring in Controller Fan
11 years ago
Alex Borro 35905ea4f9 Allow heaters to stay full On when PWM=127
11 years ago
Erik van der Zalm 69af392554 Added HEATERS_PARALLEL (Request from reifsnyderb)
11 years ago
bkubicek d147a057ac Add the socalled "Babystepping" feature.
11 years ago
ErikZalm 07e7de3600 Merge pull request #569 from hg42/convert-PROTOCOL-macros-from-statements-to-expressions
11 years ago
hg42@gmx.net 3700f688f5 convert PROTOCOL macros from statements to (multiple, comma separated) expressions
11 years ago
daid a504c88346 Fix a bug where the PID controllers D action kicks in hard as soon as the PID controller starts.
11 years ago
Erik van der Zalm bd96d22bfb Merge branch 'Marlin_v1' into thinkyhead
12 years ago
Erik van der Zalm c8dcc7c208 Allow increasing the software PWM frequency.
12 years ago
Scott Lahteine 5dabc95409 Apply all changes from latest Marlin_V1
12 years ago
Erik van der Zalm 5090c56651 More redundant temp sensor changes. (After testing and debugging by reifsnderb)
12 years ago
Erik van der Zalm 9be61cdc02 Added redundant temp sensor
12 years ago
Robert F-C 40eb07bad4 Revert and extend previous change pin check change
12 years ago
Robert F-C 0d4a9444c4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
MaikStohn 95dff34b73 fixed wrong compare for min temp check of heater 1 and heater 2
12 years ago
MaikStohn 4cc6f9f6de fixed wrong pin initialization when using temperature 2 pin input
12 years ago
MaikStohn 61a48cc662 Add support for RUMBA thermocouple add on
12 years ago
Scott Lahteine a200521eab Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h
12 years ago
Robert F-C d5ad7a0814 Rework change to incorporate CONTROLLERFAN
12 years ago
Robert F-C c3cdaceab3 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
Simon Oliver 93f0463b21 Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values
12 years ago
whosawhatsis fd5b7e0cec Separate PID_MAX from BANG_MAX
12 years ago
Robert F-C f1263d3f88 Further reduce code by using precompiler logic
12 years ago
Robert F-C 372e12f83f Implement automatic extruder/cold-end fan control based on temperature
12 years ago
daid303 38ee395ac7 Replace the 1ms delay for 2 nops to get a 100ns delay. #259
12 years ago
oni303 ab09fa4bbf fixed pwm generation at pin D12 and D13 when one of them is used as FAN_PIN on Sanguino, added soft pwm entry for FAN_PIN in temperature.cpp
12 years ago
daid303 08356361ac Fixing a problem with heated beds not working without PID and BED_LIMIT_SWITCHING
12 years ago
daid303 f30b46b2a8 One more fix for #338, I really should get a heated bed to test with.
12 years ago
daid303 65c3f1ffcd Most likely fixing #338
12 years ago
daid303 55ba90ac19 Add PID functional range setting. With high powered heaters the current functional range of 10 degrees causes high overshoots as the PID needs to kick in before the temperature hits 10 degrees below target.
12 years ago
daid303 5ff5cee8ce Fix the sensitive pin definitions, there where analogue numbers in the digital pin list. Also made M42 without a P function on the LED_PIN (which was otherwise a useless pin definition)
12 years ago
daid303 3fb07d9b8d Add MINTEMP/MAXTEMP error to LCD, and fix temperature bug with more then 1 extruder.
12 years ago
daid303 82c8724b33 Fix compile with PID_DEBUG
12 years ago
daid303 52158dffcc Big temperature code update. No longer converts back and forwards between temperature and raw sample value. Reducing complexity, removing code. Also named some variables better. While keeping the safety intact and functionality the same.
12 years ago
daid303 587154c01b Fix the WATCHPERIOD implementation. It did not work correctly in a multi extruder setup, it did not work after 32 seconds after startup (int16 used as millies timestamp). And it did not work if you gave an M104 or M109 when the target was already around the target setpoint. So on average, it did not work at all. The new implementation should be robust in detecting a failure to heat up.
12 years ago
daid303 529748894c Minor changes in the temperature code for some cleanup.
12 years ago
daid303 6a9bee27cc Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
12 years ago
daid303 94ea26ff46 Some minor changes on code style. And a bugfix where the counters for positioning in the stepper where wrong depending on compiler settings. (Caused strange values to reported back with M114 and endstop triggers). Also fixed compiling with FWRETRACT enabled.
12 years ago
daid303 72586eb30a Solved few warnings.
12 years ago
daid303 06b58a9c4f First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
12 years ago
Mark Finn d197f8504b clean up and changes from testing
12 years ago
Mark Finn eb06a886c4 missed
12 years ago
Mark Finn 04631d2250 cleanup for pull
12 years ago
Mark Finn 9698f4ea64 bed pid
12 years ago
ZetaPhoenix e8c92e0a95 Missing #else in temperature.cpp prevented reading bed temp when TEMP_BED_PIN <7. Thanks to Leland Wallace for helping me track this down via "Sesame Street" coding (what is not like the other)
12 years ago
Dabble63 6b45e9f167 Add Duty Cycling to the Heater Bed
12 years ago
Erik van der Zalm e31bef31ad Limit PID autotune PWM to PID_MAX
13 years ago
Erik van der Zalm 1874cb71a6 Added option to increase the FAN PWM frequency.
13 years ago
Logan Bowers 3eacb4c16d Wrap the call to turn off the bed heater in a #if to prevent a compile error on boards that do not have a bed heater
13 years ago
Bernhard 33bb044d7c fixed catsting to (int)e in serial error messages.
13 years ago