Commit Graph

514 Commits

Author SHA1 Message Date
Robert Pelnar 6444573c92 BOOTAPP support defined for EINSY
W25x20CL test before entering optiboot (in some error cases it hangs in optiboot and then message not shown)
2018-07-23 17:14:18 +02:00
Robert Pelnar 4eb4924d81 Optiboot enabled 2018-07-23 14:41:10 +02:00
PavelSindler b688bc9294
Merge branch 'MK3' into reapply_fix_compiler_warnings 2018-07-23 14:38:43 +02:00
PavelSindler dcf3b792be
Merge pull request #948 from XPila/MK3-new_lang
FSensor - optical quality meassurement
2018-07-23 14:37:16 +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
PavelSindler 18419eefc4 no timeouts when communicating with mmu (temporarily ?) 2018-07-23 10:50:58 +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 f07d08697a max_feedrate and max_acceleration limitation fix (M201, M203) 2018-07-21 12:24:57 +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 ca2d69271c filament_autoload_enabled renamed to fsensor_watch_autoload 2018-07-20 20:37:50 +02:00
Robert Pelnar 328cae1147 Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
# Conflicts:
#	Firmware/Marlin_main.cpp
2018-07-20 20:35:00 +02:00
Robert Pelnar 0f91bf9527 FSensor - optical quality meassurement durring load filament 2018-07-20 20:30:08 +02:00
PavelSindler eac963e3a0 timeout prolonged 2018-07-20 18:03:52 +02:00
PavelSindler 80ca5f3d33 merge with upstream fixes 2018-07-20 17:51:44 +02:00
PavelSindler 814572fed5 merge with upstream 2018-07-20 17:22:06 +02:00
PavelSindler 5fd1acaf81
Revert "PowerPanic" 2018-07-20 15:20:57 +02:00
Robert Pelnar fd9b9acf4e FSensor, code cleaning + optical quality meassurement 2018-07-20 14:03:22 +02:00
PavelSindler b0ebea0c61 mmu: switching extruders simplified 2018-07-20 13:20:07 +02:00
MRprusa3d bbec1ccfd4
Add files via upload 2018-07-20 04:34:12 +00:00
MRprusa3d a09d44b869 PowerPanic
experimental
2018-07-20 04:47:33 +02:00
Robert Pelnar 5483bee885 FSensor - meassuring filament optical quality 2018-07-19 20:55:38 +02:00
PavelSindler 538f8a8858 Merge remote-tracking branch 'upstream/MK3' into snmm_v2 2018-07-19 20:27:51 +02:00
PavelSindler 231a6dcf1b M600 for single material fix 2018-07-19 20:27:39 +02:00
PavelSindler 86882ae10a M600 for snmm_v2 intial working version 2018-07-19 20:16:42 +02:00
Robert Pelnar 2a66251170 _DISABLE_M42_M226 removed 2018-07-19 19:33:28 +02:00
Robert Pelnar fd0b7c25e5 TMC2130 speed and accel limitation (M201, M203) for stealth and normal mode 2018-07-19 19:12:46 +02:00
Robert Pelnar 2ce210a8bb TMC2130 feedrate and acceleration limitation - separate profiles for normal and stealth mode 2018-07-19 18:56:01 +02:00
PavelSindler 5fecb7a2dc M600 2018-07-19 16:17:46 +02:00
PavelSindler 3cb3ec9975
Merge pull request #940 from XPila/MK3-new_lang
Filament sensor tunning
2018-07-19 15:22:47 +02:00
PavelSindler 7600848533 load to nozzle function, M600 work in progress 2018-07-19 13:14:29 +02:00
Robert Pelnar afb9ca4687 FSensor - removed fsensor blocking while load, added filament quality meassurement 2018-07-18 17:45:54 +02:00
PavelSindler 5676550452 missing get response readded 2018-07-18 16:52:10 +02:00
PavelSindler b9be718deb timeout used everywhere where we are waiting for mmu reponse 2018-07-18 16:25:31 +02:00
PavelSindler 0a43b9ce6b timeout when waiting for mmu OK 2018-07-18 16:17:45 +02:00
PavelSindler 6e760ef76d merge with upstream cleanup 2018-07-18 15:34:33 +02:00
PavelSindler 33f9af65c8 merge with upstream/MK3 2018-07-17 16:36:53 +02:00
XPila 7bec5c6d5c
Merge branch 'MK3' into MK3-new_lang 2018-07-17 11:47:01 +02:00
PavelSindler 77426b563a
Revert "Save 80B of flash and 8B of RAM and fix compiler warning:" 2018-07-17 11:28:44 +02:00
PavelSindler 85c37d1225
Merge branch 'MK3' into fix_compiler_warnings 2018-07-17 10:56:25 +02:00
PavelSindler 322978c920 Merge branch 'MK3_mk_prep' into MK3 2018-07-17 10:03:31 +02:00
PavelSindler eb3307e8fc
Merge pull request #889 from mkbel/fix_PRUSA_RESET
Do not skip bootloader when initiating reset by farm PRUSA RESET comm…
2018-07-17 09:52:41 +02:00
Robert Pelnar 2451455974 LCD menu optimalization - initial lcd update fix 2018-07-16 23:54:46 +02:00
Robert Pelnar 19a72ef9eb LCD menu optimalization - LiquidCrystal_Prusa removed 2018-07-16 23:23:15 +02:00
Robert Pelnar e22d204e8e LCD menu optimalization - print functions
+removed unused code
2018-07-16 19:29:27 +02:00
Robert Pelnar 68e59399af LCD menu optimalization - lcd_printPGM replaced with lcd_puts_P 2018-07-16 18:08:01 +02:00
Robert Pelnar 0eaabed50c LCD menu optimalization - renamed lcd_implementation clear
+code order
2018-07-16 17:54:16 +02:00
Robert Pelnar 0924ad50d5 New localization vs octoprint fix - do not translate protocol messages 2018-07-16 04:50:43 +02:00
Robert Pelnar b6223d5623 LCD menu optimalization 2018-07-16 04:13:26 +02:00