3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,567 Commits 3 Branches 78 Tags 40 MiB
fa30353646
Commit Graph

1192 Commits

Author SHA1 Message Date
Marek Bel
fd3e0115b6 Fix compiler warning: sketch/ultralcd.cpp:7258:61: warning: integer overflow in expression [-Woverflow] 
lcd_next_update_millis = millis() + (LCD_UPDATE_INTERVAL * 10000);

Use public interface instead of manipulating lcd_next_update_millis timer.
 2018-07-24 15:20:03 +02:00
Marek Bel
6cf17fa760 Delete TMP file added accidentally by commit "timeout when waiting for mmu OK ". 2018-07-24 14:20:13 +02:00
PavelSindler
77cc55ed76
Merge pull request #951 from PavelSindler/use_timer 
Use timer
 2018-07-24 09:31:45 +02:00
PavelSindler
90b763775c
Merge pull request #966 from PavelSindler/MK3_for_merging 
config for MK2.5 change
 2018-07-23 21:13:22 +02:00
PavelSindler
e47656df97 config for MK2.5 change 2018-07-23 21:12:50 +02:00
PavelSindler
3fd705d763
Merge pull request #965 from PavelSindler/MK3_for_merging 
config for MK25 Rambo1.0 changed
 2018-07-23 21:09:46 +02:00
PavelSindler
e4641d3db4 config for MK25 Rambo1.0 changed 2018-07-23 21:09:07 +02:00
PavelSindler
064b8a4f24
Merge pull request #964 from MRprusa3d/MK3 
PowerPanic & Sound III
 2018-07-23 20:31:32 +02:00
PavelSindler
2d078f17b0
Merge pull request #963 from PavelSindler/MK3_for_merging 
SUPPORT_VERBOSITY temporary solution
 2018-07-23 20:12:05 +02:00
PavelSindler
f72f385c82 SUPPORT_VERBOSITY temporary solution 2018-07-23 20:11:16 +02:00
PavelSindler
d35124f637
Merge pull request #962 from PavelSindler/MK3_for_merging 
config file updated
 2018-07-23 20:06:35 +02:00
PavelSindler
c65efd0114 config file updated 2018-07-23 20:05:42 +02:00
Martin Remiš
c7d7389e27 PowerPanic & Sound 2018-07-23 20:04:47 +02:00
PavelSindler
2911b92b8f
Merge pull request #961 from mkbel/fix_compiler_warnings 
Fix compiler warning arduino-1.6.9/hardware/tools/avr/avr/include/avr…
 2018-07-23 20:00:28 +02:00
Marek Bel
e77a54034c 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 18:12:08 +02:00
PavelSindler
d347cdaf1a
Merge pull request #960 from XPila/MK3-new_lang 
BOOTAPP support defined for EINSY
 2018-07-23 17:32:08 +02:00
XPila
0659cf0287
Merge pull request #953 from PavelSindler/farm_mode_fix 
G98 saves farm number
 2018-07-23 17:31:42 +02:00
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
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
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
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
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
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
814572fed5 merge with upstream 2018-07-20 17:22:06 +02:00
PavelSindler
5fd1acaf81
Revert "PowerPanic" 2018-07-20 15:20:57 +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
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
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
Robert Pelnar
c3e28b490c TMC2130 old style limits removed 
+menu draw_edit fix
 2018-07-19 17:42:59 +02:00
Robert Pelnar
b46953c790 LCD menu optimalization - lcd_draw_edit removed 2018-07-19 16:57:31 +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
Robert Pelnar
fa9d4550f0 PFW-448 menu items displaying fix 2018-07-19 15:21:46 +02:00
Robert Pelnar
42d2f31248 PFW-446 Stop print fix (recursion in lcd_update) 2018-07-19 14:23:45 +02:00
Robert Pelnar
6db1c6dc3b Long press Move Z fixed 2018-07-19 13:54:56 +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
2006ae58f1 typo fix 2018-07-18 16:54:40 +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
Robert Pelnar
2c06cb68d1 FSensor tunning - filtering changed, chunk length = 0.64mm and MAX_ERR = 10 2018-07-17 20:04:12 +02:00
PavelSindler
33f9af65c8 merge with upstream/MK3 2018-07-17 16:36:53 +02:00
Robert Pelnar
64929a78f5 Linearity correction menu disabled 2018-07-17 13:35:04 +02:00
XPila
7bec5c6d5c
Merge branch 'MK3' into MK3-new_lang 2018-07-17 11:47:01 +02:00
PavelSindler
9e2985dfba
Revert "Use timer" 2018-07-17 11:38:38 +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
e1a71118f9
Merge pull request #917 from mkbel/use_Timer 
Use timer
 2018-07-17 09:57:56 +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
PavelSindler
fddc02adfa version changed 2018-07-16 21:01:40 +02:00
Robert Pelnar
d1de75eb19 LCD menu optimalization - createChar 
+code order
 2018-07-16 19:53:34 +02:00
Robert Pelnar
e22d204e8e LCD menu optimalization - print functions 
+removed unused code
 2018-07-16 19:29:27 +02:00
PavelSindler
a575c028bf resend request sends OK 2018-07-16 19:20:39 +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
fd3fc31304 LCD menu optimalization - conversion functions - source separation 2018-07-16 17:23:35 +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
a7df5f368b LCD menu optimalization - sdcard menu fixed 2018-07-16 04:24:27 +02:00
Robert Pelnar
b6223d5623 LCD menu optimalization 2018-07-16 04:13:26 +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
PavelSindler
0e15a4025b whitespace 2018-07-15 20:24:24 +02:00
PavelSindler
6824ab65dd G28 fix 2018-07-15 20:00:29 +02:00
Robert Pelnar
39bb855333 LCD menu optimalization - menu_item_edit_int3 
MenuStack removed
FILAMENT_LCD_DISPLAY and ENCODER_STEPS_PER_MENU_ITEM removed (unused)
EXPERIMENTAL_FEATURES menu removed
 2018-07-15 18:37:59 +02:00