3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1656 commits 3 branches 78 tags 40 MiB
Commit graph

575 commits

Author SHA1 Message Date
Marek Bel
3811e30df9 Fix compiler warning: sketch/Marlin_main.cpp:1042:40: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] 2018-07-24 16:04:19 +02:00
Marek Bel
0bde84983b Fix compiler warning sketch/Marlin_main.cpp:798:6: warning: unused variable 'cursor_pos' [-Wunused-variable] 2018-07-24 15:47:39 +02:00
Martin Remiš
c7d7389e27 PowerPanic & Sound 2018-07-23 20:04:47 +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
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
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
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
Petr Ledvina
48d6ebffd8 Fix code_seen 
char/string version was mixed
 2018-07-17 18:57:28 +02:00
Petr Ledvina
3f17364589 Fix various warnings 2018-07-17 18:57:28 +02:00
Petr Ledvina
7bbf9953f2 Fix missing return warnings 2018-07-17 17:57:38 +02:00
Petr Ledvina
baddf38dbc Make card filename const 
Fixes warning in filename_wldsd
 2018-07-17 17:55:05 +02:00
Petr Ledvina
3f92630fd1 Fix setTargetHotend array overflow 
Special function may be used instead (setTargetHotends(temp))
 2018-07-17 17:55:04 +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
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
Marek Bel
42893b7a94 Fix compiler warnings: 
sketch/Marlin_main.cpp:806:6: warning: unused variable 'cursor_pos' [-Wunused-variable]
sketch/Marlin_main.cpp:1922:7: warning: unused variable 'stack_integrity' [-Wunused-variable]
sketch/Marlin_main.cpp:4254:8: warning: unused variable 'clamped' [-Wunused-variable]
 2018-07-13 20:47:40 +02:00
Marek Bel
c251777590 Fix compiler warning: 
In file included from sketch/BlinkM.cpp:5:0:
sketch/Marlin.h:422:13: warning: 'void print_time_remaining_init()' declared 'static' but never defined [-Wunused-function]
 static void print_time_remaining_init();

Make local functions static. Saves 6B of flash.
 2018-07-13 18:44:54 +02:00
Robert Pelnar
7c78559b0e Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang 2018-07-12 18:27:06 +02:00
Marek Bel
2c00f065fd Fix error in recovering after power panic. (Function pointer was passed instead of function been called.) 
It manifested istself as following compiler warnings:
sketch/Marlin_main.cpp: In function 'void print_physical_coordinates()':
sketch/Marlin_main.cpp:9065:86: warning: pointer to a function used in arithmetic [-Wpointer-arith]
  printf_P(_N("physical coordinates: (%.3f, %.3f, %.3f)\n"), st_get_position_mm[X_AXIS], st_get_position_mm[Y_AXIS], st_get_position_mm[Z_AXIS]);
                                                                                      ^
sketch/Marlin_main.cpp:9065:114: warning: pointer to a function used in arithmetic [-Wpointer-arith]
  printf_P(_N("physical coordinates: (%.3f, %.3f, %.3f)\n"), st_get_position_mm[X_AXIS], st_get_position_mm[Y_AXIS], st_get_position_mm[Z_AXIS]);
                                                                                                                  ^
sketch/Marlin_main.cpp:9065:142: warning: pointer to a function used in arithmetic [-Wpointer-arith]
  printf_P(_N("physical coordinates: (%.3f, %.3f, %.3f)\n"), st_get_position_mm[X_AXIS], st_get_position_mm[Y_AXIS], st_get_position_mm[Z_AXIS]);
                                                                                                                                              ^
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
 }
 ^
_Z18st_get_position_mmh+2
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
_Z18st_get_position_mmh+2
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
_Z18st_get_position_mmh+1
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
_Z18st_get_position_mmh+1
 2018-07-12 18:06:07 +02:00
PavelSindler
07f6ddfb69 filament loading corrected 2018-07-11 22:34:32 +02:00
PavelSindler
9b7cc60b42 filament statistics hotfix, load filament move Z simplified 2018-07-11 21:59:43 +02:00
PavelSindler
11aa775322 move in Z before filament loading: intial version 2018-07-11 21:59:23 +02:00
PavelSindler
d18160cab5 splash screen 2018-07-11 21:58:06 +02:00
MRprusa3d
1357e27b55 FilamentAutoload setting by shipping preparation 2018-07-11 21:56:25 +02:00
MRprusa3d
d658bf56cf ShippingPrep Reset 
statistics reset by shipping preparation & filament sensor force
 2018-07-11 21:55:21 +02:00
