josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,709 Commits 31 Branches 140 Tags 71 MiB
Commit Graph

1709 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
Marek Bel 3eae4d50f0 Update build instructions. 2018-07-23 16:03:20 +02:00
PavelSindler 87a9a721ee
Merge pull request #955 from mkbel/fix_compiler_warnings 
Fix compiler warning arduino-1.6.9/hardware/tools/avr/avr/include/avr…
 2018-07-23 15:15:24 +02:00
XPila 07d57de660
Merge pull request #956 from XPila/MK3-new_lang 
Optiboot enabled
 2018-07-23 14:42:08 +02:00
Robert Pelnar 4eb4924d81 Optiboot enabled 2018-07-23 14:41:10 +02:00
PavelSindler bc98233818
Merge pull request #954 from mkbel/reapply_fix_compiler_warnings 
Revert "Revert "Save 80B of flash and 8B of RAM and fix compiler warn…
 2018-07-23 14:38:53 +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
Robert Pelnar 896734c06b Display '!' instead of 'FR' on status screen when feedrate or acceleration limit reached. 2018-07-23 14:30:41 +02:00
Marek Bel 7cfa3156c7 Fix compiler warning arduino-1.6.9/hardware/tools/avr/avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to <util/delay.h>." [-Wcpp] 2018-07-23 13:47:15 +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
Robert Pelnar f0d939140b Menu extruder info fixed 2018-07-23 12:54:48 +02:00
PavelSindler 1a9643c892 G98 saves farm no 2018-07-23 11:49:06 +02:00
PavelSindler 9144ec87fb
Merge pull request #952 from PavelSindler/snmm_v2 
no timeouts when communicating with mmu (temporarily ?)
 2018-07-23 10:52:51 +02:00
PavelSindler 18419eefc4 no timeouts when communicating with mmu (temporarily ?) 2018-07-23 10:50:58 +02:00
PavelSindler efd03b426f final edits to fit changes on upstream 2018-07-23 09:14:22 +02:00
PavelSindler 565a6db3e4 use timer class 2018-07-22 16:26:12 +02:00
Robert Pelnar 60b4db15e0 FSensor - M600 fix + cond. translation + tunning filter and params 2018-07-22 16:14:13 +02:00
PavelSindler 5b6fb9e49b Use Timer class for button blanking. Save 74B FLASH and 1B RAM. 2018-07-22 15:05:24 +02:00
Robert Pelnar c6a3f073dd FSensor - M600/autoload fix + optical quality meassurement 2018-07-21 17:04:29 +02:00
Robert Pelnar 612e83b473 max_feedrate and max_acceleration limitation (ConfigurationStore) 2018-07-21 12:33: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 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 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
XPila ce7c4aa737
Merge pull request #947 from PavelSindler/snmm_v2 
Snmm v2
 2018-07-20 18:33:27 +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 a7e139ad8d limist added to configuration files 2018-07-20 17:38:24 +02:00
PavelSindler c437ad30fe
Merge pull request #943 from PavelSindler/snmm_v2 
M600 for snmm_v2: initial version
 2018-07-20 17:30:42 +02:00
PavelSindler 814572fed5 merge with upstream 2018-07-20 17:22:06 +02:00
PavelSindler 71979a0844
Merge pull request #946 from prusa3d/revert-944-MK3 
Revert "PowerPanic"
 2018-07-20 15:21:08 +02:00
PavelSindler 5fd1acaf81
Revert "PowerPanic" 2018-07-20 15:20:57 +02:00
PavelSindler 5e09438cc5
Merge pull request #944 from MRprusa3d/MK3 
PowerPanic
 2018-07-20 15:07:22 +02:00
PavelSindler 3c1f13377c mmu first layer cal. status line message order changed 2018-07-20 14:58:36 +02:00
PavelSindler cfe49a243a first layer calibration: intitial version 2018-07-20 14:37:01 +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
PavelSindler fbd586ff87
Merge pull request #942 from XPila/MK3-new_lang 
LCD menu + fsensor + tmc2130 speed/accel limitation
 2018-07-19 20:56:16 +02:00
Robert Pelnar 5483bee885 FSensor - meassuring filament optical quality 2018-07-19 20:55:38 +02:00
PavelSindler 045cb5bb41 stop print for mmu initial version 2018-07-19 20:46:46 +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