Commit Graph

79 Commits

Author SHA1 Message Date
Marek Bel
ab4e789688 Partially revert "aeed49a Fix filament runout on optical filament sensors"
Revert plan move to filament change position before enqued M600.
This was workaround to problem that restore_print_from_ram_and_continue() did 3s heating pause before resuming print. This problem will be fixed properly in restore_print_from_ram_and_continue() in next commit.

Save 166B of FLASH.
2019-07-15 17:22:39 +02:00
DRracer
aeed49a80e Fix filament runout on optical filament sensors
Reworked the IR variant accordingly
Some code-size optimization in related functions
2019-06-05 18:33:41 +02:00
DRracer
9cb0bc7bcf Fix MINTEMP errors and fsensor runout 2019-05-24 08:46:44 +02:00
MRprusa3d
20a03d703d G-code unification
"FSENSOR_RECOVER" ->-> "PRUSA fsensor_recover"
2019-03-05 13:36:13 +01:00
PavelSindler
9926468c91 Merge remote-tracking branch 'upstream/MK3' into variants 2019-01-30 17:26:45 +01:00
PavelSindler
83510ed489 check_for_ir_sensor 2019-01-28 17:27:16 +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
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
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
Robert Pelnar
6157c3ab32 New filament sensor 2018-12-06 15:41:53 +01:00
PavelSindler
0e65790218 removed redundant code 2018-11-21 19:49:19 +01:00
PavelSindler
74a7341005 mmu: FINDA disabled by damaged/disconnected PAT9125 hotfix 2018-11-21 19:27:55 +01:00
Robert Pelnar
d886ba1100 Fix PFW657 - filament runout detection is not working after autoload disabled from menu. 2018-11-13 14:05:15 +01:00
MRprusa3d
fd45dd64dc Bed PowerMonitor III 2018-11-08 03:32:00 +01:00
MRprusa3d
4ae857136d Bed PowerMonitor II 2018-11-07 13:38:39 +01:00
MRprusa3d
18a8ae5b8f Bed PowerMonitor
bed power monitoring correction
2018-11-01 20:55:42 +01:00
PavelSindler
a9317b4d36 upstream/MK3 merge 2018-10-25 21:46:32 +02:00
PavelSindler
a6a81c6ea6 mmu2: filament senor (FINDA) can be switched ON/OFF from menu without dependency on pat9125 state 2018-10-25 18:26:26 +02:00
PavelSindler
bd8ca8d652 removed redefinition of functions in fsensor.cpp 2018-10-22 20:51:44 +02:00
PavelSindler
940f436a5f merge MK3_dev into MK3 2018-10-22 20:25:29 +02:00
PavelSindler
866d6758c3
Merge pull request #1243 from mkbel/simplify_EEPROM_M500
Simplify eeprom m500
2018-10-10 13:11:17 +02:00
Marek Bel
9dff6431e6 Format fsensor documentation. 2018-10-09 22:33:54 +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
Robert Pelnar
9960c80bf7 Additional check always with enabled oq_meassure
+ variant files
2018-10-04 16:12:41 +02:00
Robert Pelnar
f9d8c46802 Enable/disable optical quality meassurement in settings menu 2018-10-04 15:48:28 +02:00
PavelSindler
aefb4e5c09
Merge pull request #1200 from XPila/MK3
Filament sensor - fix invalid calculation of fsensor_counter in LA st…
2018-09-27 21:05:33 +02:00
Robert Pelnar
c2f535b619 Filament sensor - fix invalid calculation of fsensor_counter in LA stepper.
+decreased additional check sensitivity/sctrictness
2018-09-26 18:59:07 +02:00
PavelSindler
e6a00b8f53 send busy messages when checking for filament presence 2018-09-25 19:14:57 +02:00
Marek Bel
3f28632443 Use cs.axis_steps_per_unit from ConfigurationStore. 2018-09-24 14:54:41 +02:00
Marek Bel
9868dd766e Fix print not recovered when filament sensor is disabled during filament change initiated by filament run out. 2018-09-19 14:22:08 +02:00
Marek Bel
a5a7b1f1d6 Move functions definitions behind variable definitions. (No change in functionality.) 2018-09-19 14:08:31 +02:00
Marek Bel
af08e16426 Use stop_and_save_print_to_ram() and restore_print_from_ram_and_continue() pair to pause print from menu. Move declaration of those functions to marlin.h. Move declaration of FSensorStateMenu to ultralcd.h.
Known limitations: Filament is not retracted, extruder is not lifted in Z and moved to rear left corner in XY. Nozzle heating is not turned off nor restored. Unused code is not removed.
2018-09-04 08:13:56 +02:00
Marek Bel
cc0249126a Document fsensor_update, remove disabled code. 2018-08-15 21:36:23 +02:00
Marek Bel
1b299618c1 Fix compiler warnings: sketch/fsensor.cpp: In function 'void __vector_11()':
sketch/fsensor.cpp:370:50: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
       if (pat9125_y > 0) if (fsensor_oq_yd_min > pat9125_y) fsensor_oq_yd_min = (fsensor_oq_yd_min + pat9125_y) / 2;
                                                  ^
