Commit Graph

106 Commits

Author SHA1 Message Date
Marek Bel
49b1d1cb93 Move prototype to header file. 2019-02-26 18:50:15 +01:00
Marek Bel
5a5a482a59 Rename preprocessor macro K1 to PID_K1 to avoid future conflict with MMU command. 2019-02-26 13:59:44 +01:00
PavelSindler
e432e258dc extr fan RPM measuring fix 2019-02-06 22:56:10 +01:00
PavelSindler
2fe8e0670a MK2 build fail fixed 2019-02-06 16:15:19 +01:00
PavelSindler
1ba046395e fan measurements fix: keep fanSpeedSoftPwm = 255 during measurements, selftest changes 2019-02-06 12:37:18 +01:00
PavelSindler
62e253edd0 fanSpeed -> fanSpeedSoftPwm (fixes fan speed menu) 2019-02-05 18:21:44 +01:00
PavelSindler
f9298b37b8 fan check hotfix (selftest, measuring RPM, fan errors) 2019-02-05 04:02:38 +01:00
PavelSindler
ea20529945 merge changes from upstream 2019-02-04 15:23:39 +01:00
MRprusa3d
5a2df47077 minTemp
better stability for delay-cutting
2019-02-04 14:54:25 +01:00
Robert Pelnar
3244c37435 Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control 2019-02-04 01:32:04 +01:00
PavelSindler
6bf8611afa mintemp: delay cutting lines removed 2019-02-04 01:19:58 +01:00
PavelSindler
97aaf919a3 Merge remote-tracking branch 'upstream/MK3' into dev 2019-02-01 18:12:59 +01:00
PavelSindler
1742dbdb9e Merge remote-tracking branch 'my_dev/MK3' into dev 2019-01-28 16:21:57 +01:00
PavelSindler
2ea34d21e7
Revert "Revert "Mk3 bed fast pwm"" 2019-01-28 14:20:31 +01:00
PavelSindler
7889305702 merging changes from upstream 2019-01-28 11:00:42 +01:00
PavelSindler
41f103c28f
Revert "Mk3 bed fast pwm" 2019-01-28 10:53:51 +01:00
Robert Pelnar
eea755496b Conditional translation for SYSTEM_TIMER_2 because we want to have posibility to switch between old/new implementation.
Timing functions (millis, micros and delay) replaced in whole source, defined in Marlin.h.
This commit enables original implementation (SYSTEM_TIMER_2 undefined)
Verified with passed complete wizard process.
2019-01-27 22:48:51 +01:00
Robert Pelnar
9a1e914637 fix - bed heating durring selftest 2019-01-27 18:14:01 +01:00
Robert Pelnar
434a723151 Timing functions 'micros' and 'delay' replaced in whole source with 'micros2' and 'delay2' 2019-01-27 17:37:27 +01:00
Robert Pelnar
fc0b55b213 Timing functions micros2 and delay2 + fix of delay_keep_alive(). 2019-01-27 17:23:53 +01:00
PavelSindler
ab2a25cd3f Revert "Fast PWM for bed - newer set HEATER_BED_PIN to 1"
This reverts commit 50bcfae183.
2019-01-25 18:38:46 +01:00
PavelSindler
31236e411e Revert "Fast PWM for bed - set pwm value from soft_pwm_bed variable."
This reverts commit e612eb2a17.
2019-01-25 18:38:36 +01:00
PavelSindler
76db58605b Revert "Fast PWM for bed - timer2 used as system timer"
This reverts commit 0963c889f0.
2019-01-25 18:37:23 +01:00
PavelSindler
7e3a1c7d45 merge changes from upstream 2019-01-25 17:57:24 +01:00
PavelSindler
273554b9b0
Merge pull request #1470 from XPila/MK3-bed_fast_pwm
Mk3 bed fast pwm
2019-01-24 13:11:57 +01:00
MRprusa3d
15b45df9fb PID / manage_heater
better build-warnings elimination
2019-01-23 20:14:40 +01:00
Robert Pelnar
c4d5b58c37 Merge remote-tracking branch 'upstream/MK3' into MK3-bed_fast_pwm
# Conflicts:
#	Firmware/temperature.cpp
resolved
2019-01-23 17:04:41 +01:00
Robert Pelnar
50bcfae183 Fast PWM for bed - newer set HEATER_BED_PIN to 1 2019-01-21 18:21:17 +01:00
MRprusa3d
2c0d62fbf7 PID / manage_heater
some small corrections
2019-01-21 18:20:40 +01:00
Robert Pelnar
e612eb2a17 Fast PWM for bed - set pwm value from soft_pwm_bed variable. 2019-01-21 18:14:19 +01:00
Robert Pelnar
0963c889f0 Fast PWM for bed - timer2 used as system timer 2019-01-21 17:57:07 +01:00
MRprusa3d
d9f8e4eb9e PID / manage_heater
PSD regulator improvement
2019-01-17 02:57:08 +01:00
MRprusa3d
4e300fd552 minTemp
safety heaters management during/after minTemp
2019-01-02 18:25:41 +01:00
Robert Pelnar
cb334238cc Slow PWM fan @ 62.5Hz 2018-12-06 15:18:07 +01:00
MRprusa3d
83a9f75abe minTemp
correct minTemp detection @ MK2.5 & MK3
2018-11-28 23:43:16 +01:00
PavelSindler
940f436a5f merge MK3_dev into MK3 2018-10-22 20:25:29 +02:00
Marek Bel
1585dc66b0 Merge remote-tracking branch 'prusa3d/MK3_dev' into simplify_EEPROM_M500
Known limitation: Unable to compile.
2018-10-08 15:58:49 +02:00
MRprusa3d
0184f06dcf preHeatError
correction of preHeatError detection
2018-09-27 04:23:00 +02:00
Marek Bel
20ba2b1c79 Use cs.bedKp, cs.bedKi and cs.bedKd from ConfigurationStore. 2018-09-24 16:57:48 +02:00
Marek Bel
54bcc8aa52 Use cs.Kp, cs.Ki and cs.Kd from ConfigurationStore. 2018-09-24 16:54:50 +02:00
Marek Bel
98e921d456 Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings 2018-08-01 16:24:07 +02:00
MRprusa3d
970ba6fa2a Sound
all cases
2018-07-29 22:59:14 +02:00
Marek Bel
98ba79e518 Fix out of array bounds access.
Manifested as compiler warnings:

