371 Commits (a9f64537ffcc77cbf258e902accd3c85f84a23f2)

Author SHA1 Message Date
Scott Lahteine 04fa9d4f47 Make Autotune options into Menu Edit Items 9 years ago
WPBack e3f583a3be Fixes for PID AutoTune from menu
Fixes for #3189

Setting a temp is still missing
9 years ago
WPBack 3b3e8a02b5 Initial implementation of PID Autotune Menu Items
Adds the parameter U to M303. If U1 is included , it will use the
PID-values from the auto-tune.
9 years ago
Scott Lahteine 06332f20be Merge pull request #3113 from jbrazio/bugfix/3061-stop-print-time-counter
Stop print timer with M105/M109
9 years ago
Scott Lahteine 4bbea5124d Support for multiple PWM fans 9 years ago
Scott Lahteine 2ef49a9d53 Wrap DEFAULT_Ki, DEFAULT_Kd, PID_dT
Addition to #3140
9 years ago
Scott Lahteine 1c384930f3 Merge pull request #3140 from thinkyhead/rc_fix_macro_expansion
Wrap macros to prevent bad expansions
9 years ago
Scott Lahteine 30c3a21d1f Merge pull request #3112 from thinkyhead/rc_support_MAX31855 9 years ago
Scott Lahteine f9ded2a7c4 Wrap macros to prevent bad expansions 9 years ago
jbrazio a645860431 All print timer related activity now uses print_job_start(), print_job_timer() or print_job_stop() 9 years ago
Scott Lahteine 81aab828e2 Fix a "Heating failed" error
Addressing #3085. If the target_temperature is set directly it never invokes or disables the timer set in `start_watching_heater`, so after _stopping a print_ or turning off _all heaters_ you could get a “Heating failed” error.
9 years ago
Scott Lahteine 27f244ba2c Support MAX31855 as Temperature Sensor -3 9 years ago
jbrazio 986b508ff7 Print timer now stops when it sees the last extruder temperature being shutdown 9 years ago
Scott Lahteine ff13070b59 Use _BV macros, patch up others 9 years ago
Scott Lahteine 209f5f21e0 Use macros where possible
Apply `constrain`, `NOMORE`, `NOLESS` and `CRITICAL_SECTION` macros
wherever possible.
9 years ago
Scott Lahteine 3a3d358df9 Fix Printrboard with LCD (redo)
Based on #2860 - rebased for RCBugFix
9 years ago
Blue-Marlin 0631541166 Fix disable_all_heaters() for MAX6675 9 years ago
AnHardt 57da1b8497 Host parseble output for M109, M190 and M303
Make the output of M105 more similar to Repetier.
Make the text-print pert of M105 an extra function to make it reusable. `print_heaterstates()`
Use `print_heaterstates()` in M019, M190 and M303
9 years ago
Richard Wackerbarth 956418c674 Kc is also a multi-PID parameter 9 years ago
Scott Lahteine dbd4c17096 Init Kp, Ki, Kd to 0 9 years ago
Scott Lahteine b4af4441c5 Clean up watchdog impl. 9 years ago
Scott Lahteine 9bdab4f3a8 Clean up "else" and other spacing 9 years ago
Richard Wackerbarth 25d636c9e0 Compiler issues (PR#2696) 9 years ago
AnHardt 47401ec97b MSG_EXTRUDER_SWITCHED_OFF was renamed to MSG_REDUNDANCY
in language.h, but was not renamed here. If TEMP_SENSOR_1 is enabled as redundant then
an error is thrown that MSG_EXTRUDER_SWITCHED_OFF is not defined.

Originaly by @12dstring
9 years ago
Scott Lahteine 0c7f7ebcfb Styling adjustments (PR#2668 & PR#2670)
Keep "astyled" reformatting
9 years ago
Scott Lahteine bc50db9cf6 Implement PID_ADD_EXTRUSION_RATE 9 years ago
Scott Lahteine 51e89a269c Overridable Options - Part 9 (PR#2561)
Apply `ENABLED` / `DISABLED` macros to temperature-related files.
10 years ago
AnHardt d17f7ebc8a Multiply WATCH_TEMP_PERIOD by 1000UL (PR#2535)
instead of 1000.  Else we get errors with times over 32 seconds.
10 years ago
Scott Lahteine e4c01f1c7e Simplify init with ARRAY_BY_EXTRUDERS1 macro (PR#2507) 10 years ago
Scott Lahteine 77e80ef367 Require extruders for thermal code 10 years ago
Scott Lahteine 3bde4f4855 Require temp sensor for bed thermal protection 10 years ago
ayberkozgur 7268d46508 Always calculate extruder temperature PID d term (PR#2432) 10 years ago
Scott Lahteine a274769f4f Clean up spacing and comments
Also clean up some trailing spaces in a few other sources
10 years ago
Scott Lahteine 1d94d098bf Formatting tweaks as part of fixing issue 1497 10 years ago
Scott Lahteine e602c28ad9 Set auto fan pins to OUTPUT during init
Fixes the problem of these pins being left in INPUT state, as described
in #1497
10 years ago
MagoKimbra eb81982fcd Fix error next command in autotune (PR#2274)
Now send only temperature for T or B, but not send OK.
Host interprets the line to show the right temperature, but not in
response to M105 then stop and send commands until it ends the autotune.
10 years ago
AnHardt b1404a0743 fix thermal protection state machine target temp. V2
If the target temperature is changed then it would always stay in the reset state.
Thanks to @tonokip.

Replaces #2119
10 years ago
Jonathan Bastien-Filiatrault e86f2342c0 Separate the maximum integral power for the bed from PID_INTEGRAL_DRIVE_MAX / PID_MAX.
My PID_INTEGRAL_DRIVE_MAX was at 96, which was insufficient for my bed
to reach its intended temperature. The head requires a low maximum power since
I run on 24 volts and it has a somewhat low thermal mass.
10 years ago
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.
10 years ago
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().
10 years ago
Scott Lahteine 063881b5bd Fix a couple of doubled semicolons 10 years ago
Scott Lahteine 00716d0ca0 Small start_watching_heater adjustment 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 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 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 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
AnHardt 97ca1b3f4d Name magic value 20 to MAX_OVERSHOOT_PID_AUTOTUNE
to make it better findable.
10 years ago
Scott Lahteine f65833931d Formatting tweaks 10 years ago
Scott Lahteine d693e0f378 Use WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1 as difference limit 10 years ago
Scott Lahteine 6697a8f375 Watch the heater a little longer 10 years ago
Scott Lahteine 5693a6e3c9 Fix heating error message 10 years ago
Scott Lahteine 8332a15899 Fix testing of runaway options in temperature.cpp 10 years ago
Scott Lahteine 2445ae3d3a Combine thermal runaway and watch-period
- Make thermal protection for all hotends and/or bed into simple
switches
- Now enable `WATCH_TEMP_PERIOD` when `THERMAL_PROTECTION_HOTENDS` is
enabled
- Move detailed thermal parameters to `Configuration_adv.h`
- Add sanity checks to warn about old configurations
- Change `WATCH_TEMP_PERIOD` to seconds instead of milliseconds
10 years ago
Scott Lahteine 9b3d4380d3 Only watch the heater that was set 10 years ago
Scott Lahteine 28c87ec81b Disable all heaters on temp error 10 years ago
Scott Lahteine 54deb9eea3 Enable WATCH_TEMP_PERIOD by default 10 years ago
Scott Lahteine deedb00c18 Document WATCH_TEMP_PERIOD 10 years ago
Scott Lahteine a120bf3fe4 Latest upstream commits 10 years ago
Scott Lahteine ae53b3cdc3 Fix the M303 S-1 report text 10 years ago
Scott Lahteine 0fca084ea6 Make EEPROM reproducible in GCode
With these changes the output of `M503 S0` is all you need to restore
the EEPROM. Building on this it is straightforward to save and restore
the EEPROM state using the SD card or external GCode file.

- Added `M145` to set “heatup states” for the LCD menu
- Added `M420` to toggle Mesh Bed Leveling
- Added `M421` to set a single Mesh coordinate
- Extended `Config_PrintSettings` with added M codes
- Cleaned up some comments here and there
10 years ago
paclema 581685a231 Added new PID autotune info, to make easy copy & paste results to marlin 10 years ago
Scott Lahteine 09d60e0128 Naming and code comments 10 years ago
Scott Lahteine 257a907456 Fix typo in next_bed_check_ms 10 years ago
Scott Lahteine e4b1e8651b next_ vars faster than previous_
- Change some `previous_` time vars to `next_` so an add only happens
at intervals
- Fix `HEATER_0_USES_MAX6675` polling too frequently, or not at all
10 years ago
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
This commit checks whether or not HEATER_0 is in use, and if not, skips
the MIN / MAX temperature checks.
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
Minor optimizations
10 years ago
Natealus a6ba40ae48 Compiling error temperature.cpp with multiple extruders defined
It wouldn't compile because of this line in temperature.cpp it turns out
it was just a stray ( that didn't line up with the previous lines so I
just made it in line with the rest and it compiled fine.
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
- Add comments documenting `thermal_runaway_protection`
- Add an enum for the thermal runaway states
- Add macros for temperature helper functions
- Fix a glitch with the z probe sled in homeaxis
10 years ago
AnHardt 488666832b Remove the previously introduced () 10 years ago
AnHardt 3f2e863206 Improve conditions for HAS_TEMP
and use them in temperuture.h

Flattened the if structure - the preprocessor is doing the work - not the Arduino. Arduino.
10 years ago
AnHardt 85f8a26ba4 Fix MIN&MAX temperatures again
replaced GE0 with th matching GEX in the second row.
added some ()
10 years ago
Scott Lahteine 571652c49b Fix LCD click
- Make the default LCD click sound more pleasant
- Fix warnings about bed temperature runaway
10 years ago
AnHardt 7b2550a604 Times can't be negative.
cardreader.cpp needs temperature.h for autotempShutdown() when
AUTOTEMP is defined but warns about unused variables.
Unpublished variables by putting them in to temperature.cpp.
10 years ago
Scott Lahteine ba871e46bf Fix compiler warnings
- Patched up for most included configurations
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
Move definition of PIDdT back to temperature.h
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
make it unconditional
remove all definitions in the 'Configuration.h's
remove form 'Conditionals.h'
10 years ago
AnHardt dd0067afa6 Fix MAX6675 again and introduce set_current_temp_raw()
to make the temperature-code work again with Arduino 1.0.6.

Sorry could not make an extra block on base level.
10 years ago
Scott Lahteine 0d81abe1c9 Merge branch 'Development' into config_testing
Latest upstream commits
10 years ago
Scott Lahteine fc53e43de6 Don't test raw temp for MAX6675
- Remove test of raw temp for thermistor 0 when using MAX6675
- Longer `raw_temp_value` array for `TEMP_SENSOR_1_AS_REDUNDANT`
10 years ago
Scott Lahteine 1fac388664 Revert measurement loop 10 years ago
Scott Lahteine 6bdee87be3 Cleanup temperature code
- Get rid of unused temp states in the ISR, resulting in more frequent
temperature reading with fewer sensors
- Shrink code slightly in min/max testing
10 years ago
Scott Lahteine 15eb5d35a2 Merge branch 'Development' into config_testing
Latest upstream commits
10 years ago
Scott Lahteine 3703694e30 Fix temperature min/max test
- Base tests on all thermistors/thermocouples, not just heater 0
10 years ago
Scott Lahteine 63d5d28085 Merge branch 'Development' into config_testing
Latest upstream changes
10 years ago
Scott Lahteine 670006b919 Remove invariant code from Configurations
- Add `Conditionals.h` with calculated configuration values
- Add `SanityCheck.h` with checks for configuration errors
- Remove equivalent code from all configurations
- Move error checks from some sources to `SanityCheck.h` also
- Fix initialization of count_direction in stepper.cpp
10 years ago
AnHardt 47c1ea72af Merge https://github.com/kieranc/Marlin into PIDdebug
Conflicts:
	Marlin/temperature.cpp

Cleaned merge conflict.

Codeposition had changed.
Variable pid_input had vanished.

Signed-off-by: AnHardt <github@kitelab.de>
10 years ago
AnHardt 28b1c37dea Fix for #1612 10 years ago
Scott Lahteine bb4cb1b15a Merge pull request #1606 from thinkyhead/cleanup_stepper
Cleanup of stepper.cpp
10 years ago
Scott Lahteine c37f7d15c9 - Rename WRITE_E_STEP for consistency
- Add BIT and TEST macros
- Add _APPLY_ macros to stepper.cpp to help with consolidation
- Consolidate code in stepper.cpp using macros
- Apply standards in stepper.cpp
- Use >= 0 instead of > -1 as a better semantic
- Replace DUAL_Y_CARRIAGE with Y_DUAL_STEPPER_DRIVERS
10 years ago
Scott Lahteine cb57fc727d Declare pid_output for PIDBEDTEMP 10 years ago
Scott Lahteine 3d6deb9bdf Simplify manage_heater
- Make separate get_pid_output(e) and get_pid_output_bed() function
- Reduce size of manage_heater function
- Hopefully work around linker errors
10 years ago
Scott Lahteine e3ca9137b5 Fix missing temp_error declarations
- Fix for #1591 replacing #1595
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
- Reduce calls to millis()
- General cleanup of manage_heaters
- General cleanup of pid autotune
- Formatting here & there
- Macros to clean up and shrink ISR code (reduced by ~364 lines)
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
Looks like INVERT_E3_DIR was missing in the configuration.h also as I
did a test compile with 4 extruders and Azteeg X3 Pro defined. So I also
added those lines too. Additional formatting to make the comments line
up better in that section.
10 years ago
Natealus 697ee2dc50 Compiling errors with 4 Extruders defined
Here were a few changes that I had to make/add lines for the 4th hotend.
A compiling problem in the Temperature.cpp and missing lines in
configuration.h and configuration_adv.h. I added these lines in all of
the example configs too.
10 years ago
MagoKimbra 3021f7f743 Fix PID_dT
Add PID_dT in temeprature.cpp
10 years ago
MagoKimbra ef5959a705 Fix Temperature
Githun insert this line when i merge with actual Branch development...
10 years ago
MagoKimbra 3d4ee6c868 Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders
Conflicts:
	Marlin/temperature.cpp
10 years ago
MagoKimbra 986e723eeb Add 4th extruder 10 years ago
Scott Lahteine f16bdd2ff2 Borrow from Ultimaker to fix MAX6675 SPI conflict
Changes to temperature.cpp from Ultimaker fork, intended to address
#1226 and #1227
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.
Without this fix, the code wont compile with extruder but without bed
runaway protection defined.
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
Move Sd library out into library
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
Independent PID parameters for each extruder
10 years ago
Bo Herrmannsen d4a665694a Merge pull request #1350 from odewdney/Development
Reduce PROGMEM warnings
10 years ago
odewdney 538859669d Removing compiler warnings for progmem 10 years ago
grob6000 bf2c923db5 Make multiple PID parameters a config option
* Adds config parameter `PID_PARAMS_PER_EXTRUDER` - allows single PID
parameters to be used where this would be preferable (e.g. dual
identical extruders)
* When disabled, will use `float Kp, Ki, Kd, Kc;` as before.
Preprocessor macros used to switch between.
* ultralcd.cpp defines extra menus for extra parameters only where
required
* M301 reports `e:xx` only if independent pid parameters enabled
* EEPROM structure still leaves space for 3 extruders worth, when undef
will save single parameter to all extruder positions, but only read the
first
* Switching off saves approx 330 B with no LCD enabled, 2634B with LCD
(RRD) enabled: this is significant.
* LCD modifications should be tested.
10 years ago
grob6000 37c7e8300f Independent PID parameters for each extruder
* Variables Kp, Ki, Kd, Kc now arrays of size EXTRUDERS
* M301 gains (optional, default=0) E parameter to define which
extruder's settings to modify. Tested, works with Repetier Host's EEPROM
config window, albeit only reads/updates settings for E0.
* All Kp, Ki, Kd, Kc parameters saved in EEPROM (version now v14), up to
3 extruders supported (same as Marlin in general)
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.
There is the possibility of turn on this features adding "#define SLOW_PWM_HEATERS" in Configuration.h
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
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
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
Fixes #1069.  Added "auto fan" checks to PID_autotune.
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