5fd1acaf81
Revert "PowerPanic"
2018-07-20 15:20:57 +02:00
fd9b9acf4e
FSensor, code cleaning + optical quality meassurement
2018-07-20 14:03:22 +02:00
b0ebea0c61
mmu: switching extruders simplified
2018-07-20 13:20:07 +02:00
bbec1ccfd4
Add files via upload
2018-07-20 04:34:12 +00:00
a09d44b869
PowerPanic
...
experimental
2018-07-20 04:47:33 +02:00
5483bee885
FSensor - meassuring filament optical quality
2018-07-19 20:55:38 +02:00
538f8a8858
Merge remote-tracking branch 'upstream/MK3' into snmm_v2
2018-07-19 20:27:51 +02:00
231a6dcf1b
M600 for single material fix
2018-07-19 20:27:39 +02:00
86882ae10a
M600 for snmm_v2 intial working version
2018-07-19 20:16:42 +02:00
2a66251170
_DISABLE_M42_M226 removed
2018-07-19 19:33:28 +02:00
fd0b7c25e5
TMC2130 speed and accel limitation (M201, M203) for stealth and normal mode
2018-07-19 19:12:46 +02:00
2ce210a8bb
TMC2130 feedrate and acceleration limitation - separate profiles for normal and stealth mode
2018-07-19 18:56:01 +02:00
5fecb7a2dc
M600
2018-07-19 16:17:46 +02:00
3cb3ec9975
Merge pull request #940 from XPila/MK3-new_lang
...
Filament sensor tunning
2018-07-19 15:22:47 +02:00
7600848533
load to nozzle function, M600 work in progress
2018-07-19 13:14:29 +02:00
afb9ca4687
FSensor - removed fsensor blocking while load, added filament quality meassurement
2018-07-18 17:45:54 +02:00
5676550452
missing get response readded
2018-07-18 16:52:10 +02:00
b9be718deb
timeout used everywhere where we are waiting for mmu reponse
2018-07-18 16:25:31 +02:00
0a43b9ce6b
timeout when waiting for mmu OK
2018-07-18 16:17:45 +02:00
6e760ef76d
merge with upstream cleanup
2018-07-18 15:34:33 +02:00
48d6ebffd8
Fix code_seen
...
char/string version was mixed
2018-07-17 18:57:28 +02:00
3f17364589
Fix various warnings
2018-07-17 18:57:28 +02:00
7bbf9953f2
Fix missing return warnings
2018-07-17 17:57:38 +02:00
baddf38dbc
Make card filename `const`
...
Fixes warning in filename_wldsd
2018-07-17 17:55:05 +02:00
3f92630fd1
Fix setTargetHotend array overflow
...
Special function may be used instead (setTargetHotends(temp))
2018-07-17 17:55:04 +02:00
33f9af65c8
merge with upstream/MK3
2018-07-17 16:36:53 +02:00
7bec5c6d5c
Merge branch 'MK3' into MK3-new_lang
2018-07-17 11:47:01 +02:00
77426b563a
Revert "Save 80B of flash and 8B of RAM and fix compiler warning:"
2018-07-17 11:28:44 +02:00
85c37d1225
Merge branch 'MK3' into fix_compiler_warnings
2018-07-17 10:56:25 +02:00
322978c920
Merge branch 'MK3_mk_prep' into MK3
2018-07-17 10:03:31 +02:00
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
2451455974
LCD menu optimalization - initial lcd update fix
2018-07-16 23:54:46 +02:00
19a72ef9eb
LCD menu optimalization - LiquidCrystal_Prusa removed
2018-07-16 23:23:15 +02:00
e22d204e8e
LCD menu optimalization - print functions
...
+removed unused code
2018-07-16 19:29:27 +02:00
68e59399af
LCD menu optimalization - lcd_printPGM replaced with lcd_puts_P
2018-07-16 18:08:01 +02:00
0eaabed50c
LCD menu optimalization - renamed lcd_implementation clear
...
+code order
2018-07-16 17:54:16 +02:00
0924ad50d5
New localization vs octoprint fix - do not translate protocol messages
2018-07-16 04:50:43 +02:00
b6223d5623
LCD menu optimalization
2018-07-16 04:13:26 +02:00
268d2634f0
LCD menu optimalization - lcd and menu
...
removed unused code and conditional translation
2018-07-16 02:13:52 +02:00
0e15a4025b
whitespace
2018-07-15 20:24:24 +02:00
6824ab65dd
G28 fix
2018-07-15 20:00:29 +02:00
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
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
7c78559b0e
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-07-12 18:27:06 +02:00
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
07f6ddfb69
filament loading corrected
2018-07-11 22:34:32 +02:00
9b7cc60b42
filament statistics hotfix, load filament move Z simplified
2018-07-11 21:59:43 +02:00
11aa775322
move in Z before filament loading: intial version
2018-07-11 21:59:23 +02:00
d18160cab5
splash screen
2018-07-11 21:58:06 +02:00
1357e27b55
FilamentAutoload setting by shipping preparation
2018-07-11 21:56:25 +02:00
d658bf56cf
ShippingPrep Reset
...
statistics reset by shipping preparation & filament sensor force
2018-07-11 21:55:21 +02:00
4b295c4091
FilamentAutoload setting by shipping preparation
2018-07-11 20:45:56 +02:00
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
d167b631fb
ShippingPrep Reset
...
statistics reset by shipping preparation & filament sensor force
2018-07-11 18:52:58 +02:00
1ad49dc5e9
first working version
2018-07-10 10:45:45 +02:00
c7745dfb83
Merge pull request #908 from XPila/MK3-new_lang
...
TMC2130 gcodes for live motor tunning:
2018-07-09 16:58:09 +02:00
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
bde81de984
load and unload filament functions for snmm_v2
2018-07-09 15:24:59 +02:00
928dcb1417
missing initialization fix
2018-07-09 14:45:59 +02:00
5979bf5e0c
T-codes for MMU_V2: initial version
2018-07-09 13:57:36 +02:00
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
6f617696ac
dummy "ok" reponse readded (fix for SD card print with Octoprint: fixes communication timeout issues)
2018-06-25 18:52:22 +02:00
20f98d487a
Merge pull request #872 from XPila/MK3
...
Farm mode - tmc2130 extruder current setting fixed
2018-06-25 17:45:58 +02:00
fe9b4e5f1f
Farm mode - tmc2130 extruder current setting fixed
2018-06-25 17:45:07 +02:00
0fccf5a737
Merge pull request #870 from XPila/MK3
...
Mk3
2018-06-25 17:36:22 +02:00
5d531b0f66
save extruder relative mode correctly
2018-06-25 17:30:20 +02:00
12de2f95e6
Farm mode: PFW360, PFW361, PFW362, PFW363
2018-06-25 17:29:34 +02:00
6d4c3b8b27
Farm mode - reset using watchdog for MK3
2018-06-25 16:04:47 +02:00
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
a83475bf7c
whitespace
2018-06-21 22:18:10 +02:00
7b81663883
crash detection/stop print erroneous movements hotfix
2018-06-21 22:16:45 +02:00
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
2be36f626f
Merge pull request #845 from PavelSindler/crash_movements
...
crash detection fix for absolute E coordinates
2018-06-19 18:46:39 +02:00
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
1e60390545
dont process data from serial line if print is saved (crash detection and filament detection)
2018-06-19 16:51:22 +02:00
209209459d
Merge remote-tracking branch 'upstream/MK3' into crash_movements
2018-06-18 18:29:12 +02:00
7619e94040
New ML support - checksum and signature
2018-06-15 20:37:33 +02:00
ac1e089a7f
crash detection fix for absolute E coordinates
2018-06-15 20:03:48 +02:00
32165dedb0
Add PRUSA RESET command in farm mode.
2018-06-15 17:07:44 +02:00
9ba49affc6
Merge pull request #835 from PavelSindler/safety_timer_gcode
...
Safety timer gcode
2018-06-14 20:49:25 +02:00
ed2f87f4f5
documentation updated
2018-06-14 17:29:40 +02:00
eef6c68c9f
Added support for a secondary boot loader, based on the OptiBoot project,
...
modified to update the external flash memory on Einsy boards.
Due to a bug in the USB to serial converter firmware on the Prusa Einsy
boards, the STK500 protocol has been modified to never send semicolon
characters towards the main processor.
This firmware updater is compatible with a modified avrdude using
the "arduino" protocol, see the following commit.
https://github.com/prusa3d/Slic3r/tree/fwupdater_languages
2018-06-14 15:13:21 +02:00
2026e7fe4d
Revert changes in Timer class; disable safety timer in handleSafetyTimer function if safetytimer inactive time was set to zero
2018-06-14 13:14:14 +02:00
2a219143fe
Merge remote-tracking branch 'upstream/MK3' into safety_timer_gcode
2018-06-14 13:09:15 +02:00
c1425aece3
gcode: set safety timer period
2018-06-13 16:22:06 +02:00
3ca7c82e08
power panic: restore dir names
2018-06-12 19:45:59 +02:00
fb6f4c6c8f
break
2018-06-12 15:06:11 +02:00
0ab0519c01
power panic fix: short filenames
2018-06-12 14:35:25 +02:00
db9c82acef
M600 communication timeout fix
2018-06-11 20:28:18 +02:00
d6ccaa7c08
Merge pull request #830 from PavelSindler/crash_det_cool_hotend
...
Crash detection: set nozzle target temp to zero when waiting for user
2018-06-11 15:43:54 +02:00
5178675cdd
Merge pull request #829 from PavelSindler/temp_cal_fix2
...
Home XYZ: first move Z higher to protect steel sheet/heatbed
2018-06-11 15:42:59 +02:00
2f5bb80e98
crash detection: turn off nozzle when waiting for user
2018-06-11 15:34:16 +02:00
d4106c2fe3
If homing all axes, move Z little bit higher before X and Y movements to protect steel sheet/heatbed
2018-06-11 11:13:49 +02:00
0cf7d12ae3
New ML support - lcd optimalization
...
lcd_puts_P and lcd_printf_P functions
LineFeed implemented in LiquidCrystal_Prusa
2018-06-10 22:06:00 +02:00
0f75bcb442
New ML support - flash usage optimalization
...
used flash space 252826bytes (MK3 + ML support), free ~1kbyte
2018-06-10 20:44:36 +02:00
c25fec9f0a
New ML support
...
printf float library enabled - platform.txt must be modified!
+flash usage optimalization - printing to serial line
current flash usage: 253206bytes (MK3 + ML support)
platform.txt original line 20:
compiler.c.elf.flags=-w -Os -Wl,--gc-sections
platform.txt modified line 20 (enable printf float library)
compiler.c.elf.flags=-w -Os -Wl,-u,vfprintf -lprintf_flt -lm -Wl,--gc-sections
2018-06-10 20:04:25 +02:00
a1ea5019dc
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-06-10 16:29:29 +02:00
076258ff99
New ML support - cond.trans. for LANG_MODE 0
2018-06-10 16:28:15 +02:00
4567d2feca
removed unused cond. trans. for NEW_SPI
2018-06-10 16:11:39 +02:00
fcfb4cdcae
New ML support - menu tunning, startup
...
+config headers (bool - true/false replaced with 0/1)
+fixed include hierarchy
+removed comments
2018-06-10 16:04:32 +02:00
f098707021
New ML support - W25X20CL - update process UI tunning
2018-06-10 00:22:28 +02:00
5de0a6437d
New ML support - W25X20CL - lang switching
...
+removed unused code
2018-06-09 23:49:26 +02:00
dcd58d002c
New ML support - W25X20CL
...
language selection from menu is working
2018-06-09 19:16:36 +02:00
a9446cc6b3
New ML support - W25x20CL
2018-06-09 18:26:53 +02:00
ebd8375313
New ML support - external flash W25X20CL - upgrade is working!!! (hardcoded to german)
...
+print test (LT_PRINT_TEST)
2018-06-09 17:49:41 +02:00
c0946d8f04
New ML support - w25x20cl spi external flash support
...
+fixed some messages
+sec lang update test
2018-06-09 01:23:04 +02:00
31357379ff
Merge branch 'MK3' into time_remaining
2018-06-08 18:31:32 +02:00
8963757c3c
Merge branch 'MK3' into crash_detection_stop
2018-06-08 18:28:43 +02:00
5e120e6e52
power panic flow factor hotfix
2018-06-08 18:13:50 +02:00
332a23bef5
Crash detection stops and waits for user if it fails multiple times in short time frame
2018-06-08 16:08:07 +02:00
739de5224e
Merge branch 'MK3' into MK3-new_lang
2018-06-08 14:38:00 +02:00
37f82118c8
New ML support - lang select menu fix
2018-06-08 02:03:25 +02:00
bd1e410228
New ML support - W25X20CL external spi flash support
2018-06-08 00:20:28 +02:00
877f8f2a61
Merge pull request #795 from 3d-gussner/MK3_fix5
...
Fix warning: This is kind of important
2018-06-07 22:22:54 +02:00
a15f0138de
show estimated time to end of the print if available in gcode: initial version
2018-06-07 20:50:30 +02:00
42cfcb2601
Merge pull request #794 from stahlfabrik/M860-enhanced
...
Improved M860 - now wait for cooling of PINDA, too
2018-06-06 12:01:06 +02:00
1290326210
Merge pull request #790 from PavelSindler/power_panic_flow_rate
...
power panic: extruder_multipliers added
2018-06-05 20:58:15 +02:00
6a8425f62d
Merge pull request #809 from mkbel/Use_Timer
...
Use timer
2018-06-05 20:54:41 +02:00
d49c4508a7
removing some debug code
2018-06-05 20:39:42 +02:00
264daaf715
typo fixed
2018-06-05 20:33:05 +02:00
aacaf67eaa
Crash detection/filament sensor: restore print from stored line number in case that we are printing over USB, retraction fix; debug: cmd queue on LCD
2018-06-05 20:28:41 +02:00
01af8a806b
Merge branch 'MK3' into Use_Timer
2018-06-05 19:03:11 +02:00
f819392d10
Do not create static object in function. Saves 8B RAM and 16B flash, because there is no need to guard constructor against concurrent calls.
2018-06-05 18:38:25 +02:00
7cc8b743c2
Add .gitignore. Setup doxyfile. Create project documentation main page. Document property of static object constructors on gcc-avr.
2018-06-05 18:30:02 +02:00
746ac17e4e
debugging
2018-06-04 16:40:56 +02:00
47c68c884c
New ML support - fixed duplicate strings
2018-06-01 14:35:03 +02:00
53d9d8bd8a
New ML support - lang codes
...
+script tunning
2018-06-01 10:47:47 +02:00
5004433b20
Fix warning: This is kind of important
...
Again another fix from https://github.com/prusa3d/Prusa-Firmware/pull/138 made by @Thess for the MK2 branch which i think is quite important.
Ardunio IDE 1.8.5 result with Compiler warnings set to "More" or "All"
```
sketch\Marlin_main.cpp:3265:44: warning: the address of 'retracted' will always evaluate as 'true' [-Waddress]
if((echange<-MIN_RETRACT && !retracted) || (echange>MIN_RETRACT && retracted)) { //move appears to be an attempt to retract or recover
^
sketch\Marlin_main.cpp:3265:82: warning: the address of 'retracted' will always evaluate as 'true' [-Waddress]
if((echange<-MIN_RETRACT && !retracted) || (echange>MIN_RETRACT && retracted)) { //move appears to be an attempt to retract or recover
^
sketch\Marlin_main.cpp:3268:28: warning: the address of 'retracted' will always evaluate as 'true' [-Waddress]
retract(!retracted);
^
sketch\Marlin_main.cpp:3870:15: warning: statement has no effect [-Wunused-value]
```
I don't know if that helps making small pull requests as they are easier to review or it would make sense to combine few more.
Prusa should really review this pull [request](https://github.com/prusa3d/Prusa-Firmware/pull/138 ) again for the MK3 branch, as it was one that made warnings disapear in the MK2 branch and made finding new flaws in the code much much easier.
2018-06-01 10:17:03 +02:00
5a2b056d47
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-06-01 00:43:16 +02:00
7c4fce7876
whitespace correction
2018-05-31 18:55:14 +02:00
73708ec883
Improved M860 - now wait for cooling of PINDA, too
...
The M860 - wait for PINDA temperature - gcode has been improved. Until now it could only wait until the PINDA has been warmed up to a set temperature. Now it also can wait until the PINDA has cooled down to a set temperature. The calling syntax has not been changed at all. The logic now looks if the bed or hotend have a target temperature different from 0. If so, the code waits until PINDA has warmed up. Otherwise it waits until PINDA has cooled down.
Applications:
- Possibility to start a Print at exactly the right PINDA temperature. (Do not start the heater until PINDA is cooled down)
- Much easier manual temperature calibration (automating the wait for cool down in between calibration runs)
- Possibility for temp calibration verification on one heat bed by printing multiple objects with different PINDA temperatures one after the other
2018-05-31 16:41:59 +02:00
80c641ae5d
Merge pull request #789 from 3d-gussner/MK3_fix4
...
Fixed warning: invalid suffix on literal; C++11 requires a space betw…
2018-05-31 14:09:49 +02:00
37e575f4bc
New ML support - debug output, bootloader
...
bootapp - automaticaly erase flash when necessary
+test code
2018-05-30 19:29:52 +02:00
9104b0601a
power panic: extruder_multipliers added
2018-05-30 18:59:33 +02:00
eeca0f683b
Fixed warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix]
2018-05-30 16:06:22 +02:00
3bf47d7f83
"run xyz cal first" message
2018-05-30 15:29:59 +02:00
987f8969c0
Merge remote-tracking branch 'upstream/MK3' into temp_cal_coordinates_fix
2018-05-30 15:20:40 +02:00
2561ab9c7d
Merge pull request #786 from XPila/MK3-new_lang
...
Mk3 new lang
2018-05-30 14:54:47 +02:00
dce2d45499
Fixed forgotten comment
2018-05-30 13:35:48 +02:00
4746c77195
New ML support - bootloader support and update proces test
2018-05-29 21:03:47 +02:00
d307868a90
merge with upstream
2018-05-28 20:38:55 +02:00
26724c4a48
removed message
2018-05-28 20:31:57 +02:00
7e79ce8e53
MK3: crash detection for Z axis is active during auto home and mesh bed leveling (normal mode is forced for Z movents); temp cal coordintes corrections; temp cal: xy movents always in safe Z distance from heatbed, Z-axis homing improved
2018-05-28 20:26:15 +02:00
baa66a0887
New ML support - secondary language name, language selection
2018-05-28 17:14:55 +02:00
28a767b460
Merge pull request #760 from PavelSindler/safety_timer_fixes
...
Safety timer not active during filament runout procedure
2018-05-28 13:28:24 +02:00
58ae70c4e1
Merge branch 'MK3' into MK3-new_lang
2018-05-28 13:22:14 +02:00
15207e4d5e
Linearity correction fix - (eeprom storage changed to byte instead of word)
...
+enabled for XYZ axes
2018-05-28 01:47:08 +02:00
55157640c5
New ML support - czech version is working!!!
...
postbuild.sh, make_lang.sh - fixed (id and offset calculation)
language.c, language.h - fixed (==||==)
config.h - reserved space for _SEC_LANG changed
Marlin_main.cpp - debug output + hardcoded lang_select(1) //means cz
2018-05-27 15:14:04 +02:00
2ffb95c72a
bugfix: use absolute coordinates for steel sheet removal position, because there is no homing at the beginning of calibration in case that position is already known
2018-05-24 20:28:00 +02:00
2cf20c8c99
New ML support - migration - fix_source_1.sh script (replace 'MSG_xx' with '_T(MSG_xx)')
...
+ output + fixed source
2018-05-23 16:37:08 +02:00
PavelSindler
Robert Pelnar
PavelSindler
MRprusa3d
MRprusa3d
Petr Ledvina
Marek Bel
mkbel
bubnikv
3d-gussner
Christoph Stahl