MRprusa3d
4b295c4091 FilamentAutoload setting by shipping preparation 2018-07-11 20:45:56 +02:00
Robert Pelnar
066c044396 fixed tmc2130_wr_CHOPCONF 
backlash - initial implementation (disabled by default)
removed menu "W25x20CL init"
splashscreen displayed before entering optiboot
 2018-07-11 20:02:46 +02:00
MRprusa3d
d167b631fb ShippingPrep Reset 
statistics reset by shipping preparation & filament sensor force
 2018-07-11 18:52:58 +02:00
PavelSindler
1ad49dc5e9 first working version 2018-07-10 10:45:45 +02:00
PavelSindler
c7745dfb83
Merge pull request #908 from XPila/MK3-new_lang 
TMC2130 gcodes for live motor tunning:
 2018-07-09 16:58:09 +02:00
Robert Pelnar
771cead291 TMC2130 gcodes for live motor tunning: 
TMC_SET_WAVE_X..E (linearity correction)
TMC_SET_CHOP_X..E (chopper configuration - 4 args - toff, hstr, hend, tbl)
 2018-07-09 16:44:10 +02:00
PavelSindler
bde81de984 load and unload filament functions for snmm_v2 2018-07-09 15:24:59 +02:00
PavelSindler
928dcb1417 missing initialization fix 2018-07-09 14:45:59 +02:00
PavelSindler
5979bf5e0c T-codes for MMU_V2: initial version 2018-07-09 13:57:36 +02:00
Marek Bel
3248edc1ca Do not skip bootloader when initiating reset by farm PRUSA RESET command. 
Set bootloader magic and run flag before watchdog reset in PRUSA RESET command.
 2018-06-26 20:12:09 +02:00
PavelSindler
6f617696ac dummy "ok" reponse readded (fix for SD card print with Octoprint: fixes communication timeout issues) 2018-06-25 18:52:22 +02:00
XPila
20f98d487a
Merge pull request #872 from XPila/MK3 
Farm mode - tmc2130 extruder current setting fixed
 2018-06-25 17:45:58 +02:00
Robert Pelnar
fe9b4e5f1f Farm mode - tmc2130 extruder current setting fixed 2018-06-25 17:45:07 +02:00
PavelSindler
0fccf5a737
Merge pull request #870 from XPila/MK3 
Mk3
 2018-06-25 17:36:22 +02:00
PavelSindler
5d531b0f66 save extruder relative mode correctly 2018-06-25 17:30:20 +02:00
Robert Pelnar
12de2f95e6 Farm mode: PFW360, PFW361, PFW362, PFW363 2018-06-25 17:29:34 +02:00
Robert Pelnar
6d4c3b8b27 Farm mode - reset using watchdog for MK3 2018-06-25 16:04:47 +02:00
PavelSindler
49ad60f0ff
Merge pull request #851 from PavelSindler/confused_display 
set default printer message when recovering from crash detection
 2018-06-22 08:48:33 +02:00
PavelSindler
a83475bf7c whitespace 2018-06-21 22:18:10 +02:00
PavelSindler
7b81663883 crash detection/stop print erroneous movements hotfix 2018-06-21 22:16:45 +02:00
PavelSindler
ee1e8dfccc set default printer message when recovering from crash detection and at the end of mesh bed leveling 2018-06-20 17:58:31 +02:00
XPila
2be36f626f
Merge pull request #845 from PavelSindler/crash_movements 
crash detection fix for absolute E coordinates
 2018-06-19 18:46:39 +02:00
PavelSindler
650d8cc643
Merge pull request #844 from mkbel/add_farm_PRUSA_RESET 
Add PRUSA RESET command in farm mode.
 2018-06-19 18:44:00 +02:00
PavelSindler
1e60390545 dont process data from serial line if print is saved (crash detection and filament detection) 2018-06-19 16:51:22 +02:00
PavelSindler
209209459d Merge remote-tracking branch 'upstream/MK3' into crash_movements 2018-06-18 18:29:12 +02:00
Robert Pelnar
7619e94040 New ML support - checksum and signature 2018-06-15 20:37:33 +02:00