Commit Graph

1959 Commits

Author SHA1 Message Date
PavelSindler 2fe8e0670a MK2 build fail fixed 2019-02-06 16:15:19 +01:00
PavelSindler 850d3316b6 variant files 2019-02-06 15:18:12 +01:00
PavelSindler ef86c78f25 menu item text changed 2019-02-06 14:24:47 +01:00
PavelSindler 1ba046395e fan measurements fix: keep fanSpeedSoftPwm = 255 during measurements, selftest changes 2019-02-06 12:37:18 +01:00
PavelSindler 27d002a46f Merge remote-tracking branch 'robert/MK3-variants' into variants 2019-02-06 09:20:21 +01:00
PavelSindler 860e6f9994 Merge remote-tracking branch 'upstream/MK3' into variants 2019-02-06 09:19:38 +01:00
PavelSindler fcb7dd90cf
Merge pull request #1505 from MRprusa3d/PFW-210
preHeat @ filament load / unload / autoLoad
2019-02-06 09:14:03 +01:00
MRprusa3d a53d150903 preHeat @ filament load / unload / autoLoad
autoLoad option added
2019-02-06 01:58:05 +01:00
Robert Pelnar 93d4128163 Fixed timer2 colission with arduino framework around "tone" function. 2019-02-05 19:08:57 +01:00
PavelSindler 62e253edd0 fanSpeed -> fanSpeedSoftPwm (fixes fan speed menu) 2019-02-05 18:21:44 +01:00
PavelSindler 903028e574 fix fan speed measuring for PWM = 255 2019-02-05 17:46:31 +01:00
PavelSindler 91b12ff64b bed level correction menu fix (menu_item_edit for negative integers) 2019-02-05 16:49:29 +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
PavelSindler 9a51a7be29 Merge branch 'bed_correction_fix' into variants 2019-02-04 12:47:06 +01:00
PavelSindler 0853ef5d06 Merge remote-tracking branch 'upstream/MK3' into variants 2019-02-04 12:45:28 +01:00
PavelSindler b4f2dc3b5e Merge remote-tracking branch 'robert/MK3-variants' into variants 2019-02-04 12:41:08 +01:00
PavelSindler 6d5a2ae816
Merge pull request #1499 from MRprusa3d/PFW-210
preHeat @ filament load / unload
2019-02-04 12:37:42 +01:00
Robert Pelnar d2a4cb4c49 Use _delay_ms instead of delay (fix - fast scrolling in sd card menu - temporary solution) 2019-02-04 12:20:07 +01:00
MRprusa3d fff8fc8a48 preHeat @ filament load / unload
filament-list correction (PET missing)
2019-02-04 12:12:35 +01:00
PavelSindler 2f9ab7b185 Merge branch 'dev' into variants 2019-02-04 01:32:24 +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 036bd4eb46 Merge branch 'dev' into variants 2019-02-04 01:20:14 +01:00
PavelSindler 6bf8611afa mintemp: delay cutting lines removed 2019-02-04 01:19:58 +01:00
PavelSindler 71e4459cc9 Merge branch 'dev' into variants 2019-02-04 01:14:11 +01:00
PavelSindler fba207e0ec crash detection: don't wait for heater if target temp = 0; new priting type 2019-02-04 01:13:46 +01:00
PavelSindler 5324181bf7 maximum bed level correction value enlarged from 50um to 100um and is now used in menus and mesh bed leveling itself 2019-02-03 20:56:14 +01:00
PavelSindler 454a087fb3 Merge branch 'dev' into variants 2019-02-01 21:24:38 +01:00
PavelSindler 4444b155f1 M600: prevention of blob; massage changed when autoload is active 2019-02-01 21:08:34 +01:00
PavelSindler 97aaf919a3 Merge remote-tracking branch 'upstream/MK3' into dev 2019-02-01 18:12:59 +01:00
Robert Pelnar 79449a8eaf Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control 2019-02-01 13:29:50 +01:00
PavelSindler 2cb3b99981 Merge branch 'dev' into variants 2019-01-31 18:04:38 +01:00
PavelSindler 4f67a9569c dont show filament sensor in extruder info menu 2019-01-31 18:03:56 +01:00
PavelSindler 6342b6032c Merge remote-tracking branch 'upstream/MK3' into variants 2019-01-31 10:18:41 +01:00
PavelSindler 491dbf5ebd
Merge pull request #1493 from MRprusa3d/PFW-210
preHeat @ filament load / unload
2019-01-31 10:15:59 +01:00
MRprusa3d 921b6993ee preHeat @ filament load / unload 2019-01-31 05:21:53 +01:00
PavelSindler 9926468c91 Merge remote-tracking branch 'upstream/MK3' into variants 2019-01-30 17:26:45 +01:00
PavelSindler b24cd58a50
Merge pull request #1491 from XPila/MK3-bed_fast_pwm
HW pwm fix
2019-01-30 12:52:44 +01:00
Robert Pelnar 9890c60fe5 HW PWM fix 2019-01-30 00:06:12 +01:00
PavelSindler bbdb2c1597 Merge branch 'dev' into variants 2019-01-29 15:34:56 +01:00
MRprusa3d 19fd05bb46
Merge pull request #1490 from PavelSindler/menu_update
menu update
2019-01-29 13:29:27 +01:00
PavelSindler 1fa9913029 include printers.h 2019-01-28 21:54:44 +01:00
PavelSindler 220437316b
Merge pull request #1485 from XPila/MK3-bed_fast_pwm
Mk3 bed fast pwm
2019-01-28 21:14:01 +01:00
PavelSindler 60acdd23c5 variants 2019-01-28 21:12:38 +01:00
PavelSindler 29e156b26d printer types updated 2019-01-28 19:48:46 +01:00
PavelSindler 25d54d43aa menu update 2019-01-28 19:41:02 +01:00
Marek Bel 6d2358125a Fix Timer_test broken by conditional translation for SYSTEM_TIMER_2. 2019-01-28 19:29:31 +01:00
PavelSindler dd4d8e1277 calibrate z endstop update 2019-01-28 19:23:19 +01:00
PavelSindler af348aa8ba compilation error fix: pin for LCD brightness 2019-01-28 17:56:44 +01:00
PavelSindler 83510ed489 check_for_ir_sensor 2019-01-28 17:27:16 +01:00
PavelSindler 8fe2d1de9a Merge remote-tracking branch 'my_dev/MK3' into dev 2019-01-28 17:15:22 +01:00
PavelSindler 8f039263d5 variant files and version 2019-01-28 17:14:24 +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
Robert Pelnar 1b4e49b5ac Fixed fancheck and include in TimerRemaining.h
this commit enables fast pwm mode for bed (SYSTEM_TIMER_2 definition uncomented)
fancheck fix verified with selftest
2019-01-28 12:57:33 +01:00
PavelSindler 0514306bed selftest fixed 2019-01-28 11:09:41 +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
PavelSindler c6e6df404c
Merge pull request #1482 from mkbel/IR_fsens_selftest
Ir fsens selftest
2019-01-28 10:39:12 +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
Marek Bel aaa2670ef8 Remove redundant enum numbering. 2019-01-25 20:14:29 +01:00
Marek Bel b167896c6d Convert lcd_selftest_screen parameter int _step to enum class testScreen screen. 2019-01-25 20:00:12 +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
Marek Bel 6d1256eaad Internationalize "Calibrating home". 2019-01-25 18:06:30 +01:00
PavelSindler fc1491670f mmu_idler_sensor_detected -> ir_sensor_detected 2019-01-25 18:03:05 +01:00
PavelSindler 6b6a3d7d5f MMU_IR_SENSOR_PIN -> IR_SENSOR_PIN 2019-01-25 18:01:17 +01:00
PavelSindler 7e3a1c7d45 merge changes from upstream 2019-01-25 17:57:24 +01:00
PavelSindler 579fb42be2
Merge pull request #1480 from MRprusa3d/PFW-556
Pfw 556
2019-01-25 15:04:26 +01:00
PavelSindler 0d1a7a1774
Merge pull request #1479 from MRprusa3d/PFW-749
SD card menu
2019-01-25 14:32:12 +01:00
PavelSindler 661c40ef75
Merge pull request #1472 from mkbel/IR_fsens_selftest
Ir fsens selftest
2019-01-25 13:14:18 +01:00
Marek Bel edc412697c Increase selftest_irsensor() filament nozzle unload temperature to ABS.
Resume nozzle temperature immediately after unload.
2019-01-24 21:24:46 +01:00
Marek Bel 68ffa95aa9 Fix axis self-test progress visualization. 2019-01-24 21:06:03 +01:00
Marek Bel 1c4f3259ea Increase heater check minimum expected temperature rises.
Bed increased from 3 to 10 K.
Nozzle increased from 10 to 30 K.