In file included from sketch/Marlin_main.cpp:67:0:
sketch/temperature.h: In function 'bool gcode_M45(bool, int8_t)':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
   target_temperature[extruder] = celsius;
                              ^
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
   target_temperature[extruder] = celsius;
                              ^
sketch/temperature.h: In function 'void long_pause()':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
   target_temperature[extruder] = celsius;
                              ^
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
   target_temperature[extruder] = celsius;
                              ^
sketch/temperature.h: In function 'void process_commands()':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
   target_temperature[extruder] = celsius;
                              ^
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
   target_temperature[extruder] = celsius;
                              ^
2018-07-25 12:52:02 +02:00
Marek Bel
88cce94cf9 Revert "Revert "Save 80B of flash and 8B of RAM and fix compiler warning:""
This reverts commit 77426b563a.
2018-07-23 13:35:38 +02:00
Petr Ledvina
fd332c1ff1 Fix ADC index overflow
Use bitmap bitcount to map pin number to adc_values array  index. Old
code fails for TEMP_AMBIENT_PIN and VOLT_BED_PIN
2018-07-17 17:55:04 +02:00
Robert Pelnar
e22d204e8e LCD menu optimalization - print functions
+removed unused code
2018-07-16 19:29:27 +02:00
Robert Pelnar
268d2634f0 LCD menu optimalization - lcd and menu
removed unused code and conditional translation
2018-07-16 02:13:52 +02:00
Robert Pelnar
c0946d8f04 New ML support - w25x20cl spi external flash support
+fixed some messages
+sec lang update test
2018-06-09 01:23:04 +02:00
PavelSindler
d86d1beeaa fan error synchronization with planner 2018-05-02 16:16:48 +02:00
PavelSindler
0ba7850146 pinda temp table changed back 2018-04-11 17:40:04 +02:00