sketch/fsensor.cpp:371:51: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
       if (pat9125_y >= 0) if (fsensor_oq_yd_max < pat9125_y) fsensor_oq_yd_max = (fsensor_oq_yd_max + pat9125_y) / 2;
2018-08-02 14:13:29 +02:00
Marek Bel
25c00393ff Fix compiler warning sketch/fsensor.cpp:221:10: warning: unused variable 'fsensor_autoload_c_old' [-Wunused-variable] 2018-08-02 14:13:29 +02:00
Robert Pelnar
c2fe3b920c FSensor - chunk defined in mm, runout detection distance tunning 2018-08-01 01:24:35 +02:00
Robert Pelnar
9509a60549 FSensor improovement
autoload sensitivity decreased (false triggering on MK25)
filtering algorithm more robust
additional check - fixed sync with autoload and better condition
2018-07-31 20:23:31 +02:00
Robert Pelnar
7731898b58 FSensor - optical quality meassurement - ignore reflexivity for materials with low data deviation 2018-07-31 16:28:11 +02:00
Robert Pelnar
dd23835480 fsensor - fix - do not report poor filament response when disabled 2018-07-27 20:53:25 +02:00
Robert Pelnar
2f9003dbdd fsensor - better state handling 2018-07-26 19:50:33 +02:00
Robert Pelnar
60b4db15e0 FSensor - M600 fix + cond. translation + tunning filter and params 2018-07-22 16:14:13 +02:00
Robert Pelnar
c6a3f073dd FSensor - M600/autoload fix + optical quality meassurement 2018-07-21 17:04:29 +02:00
Robert Pelnar
980c044dac FSensor - code cleaning 2018-07-21 01:57:41 +02:00
Robert Pelnar
2e260aeccc FSensor - autoload fixed 2018-07-21 01:30:16 +02:00
Robert Pelnar
1309c52bcf FSensor - code cleaning + simplification
+ removed DEBUG_DISABLE_FSENSORCHECK
+ added FILAMENT_SENSOR
2018-07-20 23:48:00 +02:00
Robert Pelnar
0f91bf9527 FSensor - optical quality meassurement durring load filament 2018-07-20 20:30:08 +02:00
Robert Pelnar
fd9b9acf4e FSensor, code cleaning + optical quality meassurement 2018-07-20 14:03:22 +02:00
Robert Pelnar
5483bee885 FSensor - meassuring filament optical quality 2018-07-19 20:55:38 +02:00
Robert Pelnar
afb9ca4687 FSensor - removed fsensor blocking while load, added filament quality meassurement 2018-07-18 17:45:54 +02:00