Measured rises with my MK3 printer:
Bed 26K,
Nozzle 73K.
2019-01-24 21:02:04 +01:00
Marek Bel 305598d7f6 Fix bed / nozzle test order and progress bar.
Known limitation:
Z progress shown in bed progress.
2019-01-24 20:03:37 +01:00
MRprusa3d 46e2bdaf62 Merge remote-tracking branch 'public_remote/MK3' into PFW-556 2019-01-24 19:39:34 +01:00
Marek Bel 22859800f0 Rearrange tests. Move hot end test to the end, to spare time in IR sensor test.
Known problems, hot end and bed is swapped. Bed progress indicator is painted to X axis test.
2019-01-24 19:22:36 +01:00
MRprusa3d b2b65475df SD card menu
SDcard-menu after card insertion
2019-01-24 17:32:57 +01:00
PavelSindler 6b1cf99066 conditional compilation updated 2019-01-24 16:14:02 +01:00
PavelSindler da2c963893 conditional compilation improved: fsensor_autoload_check_stop() and fsensor_autoload_check_start(); M600 "filament not responding" error on printers with ir sensor fixed 2019-01-24 16:00:52 +01:00
PavelSindler ad65024147 selftest: filament sensor check change 2019-01-24 13:57:52 +01:00
PavelSindler f4e5c729ac
Merge pull request #1451 from mkbel/Tx_fix
Tx fix
2019-01-24 13:41:43 +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
PavelSindler e0c1e4a02d version which should on all printer versions: autoload, selftest, filament detection, filament sensors initialization, filament menus 2019-01-24 01:12:30 +01:00
PavelSindler eec869b73a
Merge pull request #1477 from MRprusa3d/PFW-723
PID / manage_heater
2019-01-24 00:31:23 +01:00
MRprusa3d 15b45df9fb PID / manage_heater
better build-warnings elimination
2019-01-23 20:14:40 +01:00
MRprusa3d 867182c266 minTemp
more user-proof solution
2019-01-23 18:50:13 +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
PavelSindler 54f8f4eb4d
Merge pull request #1460 from MRprusa3d/PFW-723
Pfw 723
2019-01-23 14:12:19 +01:00
Marek Bel 1d71c1a5d1 Update IR sensor selftest progress bar more frequently. 2019-01-22 19:02:42 +01:00
Marek Bel 97a4623800 Fix lcd_selftest_screen for small _progress_scale. 2019-01-22 19:01:55 +01:00
Marek Bel 9cda0b69b8 Update IR sensor selftest progress bar. 2019-01-22 18:23:00 +01:00
Marek Bel 3ff8a7c740 Unload filament by MMU unit in selftest_irsensor().
Known limitation:
If filament was not loaded to nozzle it is sticked completely out of MMU. To be fixed in MMU, as this problem can be reproduced also from printer menu - unload filament.
2019-01-22 14:54:06 +01:00
Marek Bel c371a5ea65 Document. 2019-01-22 14:05:08 +01:00
Marek Bel a92d9c782b Add IR sensor test. 2019-01-22 11:29:55 +01:00