PavelSindler
03fffae4c3
finda runout sensor can be turned on/off from menu
2018-08-27 05:20:42 +02:00
PavelSindler
ceb49d1262
finda filament runout: initial version
2018-08-27 04:21:43 +02:00
PavelSindler
d3ed270a5a
single material printer (no mmu unit) M600 hotfix: M600_check_state loop working
2018-08-26 23:52:45 +02:00
PavelSindler
2610547a48
Fixed displayed filament after load
2018-08-26 16:39:21 +02:00
PavelSindler
85358342bc
Merge pull request #1065 from PavelSindler/mmu_v2_continue_loading
...
Mmu v2: continue loading command
2018-08-25 20:03:12 +02:00
PavelSindler
f3edd37d11
removing unretract
2018-08-25 16:52:19 +02:00
PavelSindler
68f2e22dad
continue loading command
2018-08-24 18:28:05 +02:00
MRprusa3d
5dc2af961b
ShippingPrepare & M600
...
message after ShippingPrepare
M600 :: better filament (un)retraction
2018-08-23 00:08:14 +02:00
Robert Pelnar
315bfc43dd
MMU communication fix
2018-08-21 16:41:01 +02:00
Robert Pelnar
94423e6f7e
MMU communication - mmu_ready
2018-08-20 20:53:53 +02:00
Robert Pelnar
c4281b0b36
Status screen redesign - fix of flickering and text wraping on status screen
...
printf formating, saved flash, reduced code size
2018-08-20 00:27:45 +02:00
Robert Pelnar
fd9516f520
Status screen - status message logic simplification
...
added definitions of custom_message_type values
removed flag custom_message (previous solution maybe caused displaying of empty status line)
fixed in Marlin_main.cpp code "custom_message = _T(MSG_TEMP_CALIBRATION)"
2018-08-19 18:34:57 +02:00
Robert Pelnar
f1ad1d22ba
Menu lcd_adjust_bed fixed (Bed level correction, PFW-499)
2018-08-19 13:59:33 +02:00
Robert Pelnar
8409a26594
Live adjust Z - display zero in case of invalid calibration status (same logic in babystep_load and _lcd_babystep)
2018-08-10 19:55:50 +02:00
Robert Pelnar
9ee7a2124b
removed unused code
2018-08-09 18:43:07 +02:00
Robert Pelnar
796079bb08
MMU2 communication - connection after reset, fw versions, state machine
...
+removed debug log from tmc2130
2018-08-09 17:43:43 +02:00
Robert Pelnar
310751397c
line endings + fixed declaration
2018-08-08 20:11:57 +02:00
Robert Pelnar
990a5c9119
PFW489 (github issue 1008) - time remaining variables declared as uint32
2018-08-08 19:51:50 +02:00
Robert Pelnar
23e5cea5d0
MMU - code cleaning (modularity)
...
M403 set filament type
hardware reset
2018-08-08 18:58:03 +02:00
Robert Pelnar
9e09efc9f4
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
...
conflicts + fix
2018-08-07 20:55:08 +02:00
Robert Pelnar
71f1a1f6db
MMU - communication, check after start, code cleaning
2018-08-07 20:37:59 +02:00
PavelSindler
d21e527c73
PRUSA Fir reports also buildnumber
2018-08-05 20:17:04 +02:00
PavelSindler
cf06c5171c
merge with upstream
2018-08-03 18:43:09 +02:00
PavelSindler
a1f69e0924
manage response update
2018-08-03 18:37:52 +02:00
PavelSindler
5824da8310
add more extrusion to M600 load filament
2018-08-03 15:42:06 +02:00
bubnikv
dd4c4b39b4
Added support for the upstream Marlin interpretation of the M204 code:
...
M204 S.. T..:
T is interpreted the old way (as acceleration when retracting)
only if an S code is found at the same line.
This allows PrusaResearch to interpret the legacy G-codes generated
by our older Slic3r with older Slic3r profiles.
M204 P.. R.. T..:
T is ignored, P is interpreted as acceleration when extruding,
R is interpreted as acceleration when retracting.
This will be the format the Slic3r 1.41.0 will produce from
the Machine Limits page.
In the future both MK3 firmware and Slic3r will likely be extended
to support the separate travel acceleration.
This change will help us to solve the following Slic3r issue:
https://github.com/prusa3d/Slic3r/issues/1089
2018-08-03 15:33:41 +02:00
PavelSindler
ae7561bb27
M600 fix: set hotend temperature to correct value, manage_response function fix: now works in case that user presses button on mmu unit before he is asked to do it, compiler warnings (uninitialized variables) fixed
2018-08-03 15:26:39 +02:00
Robert Pelnar
468873ec68
MMU2 - removed conditional translation for SNMM_V2, new module mmu
2018-08-02 18:54:00 +02:00
Robert Pelnar
282ff6c577
removed unused union
2018-08-02 17:09:02 +02:00
Robert Pelnar
d378575a68
SNMM_V2 - default retraction declared as variable
2018-08-02 17:07:09 +02:00
PavelSindler
ac60b3ebe7
Merge pull request #996 from PavelSindler/snmm_v2
...
M600 updated
2018-08-01 19:39:08 +02:00
XPila
618aea25d6
Merge pull request #995 from PavelSindler/filament_type
...
snmm v2: send filament type to mmu
2018-08-01 19:33:44 +02:00
PavelSindler
24e7f0d0ec
mmures fix
2018-08-01 19:29:50 +02:00
PavelSindler
06063118bd
M600 updated
2018-08-01 18:47:28 +02:00
Marek Bel
b0077182e5
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:53:49 +02:00
PavelSindler
54adb0beea
missing eol added
2018-08-01 16:54:26 +02:00
PavelSindler
b35ef498f0
comments updated
2018-08-01 16:46:46 +02:00
Marek Bel
665a885a21
Merge commit 'baddf38dbc2c72ab095deaf9b3e251ea2faeb699' into fix_compiler_warnings
2018-08-01 16:44:17 +02:00
PavelSindler
135c4db5da
gcode for filemant type initial version: just re-sending information to mmu
2018-08-01 15:43:13 +02:00
PavelSindler
0e059f8da6
single material fix: remove semicolon, unload_filament() function definition
2018-08-01 11:33:58 +02:00
PavelSindler
e153a29bdb
messages corrected, 5 minutes timeout when communicating with mmu
2018-08-01 10:42:09 +02:00
PavelSindler
45ac42caff
snmm v2: manage response: wait for nozzle temp only when heating
2018-08-01 09:58:07 +02:00
PavelSindler
be1167fae3
M600 for multimaterial: don't check if filament unload was succesfull
2018-07-31 19:18:09 +02:00
PavelSindler
40da6deef8
timeouts used when getting response from mmu, M600 improvements, no filament sensor in variants file
2018-07-31 19:00:42 +02:00
PavelSindler
04d0178150
automatic M600 initial version
2018-07-31 12:24:22 +02:00
PavelSindler
67f56d3de9
merge with upstream
2018-07-30 17:24:58 +02:00
MRprusa3d
970ba6fa2a
Sound
...
all cases
2018-07-29 22:59:14 +02:00
PavelSindler
5bc40aff85
Merge pull request #975 from XPila/MK3-new_lang
...
EEPROM dump (code D3)
2018-07-26 19:59:09 +02:00
Robert Pelnar
2f9003dbdd
fsensor - better state handling
2018-07-26 19:50:33 +02:00
PavelSindler
9235ffb497
T code for SNMM_V2 fix
2018-07-26 17:03:43 +02:00
Robert Pelnar
691e7a24ed
EEPROM dump (code D3)
2018-07-26 13:20:35 +02:00
PavelSindler
cadb2e9cfe
Merge pull request #973 from MRprusa3d/MK3
...
PowerPanic IV
2018-07-26 09:40:57 +02:00
MRprusa3d
5be82962ee
PowerPanic IV
2018-07-25 19:24:41 +02:00
PavelSindler
59c0127b77
automatic M600 for mmu v2: work in progress
2018-07-25 16:48:39 +02:00
Marek Bel
702fa307bb
Fix compiler warning sketch/Marlin_main.cpp:478:14: warning: 'delta' defined but not used [-Wunused-variable].
...
Variable was never used since "Initial commit".
2018-07-25 15:08:17 +02:00
Marek Bel
98ba79e518
Fix out of array bounds access.
...
Manifested as compiler warnings:
In file included from sketch/Marlin_main.cpp:67:0:
sketch/temperature.h: In function 'bool gcode_M45(bool, int8_t)':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
^
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
^
sketch/temperature.h: In function 'void long_pause()':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
^
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
^
sketch/temperature.h: In function 'void process_commands()':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
^
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
^
2018-07-25 12:52:02 +02:00
Marek Bel
e6dcbedf82
Fix compiler warning: sketch/Marlin_main.cpp:8833:16: warning: variable 'nplanner_blocks' set but not used [-Wunused-but-set-variable]
2018-07-25 11:58:48 +02:00
Marek Bel
b357399c6b
Fix compiler warning sketch/Marlin_main.cpp:1846:1: warning: control reaches end of non-void function [-Wreturn-type].
2018-07-25 11:54:55 +02:00
Marek Bel
c7de8a91bb
Fix compiler warning sketch/Marlin_main.cpp:8811:10: warning: unused variable 'extruder_abs_pos' [-Wunused-variable]
...
Variable started to be unused in commit
fde0efc75c
power panic for absolute E coordinates: initial version
and its author told me that the change was intentional.
2018-07-25 11:33:32 +02:00
Marek Bel
0f577cace6
Fix compiler warning: sketch/Marlin_main.cpp:8759:8: warning: unused variable 'c' [-Wunused-variable]
2018-07-24 19:40:43 +02:00
Marek Bel
bd868132cc
Fix compiler warnings:
...
sketch/Marlin_main.cpp:8756:8: warning: unused variable 'x_rec' [-Wunused-variable]
sketch/Marlin_main.cpp:8756:15: warning: unused variable 'y_rec' [-Wunused-variable]
sketch/Marlin_main.cpp:8756:22: warning: unused variable 'z_pos' [-Wunused-variable]
2018-07-24 19:31:18 +02:00
Marek Bel
c19bf72ba9
Fix compiler warning sketch/Marlin_main.cpp:8220:15: warning: unused variable 'k' [-Wunused-variable].
2018-07-24 18:33:44 +02:00
Marek Bel
3f0684ea30
Fix compiler warning - remove unused variable.
2018-07-24 18:27:05 +02:00
Marek Bel
f7754faaf1
Fix compiler warning sketch/Marlin_main.cpp:7092:14: warning: variable 'make_move' set but not used [-Wunused-but-set-variable]
2018-07-24 18:06:38 +02:00
Marek Bel
68a3ae5456
Fix compiler warning sketch/Marlin_main.cpp:6331:11: warning: unused variable 'cnt' [-Wunused-variable]
2018-07-24 17:57:26 +02:00
Marek Bel
b44f71fd33
Fix compiler warning sketch/Marlin_main.cpp:6267:16: warning: variable 'TooLowZ' set but not used [-Wunused-but-set-variable]
...
int8_t TooLowZ = 0;
This variable was unused even in "Initial commit".
2018-07-24 17:30:37 +02:00
Marek Bel
d5ab657cdf
Fix compiler warnings:
...
file included from sketch/Configuration_prusa.h:2:0,
from sketch/Configuration.h:43,
from sketch/Marlin.h:22,
from sketch/Marlin_main.cpp:46:
sketch/Marlin_main.cpp: In function 'void process_commands()':
sketch/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h:106:33: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
#define NORMAL_MAX_ACCEL_XY 2500ul // max acceleration in normal mode in mm/s^2
^
sketch/Marlin_main.cpp:5772:16: note: in expansion of macro 'NORMAL_MAX_ACCEL_XY'
if (val > NORMAL_MAX_ACCEL_XY)
^
sketch/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h:102:34: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
#define SILENT_MAX_ACCEL_XY 960ul // max acceleration in silent mode in mm/s^2
^
sketch/Marlin_main.cpp:5774:23: note: in expansion of macro 'SILENT_MAX_ACCEL_XY'
if (val_silent > SILENT_MAX_ACCEL_XY)
2018-07-24 17:22:29 +02:00
Marek Bel
3a532a46bb
Fix compiler warning sketch/Marlin_main.cpp:5737:15: warning: unused variable 'area' [-Wunused-variable]
...
This variable was unused even in "Initial commit".
2018-07-24 17:17:44 +02:00
Marek Bel
97ec55b951
Fix compiler warning sketch/Marlin_main.cpp:4307:7: warning: unused variable 'Z_PROBE_FEEDRATE' [-Wunused-variable].
...
This variable was unused even in "Initial commit".
2018-07-24 17:07:21 +02:00
Marek Bel
8575645eec
Fix compiler warning: sketch/Marlin_main.cpp:4193:15: warning: statement has no effect [-Wunused-value]
...
fan_speed[1];
2018-07-24 16:56:56 +02:00
Marek Bel
9edb07afa5
Fix compiler warning sketch/Marlin_main.cpp:4218:10: warning: variable 'verbosity_level' set but not used [-Wunused-but-set-variable]
2018-07-24 16:54:12 +02:00
Marek Bel
219b98b7e1
Fix compiler warnings: sketch/Marlin_main.cpp: In function 'void setup()':
...
sketch/Marlin_main.cpp:1478:57: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if ((farm_mode == 0xFF && farm_no == 0) || (farm_no == 0xFFFF)) farm_mode = false; //if farm_mode has not been stored to eeprom yet and farm number is set to zero or EEPROM is fresh, deactivate farm mode
^
sketch/Marlin_main.cpp:1479:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (farm_no == 0xFFFF) farm_no = 0;
^
2018-07-24 16:25:10 +02:00
Marek Bel
5ceece08f8
Fix compiler warning sketch/Marlin_main.cpp:1072:46: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
...
if ((state * LANGBOOT_BLOCKSIZE) < header.size)
2018-07-24 16:07:28 +02:00
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
PavelSindler
ac1e089a7f
crash detection fix for absolute E coordinates
2018-06-15 20:03:48 +02:00
Marek Bel
32165dedb0
Add PRUSA RESET command in farm mode.
2018-06-15 17:07:44 +02:00
mkbel
9ba49affc6
Merge pull request #835 from PavelSindler/safety_timer_gcode
...
Safety timer gcode
2018-06-14 20:49:25 +02:00
PavelSindler
ed2f87f4f5
documentation updated
2018-06-14 17:29:40 +02:00
bubnikv
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
PavelSindler
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
PavelSindler
2a219143fe
Merge remote-tracking branch 'upstream/MK3' into safety_timer_gcode
2018-06-14 13:09:15 +02:00
PavelSindler
c1425aece3
gcode: set safety timer period
2018-06-13 16:22:06 +02:00
PavelSindler
3ca7c82e08
power panic: restore dir names
2018-06-12 19:45:59 +02:00
PavelSindler
fb6f4c6c8f
break
2018-06-12 15:06:11 +02:00
PavelSindler
0ab0519c01
power panic fix: short filenames
2018-06-12 14:35:25 +02:00
PavelSindler
db9c82acef
M600 communication timeout fix
2018-06-11 20:28:18 +02:00
XPila
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
XPila
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
PavelSindler
2f5bb80e98
crash detection: turn off nozzle when waiting for user
2018-06-11 15:34:16 +02:00
PavelSindler
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
Robert Pelnar
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
Robert Pelnar
0f75bcb442
New ML support - flash usage optimalization
...
used flash space 252826bytes (MK3 + ML support), free ~1kbyte
2018-06-10 20:44:36 +02:00
Robert Pelnar
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
Robert Pelnar
a1ea5019dc
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-06-10 16:29:29 +02:00
Robert Pelnar
076258ff99
New ML support - cond.trans. for LANG_MODE 0
2018-06-10 16:28:15 +02:00
Robert Pelnar
4567d2feca
removed unused cond. trans. for NEW_SPI
2018-06-10 16:11:39 +02:00
Robert Pelnar
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
Robert Pelnar
f098707021
New ML support - W25X20CL - update process UI tunning
2018-06-10 00:22:28 +02:00
Robert Pelnar
5de0a6437d
New ML support - W25X20CL - lang switching
...
+removed unused code
2018-06-09 23:49:26 +02:00
Robert Pelnar
dcd58d002c
New ML support - W25X20CL
...
language selection from menu is working
2018-06-09 19:16:36 +02:00
Robert Pelnar
a9446cc6b3
New ML support - W25x20CL
2018-06-09 18:26:53 +02:00
Robert Pelnar
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
Robert Pelnar
c0946d8f04
New ML support - w25x20cl spi external flash support
...
+fixed some messages
+sec lang update test
2018-06-09 01:23:04 +02:00
XPila
31357379ff
Merge branch 'MK3' into time_remaining
2018-06-08 18:31:32 +02:00
XPila
8963757c3c
Merge branch 'MK3' into crash_detection_stop
2018-06-08 18:28:43 +02:00
PavelSindler
5e120e6e52
power panic flow factor hotfix
2018-06-08 18:13:50 +02:00
PavelSindler
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
XPila
739de5224e
Merge branch 'MK3' into MK3-new_lang
2018-06-08 14:38:00 +02:00
Robert Pelnar
37f82118c8
New ML support - lang select menu fix
2018-06-08 02:03:25 +02:00
Robert Pelnar
bd1e410228
New ML support - W25X20CL external spi flash support
2018-06-08 00:20:28 +02:00
PavelSindler
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
PavelSindler
a15f0138de
show estimated time to end of the print if available in gcode: initial version
2018-06-07 20:50:30 +02:00
PavelSindler
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
XPila
1290326210
Merge pull request #790 from PavelSindler/power_panic_flow_rate
...
power panic: extruder_multipliers added
2018-06-05 20:58:15 +02:00
XPila
6a8425f62d
Merge pull request #809 from mkbel/Use_Timer
...
Use timer
2018-06-05 20:54:41 +02:00
PavelSindler
d49c4508a7
removing some debug code
2018-06-05 20:39:42 +02:00
PavelSindler
264daaf715
typo fixed
2018-06-05 20:33:05 +02:00
PavelSindler
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
Marek Bel
01af8a806b
Merge branch 'MK3' into Use_Timer
2018-06-05 19:03:11 +02:00
Marek Bel
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
Marek Bel
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
PavelSindler
746ac17e4e
debugging
2018-06-04 16:40:56 +02:00
Robert Pelnar
47c68c884c
New ML support - fixed duplicate strings
2018-06-01 14:35:03 +02:00
Robert Pelnar
53d9d8bd8a
New ML support - lang codes
...
+script tunning
2018-06-01 10:47:47 +02:00
3d-gussner
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
Robert Pelnar
5a2b056d47
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-06-01 00:43:16 +02:00
Christoph Stahl
7c4fce7876
whitespace correction
2018-05-31 18:55:14 +02:00
Christoph Stahl
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
XPila
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
Robert Pelnar
37e575f4bc
New ML support - debug output, bootloader
...
bootapp - automaticaly erase flash when necessary
+test code
2018-05-30 19:29:52 +02:00
PavelSindler
9104b0601a
power panic: extruder_multipliers added
2018-05-30 18:59:33 +02:00
3d-gussner
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
PavelSindler
3bf47d7f83
"run xyz cal first" message
2018-05-30 15:29:59 +02:00
PavelSindler
987f8969c0
Merge remote-tracking branch 'upstream/MK3' into temp_cal_coordinates_fix
2018-05-30 15:20:40 +02:00
PavelSindler
2561ab9c7d
Merge pull request #786 from XPila/MK3-new_lang
...
Mk3 new lang
2018-05-30 14:54:47 +02:00
3d-gussner
dce2d45499
Fixed forgotten comment
2018-05-30 13:35:48 +02:00
Robert Pelnar
4746c77195
New ML support - bootloader support and update proces test
2018-05-29 21:03:47 +02:00
PavelSindler
d307868a90
merge with upstream
2018-05-28 20:38:55 +02:00
PavelSindler
26724c4a48
removed message
2018-05-28 20:31:57 +02:00
PavelSindler
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
Robert Pelnar
baa66a0887
New ML support - secondary language name, language selection
2018-05-28 17:14:55 +02:00
XPila
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
PavelSindler
58ae70c4e1
Merge branch 'MK3' into MK3-new_lang
2018-05-28 13:22:14 +02:00
Robert Pelnar
15207e4d5e
Linearity correction fix - (eeprom storage changed to byte instead of word)
...
+enabled for XYZ axes
2018-05-28 01:47:08 +02:00
Robert Pelnar
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
PavelSindler
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
Robert Pelnar
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
Robert Pelnar
da3432e237
New ML support - changed _SEC_LANG reserved space to 10kb, added debug code
2018-05-23 16:11:12 +02:00
Robert Pelnar
f00a9ce636
New ML support - language.c, language.h - code fixed, Marlin_main.cpp - debug output
2018-05-23 15:46:08 +02:00
PavelSindler
0091b41fb5
Merge pull request #744 from PavelSindler/M860_fix
...
M860 fix: send busy messages
2018-05-23 13:15:46 +02:00
PavelSindler
137e1c5027
whitespace
2018-05-22 13:33:31 +02:00
PavelSindler
d63a17c696
Safety timer not active during filament runout detection
2018-05-22 13:31:21 +02:00
Robert Pelnar
bd587faab9
New ML support - migration - replaced source, removed original ML support files (backup)
2018-05-22 03:20:03 +02:00
MRprusa3d
83aa710da6
menu returns corrections
...
Settings::FilamentSensor & FilamentAutoload
removing Calibration::ShowEndStops @ MK3
2018-05-15 20:23:22 +02:00
PavelSindler
c59e9bd6be
M860 fix: send busy messages
2018-05-15 18:27:25 +02:00
Marek Bel
02ecd08786
Convert Time class to template, instantiate LongTimer for longer and ShortTimer for shorter periods.
2018-05-11 16:31:42 +02:00
Marek Bel
e8730c2899
Merge branch 'MK3' into read_xyz_cal
...
# Conflicts:
# Firmware/ultralcd.cpp
2018-05-10 18:31:31 +02:00
Marek Bel
c359d11858
Do not disable bed heating, when the print is paused.
...
Also remove duplicate handleSafetyTimer() call.
2018-05-04 15:21:22 +02:00
MRprusa3d
8a92d9b6a3
MaR::180501b
2018-05-02 23:49:21 +02:00
MRprusa3d
d02333918f
MaR::180501
2018-05-02 22:13:47 +02:00
PavelSindler
420d1079af
terminate temperature calibration in case that Z probing function returns false
2018-04-30 17:51:44 +02:00
PavelSindler
2a57325bd5
Merge pull request #685 from mkbel/add_safety_timer_notice
...
Show full screen blocking notification message after heater turned off
2018-04-27 17:24:33 +02:00
PavelSindler
265d4761a3
M861: steps value for 35C
2018-04-27 17:07:10 +02:00
Marek Bel
eced66f0f6
Show full screen blocking notification message after heater turning off by safety timer.
2018-04-27 16:23:20 +02:00
PavelSindler
acd308e3d4
safety timer prolonged to 30 minutes
2018-04-27 14:03:09 +02:00
PavelSindler
e7cf68e038
whitespace
2018-04-26 19:27:07 +02:00
PavelSindler
2dd0d84845
M861: usteps and z_shift variables correction
2018-04-26 19:14:28 +02:00
PavelSindler
9c3e0aab36
M861 update: use signed values
2018-04-26 18:55:08 +02:00
Marek Bel
ae08788c99
Split lcd_service_mode_show_result screens to separate functions. Make them non blocking. Remove global array distance_from_min, pass it as function return value. Make Support submenus returning to Support menu.
2018-04-26 16:36:02 +02:00
PavelSindler
2657d3febd
MK25: SILENT_MODE_NORMAL changed to SILENT_MODE_POWER
2018-04-26 15:12:45 +02:00
PavelSindler
9a6cc8a035
Merge pull request #664 from MRprusa3d/MK3
...
Mk3
2018-04-25 22:20:45 +02:00
MRprusa3d
7e462b3224
Merge branch 'MK3' into MK3
2018-04-25 19:15:36 +00:00
MRprusa3d
0b6644915a
Add files via upload
2018-04-25 18:47:19 +00:00
PavelSindler
d85a8077a8
M115 update
2018-04-25 20:39:10 +02:00
Robert Pelnar
0271ab3643
Meshbedleveling, calibration Z
...
check crash Z (MK3)
check deviation of Z-probe (>50um == error, all printers)
kill with message "debris on nozzle..."
2018-04-25 16:19:16 +02:00
XPila
5bb9451b5d
Merge pull request #658 from XPila/MK3-V3_2
...
Meshbedleveling/MK3 - check crash Z after homeaxis (kill with message…
2018-04-24 20:54:53 +02:00
Robert Pelnar
1553e99d8e
Meshbedleveling/MK3 - check crash Z after homeaxis (kill with message "debris on nozzle...")
2018-04-24 20:12:29 +02:00
PavelSindler
f9d64bdfb1
Merge pull request #655 from mkbel/fix_z_home_point
...
Fix z home point
2018-04-24 16:51:57 +02:00
XPila
79b9f736aa
Merge pull request #657 from PavelSindler/temp_cal_update
...
Temp calibration update
2018-04-24 15:16:13 +02:00
PavelSindler
8efe66ef99
remove tab
2018-04-24 14:34:49 +02:00
PavelSindler
ffe93b2ca9
whitespace correction
2018-04-24 14:33:48 +02:00
PavelSindler
cc74edfa13
whitespace
2018-04-24 14:23:52 +02:00
PavelSindler
010ceceff9
add another homing after steel sheet is removed; added timeout for pinda cooling; if PINDA doesn't trigger before reaching Z = -1mm, temp. calibration fails
2018-04-24 13:43:51 +02:00
Marek Bel
9bd4d580d7
Use right calibration point. This change is only formal, as both original and new point have same coordinates.
2018-04-23 20:33:25 +02:00
Marek Bel
cccd8246ab
Fix world2machine(const float &x, const float &y, float &out_x, float &out_y) not using input parameters if only WORLD2MACHINE_CORRECTION_SHIFT is applied.
2018-04-23 20:33:14 +02:00
PavelSindler
043c8c66be
waiting for pinda probe cooling
2018-04-19 16:55:00 +02:00
PavelSindler
5791d9f0d8
EEPROM address conflict fix; forcing selftest can happen only in case that we have TMC2130 drivers
2018-04-18 14:17:28 +02:00
Marek Bel
c88f0108af
Fix safety timer.
...
Constant parameter greater than 16 bits must by stated as unsigned long.
2018-04-13 19:30:08 +02:00
PavelSindler
b1bb6841c9
Merge pull request #617 from mkbel/fix_farm_reset_1
...
Fix farm reset
2018-04-13 10:02:54 +02:00
Marek Bel
388d6eea36
Fix printer resets in farm mode if command "PRUSA SN" is received and 32U2 processor is not responding.
2018-04-12 18:44:33 +02:00
Marek Bel
08740356b8
Move "PRUSA SN" gcode to separate function.
2018-04-12 18:41:11 +02:00
XPila
6b5835fd9f
Merge pull request #612 from PavelSindler/M861_gcode
...
M861 gcode, temp cal is automaticly activated after calibration process
2018-04-11 18:45:57 +02:00
PavelSindler
45d1dbbfe0
temp cal. active set to false
2018-04-11 18:37:07 +02:00
PavelSindler
ce66699340
dont use default temp table for new printers and dont automaticly activate temp. cal. (new pinda probes have different characteristics)
2018-04-11 18:36:38 +02:00
PavelSindler
47eab97d2d
temp. calibration is automaticly activated after calibration process
2018-04-11 18:16:16 +02:00
PavelSindler
0ba7850146
pinda temp table changed back
2018-04-11 17:40:04 +02:00
XPila
c69524c3fb
Merge pull request #611 from XPila/MK3-V3_2
...
removed Configuration_prusa.h
2018-04-11 17:33:37 +02:00
Robert Pelnar
89efcb84b1
removed Configuration_prusa.h
...
fixed - compilation for MK25
2018-04-11 17:32:31 +02:00
PavelSindler
919fba531a
wait for PINDA gcode changed
2018-04-11 16:48:47 +02:00
PavelSindler
f70685a92d
Merge pull request #542 from stahlfabrik/MK3_PINDA_TEMP_WAIT_GCODE
...
MK3 Add Gcode to wait for minimum PINDA temp
2018-04-11 16:40:21 +02:00
Robert Pelnar
92997204a1
Linearity correction - TMC codes for calibration object, variable stored as uint8, range from 1.03 to 1.20
2018-04-03 12:30:35 +02:00
Robert Pelnar
baade7db61
Removed unused files (ST7565R-dogm, digipot)
...
renamed functions digipot_init and digipot_current
fixed cond. trans. (menus)
fixed variant files - MK25, MK3
2018-03-29 23:01:13 +02:00
Robert Pelnar
363a9d24b3
LiquidCrystal class renamed to LiquidCrystal_Prusa
2018-03-29 17:50:43 +02:00
Robert Pelnar
186e630299
New SPI (do not use Arduino SPI class)
...
saved ~300bytes flash, 4bytes ram
2018-03-29 17:42:41 +02:00
XPila
06d5ec5659
Merge pull request #586 from mkbel/ustep_linearity_2
...
Ustep linearity
2018-03-28 19:38:34 +02:00
XPila
ffdd11e960
Merge pull request #587 from XPila/MK3-V3_2
...
Mk3 v3 2
2018-03-28 19:38:20 +02:00
Robert Pelnar
bde097cad1
bugfix - PFW233 - first homing in silent mode Y crash.
2018-03-28 19:22:20 +02:00
Marek Bel
9cb036fbcb
Merge remote-tracking branch 'prusa3d/MK3' into ustep_linearity_2
2018-03-28 19:11:02 +02:00
Marek Bel
40a064ffbc
Add extruder linearity correction to settings menu.
2018-03-28 18:53:37 +02:00
Marek Bel
678cd17e7b
Increase size of EEPROM_TMC2130_WAVE_*_FAC to 16 bits.
2018-03-28 16:13:16 +02:00
Robert Pelnar
cf43b85de9
XYZ calibration - accuracy improvement
2018-03-27 17:27:41 +02:00
PavelSindler
e5faba7226
serial port set back (was previously changed for debugging purposes)
2018-03-15 14:42:03 +01:00
PavelSindler
08ec920d33
merge with upstream
2018-03-15 14:25:17 +01:00
Robert Pelnar
67e90b576a
Disabled force selftest
...
XYZ calibration tunning
2018-03-14 16:25:32 +01:00
PavelSindler
863fe1f054
show message that printer is not connected to monitoring on printer start
2018-03-14 15:35:39 +01:00
Robert Pelnar
81cd96b8fe
Variant file for MK25 + cond. translation
2018-03-13 23:02:46 +01:00
Robert Pelnar
ac1a56b493
Merge branch 'MK25' into MK3
2018-03-13 20:43:19 +01:00
PavelSindler
f45f206faf
sorting files disabled in farm mode, start printer status needs reponse from monitoring
2018-03-13 18:50:11 +01:00
PavelSindler
ddeb7b8c84
statistics improved, initial version of function which forces user to connect printer to monitoring
2018-03-13 18:43:42 +01:00
Robert Pelnar
16f9f35451
static_assert replaced with error directive
2018-03-13 16:47:38 +01:00
PavelSindler
0c97f46f25
Merge pull request #551 from XPila/MK3-new_xyz_cal
...
New XYZ calibration with image processing
2018-03-13 16:17:50 +01:00
Robert Pelnar
65a91b366d
New XYZ calibration with image processing
2018-03-13 12:55:35 +01:00
Marek Bel
6b08cdeaf1
Safety timer (disable heaters after 15min idle)
2018-03-12 23:45:10 +01:00
Marek Bel
262e800db7
Safety timer (disable heaters after 15min idle)
2018-03-12 23:35:50 +01:00
Christoph Stahl
1df91e5656
MK3 Add Gcode to wait for minimum PINDA temp
...
The PINDA temperature compensation is defined for values above 35C. To achieve an optimal first layer consistently it is vital to start the print with a temperature of >= 35C on the pinda probe.
When doing a manual pinda temperature calibration it is necessary to begin homing and mesh bed leveling at an exact temperature. This gcode is perfect for this.
Example startup code:
G28 W ; home all without mesh bed level
G0 Z50 ; raise Z to not heat PINDA before bed is warm
M104 S215 ; set extruder temp
M140 S60 ; set bed temp
M190 S60 ; wait for bed temp
M109 S215 ; wait for extruder temp
G0 X50 Y50 Z0.15 ; this is a good PINDA heating position
M666 S35 ; the new code - wait until PINDA is >= 35C
G28 W ; home all without mesh bed level
G80 ; mesh bed leveling
See my forum post later for more explaination on my manual temperature calibration procedure. I will link it then.
2018-03-09 20:46:07 +01:00
Robert Pelnar
976e5a6a19
Temperature calibration - remove steel
2018-03-07 21:45:55 +01:00
Robert Pelnar
e3967e444b
SafetyTimer disabled
...
Watchdog disabled
watchdog.cpp and watchdog.h source code removed (using directly <avr/wdt.h>)
2018-03-07 14:13:34 +01:00
XPila
55065cf124
Merge pull request #530 from PavelSindler/temp_cal_fix
...
steps per unit changed to 0.95%; changed temp cal. warnings, changed …
2018-03-06 18:26:37 +01:00
PavelSindler
27659ae69e
steps per unit changed to 0.95%; changed temp cal. warnings, changed pin for PINDA probe
2018-03-06 16:48:39 +01:00
Robert Pelnar
a6f900fd3c
Merge remote-tracking branch 'upstream/MK25' into MK25
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-03-06 15:11:50 +01:00
bubnikv
2b7e50e45b
Fix of calculate_extrusion_multipliers().
...
This is a fix of a bug made in the previous commit.
2018-03-06 13:03:38 +01:00
Marek Bel
67fd467ebe
Add fail statistics menu item for MK25.
...
As there is only filament sensor and no crash and power interruption detection, squash everything into single screen.
2018-03-05 21:42:04 +01:00
bubnikv
fc3af0533a
Fix of calculate_extrusion_multipliers().
...
This is a fix of a bug made in the previous commit.
2018-03-05 21:31:31 +01:00
PavelSindler
0f082fa1f7
Merge pull request #518 from PavelSindler/auto_power_2
...
Auto power mode for MK25
2018-03-05 11:42:00 +01:00
PavelSindler
917689b5ce
tune menu
2018-03-05 01:23:18 +01:00
PavelSindler
1033bd3cf9
info on serial not used
2018-03-05 00:48:10 +01:00
PavelSindler
ca3ba55ca7
initial version
2018-03-05 00:46:24 +01:00
PavelSindler
f1410a37f2
samle z after xyz cal. added, find_point_xy: initial z coordinate after first hit lowered
2018-03-04 23:49:54 +01:00
PavelSindler
8800793dd1
removing debug code
2018-03-04 20:49:34 +01:00
PavelSindler
ad702c6d1f
improved algorithm for first hit, improving sensor point changed, just one calibration round for 4point heatbed (no second run for improving measured coordinates)
2018-03-04 20:21:31 +01:00
PavelSindler
85bc19b77c
force selftest if user upgraded from 3.1.2-RC1 or older fw version
2018-02-27 17:52:13 +01:00
PavelSindler
e249e854da
dev version: print m114 coordinates when z endstop was triggered
2018-02-26 18:25:47 +01:00
Robert Pelnar
73b0349898
fix - Z movement speed in selftest
...
conditional translation for linearity correction and variable resolution
2018-02-23 16:31:24 +01:00
Robert Pelnar
49832d4d3b
Safety timer (disable heaters after 15min idle)
2018-02-22 16:46:17 +01:00
bubnikv
cff7b9b396
Unified the volumetric_multiplier with extrusion_multiply to improve
...
numeric accuracy and to reduce compuatitonal load. With this commit,
the numeric rounding is fixed not only for the M221 G-code
(as implemented by the preceding commit), but also for the volumetric
extrusion in general.
Removed the old FILAMENT_SENSOR code, which served the purpose
to modulate the volumetric multiplayer in real time depending
on the measured filament diameter. This feature will certainly not be
used by Prusa Research in the near future as we know of no sensor,
which would offer sufficient accuracy for a reasonable price.
2018-02-22 14:53:10 +01:00
bubnikv
4e3ea41ba4
Fix of a loss in precission when the extruder multiplier is set
...
with M221. For 50um layers, the precision loss leads to holes
in the print.
2018-02-22 14:52:36 +01:00
PavelSindler
d020f48791
Merge pull request #485 from bubnikv/M221_fix
...
Unified the volumetric_multiplier with extrusion_multiply to improve
2018-02-22 14:17:09 +01:00
PavelSindler
03a1bef4ee
Merge pull request #489 from PavelSindler/xyz_corrections_3
...
typo fixed
2018-02-22 13:41:22 +01:00
PavelSindler
819f2fd2b3
typo fixed
2018-02-22 13:40:31 +01:00
XPila
30bb84a7a7
Merge pull request #487 from PavelSindler/eeprom_printer_versions
...
Eeprom hw versions
2018-02-22 11:48:26 +01:00
XPila
ad33d3efd1
Merge pull request #488 from PavelSindler/xyz_corrections_3
...
Xyz corrections
2018-02-22 11:48:06 +01:00
PavelSindler
a4b3389dfa
M45 verbosity, steel sheet define, minor modifications in xyz cal
2018-02-22 10:38:46 +01:00
PavelSindler
0323af531d
printer types and motherboard types added to eeprom; min extrude temp lowered because of woodfil
2018-02-22 00:09:12 +01:00
Robert Pelnar
c5175e97ec
Pinout, conditional translation and variant file for MK2
2018-02-21 15:19:34 +01:00
bubnikv
ba49c21f17
Unified the volumetric_multiplier with extrusion_multiply to improve
...
numeric accuracy and to reduce compuatitonal load. With this commit,
the numeric rounding is fixed not only for the M221 G-code
(as implemented by the preceding commit), but also for the volumetric
extrusion in general.
Removed the old FILAMENT_SENSOR code, which served the purpose
to modulate the volumetric multiplayer in real time depending
on the measured filament diameter. This feature will certainly not be
used by Prusa Research in the near future as we know of no sensor,
which would offer sufficient accuracy for a reasonable price.
2018-02-21 11:25:21 +01:00
XPila
74e6ff67d3
Merge pull request #482 from bubnikv/M221_fix
...
M221 fix
2018-02-20 19:10:07 +01:00
Robert Pelnar
e2e48bfd71
SD speed test (DEBUG)
...
homeaxis - fix set_destination_to_current
2018-02-20 18:50:20 +01:00
bubnikv
ee5949c56e
Fix of a loss in precission when the extruder multiplier is set
...
with M221. For 50um layers, the precision loss leads to holes
in the print.
2018-02-20 15:30:18 +01:00
Robert Pelnar
57499dc6a0
M350 for E axis (8, 16, 32, 64, 128 microsteps)
2018-02-15 15:40:49 +01:00
Robert Pelnar
79caf3d9c6
tmc2130 optimalization, accurate homing and microstep linearity correction
...
dcode D12 removed (no longer needed)
homeaxis optimized + xy home calibration support
new eeprom variables
new lcd menu edit types (byte3, mres, wfac), new menu "Experimental"
currents adjusted
2018-02-15 04:17:58 +01:00
PavelSindler
08c59419da
Merge pull request #468 from PavelSindler/M600_currents
...
M600 unload current
2018-02-12 09:41:13 +01:00
Robert Pelnar
b08636c554
fix - conditional translation for DEBUG build
2018-02-08 18:56:15 +01:00
PavelSindler
a719ae1b01
whitespace
2018-02-08 16:33:43 +01:00
PavelSindler
ebe1c10423
lower current for unload
2018-02-08 16:32:27 +01:00
PavelSindler
9c4ce3623d
M600 unload current
2018-02-08 16:11:51 +01:00
PavelSindler
29978c4126
TACH_1 must be defined to enable print fan error
2018-02-07 11:10:04 +01:00
PavelSindler
abf956b86f
init
2018-02-06 09:19:27 +01:00
PavelSindler
df754a322b
MK25 merge Xpila's changes
2018-02-06 08:33:26 +01:00
PavelSindler
3bd892135a
erase eeprom section which belongs to M500 gcode in case that version was changed and default settings are used
2018-02-05 16:49:06 +01:00
Robert Pelnar
4d8807e924
bugfix - failstats (total counters) reset to zero for empty eeprom (0xff)
2018-02-02 15:59:37 +01:00
PavelSindler
2dd2c971e2
whitespace
2018-02-01 20:25:19 +01:00
Robert Pelnar
8562235440
MK2.5 port - compilable version
2018-02-01 20:08:11 +01:00
PavelSindler
d92f6292aa
unload with lowered current
2018-02-01 17:43:03 +01:00
PavelSindler
9d8191323b
Merge pull request #440 from XPila/3.1.1-RC6
...
Extruder stealthChop and constant-off-time mode.
2018-01-31 20:21:02 +01:00
XPila
822dd8ff9c
Merge pull request #448 from PavelSindler/eeprom_versions
...
EEPROM version change: inform user on LCD that default settings were loaded
2018-01-31 20:06:19 +01:00
Robert Pelnar
adc69eda18
PINDA temp. calibration warning messages.
2018-01-31 17:03:33 +01:00
Robert Pelnar
4c5618c371
failstats - reset "last print" counters
...
card - new member variable "paused" (bool)
2018-01-31 15:09:36 +01:00
Robert Pelnar
daaac2fb88
fail stats
2018-01-30 19:49:40 +01:00
Robert Pelnar
210b97d16d
New fail stats (global, last print), crashdetection X and Y separated
2018-01-30 13:10:36 +01:00
PavelSindler
88f248cb77
Inform user that hardcoded default settings were loaded (EEPROM version change)
2018-01-30 11:31:44 +01:00
PavelSindler
cbcfcee48f
PID cal. is not sending OK periodically, print fan error pauses print in octoprint (not disconnecting), initialize serial line when swithing in settings menu
2018-01-25 15:23:11 +01:00
XPila
556205d993
Merge pull request #432 from PavelSindler/invalid_gcodes
...
invalid / unknown gcodes reported on serial
2018-01-24 00:12:47 +01:00
XPila
975ed14cb6
Merge pull request #431 from PavelSindler/fan_error_resume
...
SD card long pause update
2018-01-24 00:12:33 +01:00
XPila
b2ba72ffcd
Merge pull request #411 from PavelSindler/typo_fixed
...
typo fixed
2018-01-24 00:10:28 +01:00
XPila
777dcf072b
Merge pull request #430 from bubnikv/MK3_fsensor_fullrate
...
Optimization of the filament sensor.
2018-01-24 00:10:00 +01:00
PavelSindler
70ff22571f
minor change
2018-01-23 20:04:18 +01:00
PavelSindler
3adedb558b
invalid / unknown codes reported on serial
2018-01-23 20:01:02 +01:00
PavelSindler
64a709c097
removed temporary debuging code
2018-01-23 19:14:52 +01:00
PavelSindler
05e0abbd9d
startFileprint delayed
2018-01-23 19:11:04 +01:00
bubnikv
44dc12005f
Optimization of the filament sensor.
2018-01-23 16:47:42 +01:00
PavelSindler
c38458eb67
init
2018-01-23 16:21:43 +01:00
XPila
09e0c566e8
Merge pull request #420 from bubnikv/MK3_stepper_blocking
...
Mk3 stepper blocking
2018-01-23 13:15:59 +01:00
bubnikv
69f97e0ec3
Separated the "Unknown" build from the "Development" build.
...
Documented purpose of the various build types.
2018-01-22 17:41:05 +01:00
bubnikv
a94e266cf1
Documented CPU load and frequency of the following interrupts:
...
9. ISR(INT7_vect) - Fan signal interrupt
26. ISR(M_USARTx_RX_vect) - USB to serial RX
37. ISR(USART1_RX_vect) - R-PI serial RX
2018-01-20 16:20:51 +01:00
bubnikv
815dfcb14b
Implemented a stepper timer reset after a long blocking cli()
...
or DISABLE_STEPPER_DRIVER_INTERRUPT().
If this is not done, the stepper interrupt would likely overflow,
leading to a maximum 32ms delay before the stepper interrupt wakes up.
In addition, the stepper timer overflow error would be reported
by the debug builds.
2018-01-20 15:39:21 +01:00
bubnikv
9e534c1990
Minimize risk of stepper routine interrupt blocking by reorganizing
...
the routine to move the G-code line length from the command queue
to the planner queue.
2018-01-20 14:37:22 +01:00
bubnikv
330f1576fc
Support for debug builds:
...
A build version and repository is displayed on the welcome screen,
D-codes, stack overflow check and stepper timer overflow check
are enabled in the debug mode.
2018-01-18 16:24:25 +01:00
PavelSindler
b5f8b1d97c
Merge pull request #412 from PavelSindler/debug_version
...
initial message for debugging fw version
2018-01-18 13:18:16 +01:00
PavelSindler
e60cb2a79e
unload filament sequence same as in M600
2018-01-17 21:54:34 +01:00
PavelSindler
4843f2c48e
initial message not shown on release candidate versions
2018-01-17 17:38:34 +01:00
PavelSindler
bfa675c1a4
initial message for debugging fw version
2018-01-17 16:00:19 +01:00
PavelSindler
b73520bcea
successfull -> successful
2018-01-17 14:40:37 +01:00
PavelSindler
fbf947b75c
maiden eeprom: tmc2130_mode is set to normal
2018-01-16 16:56:58 +01:00
XPila
026f68fd6f
Merge pull request #404 from PavelSindler/xyz_fixes
...
xyz homing hotfix, xyz cal. status changed
2018-01-16 01:39:57 +01:00
XPila
9efa1d3a03
Merge pull request #403 from PavelSindler/M600_update
...
timeout fix and unload message shortened
2018-01-16 01:39:18 +01:00
PavelSindler
06c6cc119b
xyz homing hotfix, xyz cal. status changed
2018-01-16 01:00:09 +01:00
PavelSindler
d8117eab66
timeout fix and MSG_UNLOAD_SUCCESSFULL message shortened
2018-01-15 17:39:42 +01:00
Robert Pelnar
981a681e52
Temperature ISR synchronization, M600 - faster unload
2018-01-15 17:29:07 +01:00
XPila
87ffb0b193
Merge pull request #400 from PavelSindler/M600_update
...
M600 update
2018-01-15 15:27:41 +01:00
PavelSindler
9e7686b77f
unload changes reverted back
2018-01-15 11:35:49 +01:00
PavelSindler
c36af887b7
M600 has timeout for nozzle, different procedure for unload
2018-01-15 11:30:28 +01:00
Robert Pelnar
9aedaa8fe7
build 146
...
hard limits
fsensor overflow fix
2018-01-14 23:59:43 +01:00
PavelSindler
8bd84ba4fd
Merge pull request #396 from XPila/MK3
...
Mk3
2018-01-12 22:08:50 +01:00
bubnikv
82304a2268
Slight optimization of the fan speed interrupt routine by accessing
...
the Arduino millis() without locking interrupts.
2018-01-12 21:16:29 +01:00
Robert Pelnar
ebf6d08fae
Crash detection - message on lcd (PFW-115)
2018-01-12 21:02:49 +01:00
PavelSindler
1fbed53200
initial
2018-01-12 20:01:22 +01:00
bubnikv
cfae8f859d
Merge branch 'MK3' into fw_versions
2018-01-11 16:58:47 +01:00
PavelSindler
087532085f
development fw versions has initial message for warning
2018-01-11 15:50:26 +01:00
Robert Pelnar
0d269261e4
PFW-110 - load filament - beep when loading finished.
2018-01-10 18:50:16 +01:00
Robert Pelnar
43010b30b4
Build 143f
...
Crashdetection improoved, blocking temperature ISR fixed, limits for silent mode adjusted.
2018-01-09 19:54:07 +01:00
Robert Pelnar
0a2087c1cb
build 143e
...
Linear advance disabled
Max feedrate reduced to 200mm/s
Silent max accel reduced to 984mm/s^2
some debug logs removed, tmc_init - log message fixed
2018-01-04 18:08:22 +01:00
Robert Pelnar
8a5ba89a9c
Missing serial characters debuging
...
disabled fan ISR
disabled fsensor ISR
disabled linear advance
build 143b
2018-01-02 20:55:33 +01:00
Michal Průša
734639c1da
Unload filament tweak
...
unload filament now has longer and faster slow retract.
2017-12-29 17:53:12 +01:00
Phil Dubach
7fb1234855
Turn off bed heater after temp calibration
...
After finishing the temperature calibration, turn off the bed heater
right away, before waiting for the user to acknowledge completion.
2017-12-28 23:47:27 -08:00
Michal Průša
f71f133e80
power panic polished
...
Retraction set correctly to have minimum missing line
Z motor current not lowered that drascialy
Extruder motor turning off instantly
Beeping added to the end
2017-12-28 23:26:06 +01:00
Michal Průša
f1c741d027
Filament autoloading improved and minor tweaks
...
Filament autoloading now acts like normal loading (Error message pops out if nozzle too cold, Printer asks if should extrude more when done loading)
Autoloading now unable to turn on when filament sensor is turned off or not responding
Color not right changed to color not correct to avoid slight confusion
2017-12-28 18:59:57 +01:00
Robert Pelnar
bd58718d9d
dummy "ok" response
...
build 139 (RC4)
2017-12-28 02:45:05 +01:00
Robert Pelnar
e064133a04
Merge remote-tracking branch 'upstream/MK3' into MK3
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-12-28 01:37:13 +01:00
Robert Pelnar
546314fda7
Removed debug messages from serial comunication (octoprint...).
...
build 137b
2017-12-27 20:29:24 +01:00
PavelSindler
8f7a50cfcd
Merge pull request #343 from PavelSindler/m110_fix
...
M110 fix
2017-12-23 00:04:11 +01:00
PavelSindler
e8477b525c
initial version of M110 fix (port from MK2)
2017-12-22 22:34:57 +01:00
XPila
257b8e9f59
Merge pull request #342 from XPila/MK3
...
Mk3 - RC3
2017-12-22 20:35:15 +01:00
Robert Pelnar
6abba7bfe9
filament autoload - better detection algorithm, autoload in M600 from menu
...
unload menu always visible
2017-12-22 20:14:26 +01:00
PavelSindler
7114772784
whitespace
2017-12-22 19:23:11 +01:00
PavelSindler
3aca1271ed
serial resend request always contains OK
2017-12-22 18:54:55 +01:00
PavelSindler
6f7a2ba263
Merge pull request #340 from PavelSindler/MK3_for_merging
...
removed some serial line error messages
2017-12-22 13:35:33 +01:00
PavelSindler
1917b6a1d7
removed some serial line error messages which caused that octoprint changed status
2017-12-22 13:27:04 +01:00
PavelSindler
33d715616f
Merge pull request #339 from PavelSindler/MK3_for_merging
...
setup function
2017-12-21 13:42:22 +01:00
PavelSindler
71bb4022dc
setup function
2017-12-21 13:40:16 +01:00
Robert Pelnar
3ddbac6056
LCD_PWM removed (will be solved other way)
2017-12-21 01:00:49 +01:00
PavelSindler
f227952c0b
Merge branch 'MK3' into MK3
2017-12-21 00:07:01 +01:00
PavelSindler
b8fd058749
selftest fix
2017-12-21 00:03:41 +01:00
PavelSindler
17d9bb205a
selftest tests filament sensor, selftest messages have language variants
2017-12-20 23:40:18 +01:00
Robert Pelnar
a3a0e70eeb
Fsensor autoload enabled menu and eeprom variable
2017-12-20 22:29:41 +01:00
Robert Pelnar
25dd6dd673
new module adc (analog2digital)
...
temperature.cpp - adc sampling state machine removed
new dcode D9 (adc read/write + simulator)
temporarily DEBUG_DISABLE_STARTMSGS because UI blocked
SILENT_MAX_FEEDRATE reduced to 172mm/s
hexfile removed
build number 137x
2017-12-20 13:42:20 +01:00
PavelSindler
31add2e69f
removed 4 bytes from maiden eeprom check as these could be set earlier to 0 by lcd_status_screen function
2017-12-18 19:15:36 +01:00
Robert Pelnar
c6e10fb903
Removed SG software homming
...
After Calibration Z enabled minstop (SG and PINDA)
TMC2130 code simplification
2017-12-15 14:10:20 +01:00
Robert Pelnar
ca55cf74e2
Merge remote-tracking branch 'upstream/MK3' into MK3
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-12-13 22:58:34 +01:00
Robert Pelnar
356bc403b1
Automatic filament load when printer idle and preheated
2017-12-13 17:39:32 +01:00
Robert Pelnar
cdeb835b5d
Failstat couters initialization
...
build number = 131
2017-12-12 23:37:31 +01:00
PavelSindler
fde0efc75c
power panic for absolute E coordinates: initial version
2017-12-12 21:20:59 +01:00
PavelSindler
c1416cbb33
Merge pull request #312 from PavelSindler/wizard
...
Wizard: force high power mode during xyz cal. and selftest; wizard for assembled printer
2017-12-12 20:24:15 +01:00
PavelSindler
82dffb688a
force high power mode during xyz cal. and selftest
2017-12-12 20:21:09 +01:00
PavelSindler
997c8de161
shipping prep. reset sets wizard flag, shipping prep wizard improvements
2017-12-12 19:17:37 +01:00
PavelSindler
f8e3c76315
merging new changes from upstream/MK3
2017-12-12 17:14:48 +01:00
Robert Pelnar
0271da3c67
Ambient thermistor - new table (PFW-71)
...
Crashdetection disable durring print (PI3M3-42)
Stealth mode - better limit values (PI3M3-5)
2017-12-12 15:44:42 +01:00
Robert Pelnar
7204e91ec6
Filament sensor not responding - (PFW-41)
...
build number = 130
2017-12-11 18:17:25 +01:00
PavelSindler
20de899d25
Merge branch 'MK3' into sort_files
2017-12-11 11:50:47 +01:00
Robert Pelnar
9dba7dcd1f
DISABLE_M42_M226 = +56 bytes RAM (because of stack overflow)
...
build 127
2017-12-09 19:31:27 +01:00
PavelSindler
868aacc7d5
turn on second serial line from settings menu
2017-12-08 16:56:06 +01:00
PavelSindler
071873b38a
init; last merged file: Marlin_main.cpp
2017-12-06 17:48:16 +01:00
PavelSindler
44218a1b53
incomplete file check ported from MK2: initial version
2017-12-06 14:55:53 +01:00
Robert Pelnar
58f8fdb51b
Automatic filament load in M600
2017-12-05 18:37:03 +01:00
PavelSindler
707e9cb396
chages in power panic absolute mode
2017-12-01 14:26:08 +01:00
PavelSindler
74441ce3a1
power panic in absolute mode fixed, but some e steps are probably missing
2017-11-29 14:05:47 +01:00
Robert Pelnar
0de584c213
bugfix UVLO - extruder position from stepper
2017-11-29 02:08:15 +01:00
Robert Pelnar
9413eca52c
UVLO recover E absolute mode
...
build number 119
2017-11-28 23:41:58 +01:00
XPila
1da1eaea01
Merge pull request #117 from PavelSindler/m600
...
M600: wait for user before unloading filament
2017-11-28 22:45:57 +01:00
Robert Pelnar
1863819e39
pat9125 reinit when fsensor enabled from menu.
2017-11-28 22:44:58 +01:00
PavelSindler
020a7ec257
unload filament can be repeated
2017-11-28 19:04:43 +01:00
PavelSindler
c0112f05e1
M600: wait for user before unloading filament
2017-11-28 18:28:53 +01:00
PavelSindler
211725c946
dont show temp cal message, dont save uvlo flag to eeprom if printing from USB
2017-11-27 18:30:16 +01:00
Robert Pelnar
7c8de94778
filament unload - initial
...
lower currents for power panic
2017-11-27 15:54:36 +01:00
Robert Pelnar
533418d63e
opravene nezadouci resetovani watchdogem
...
powerpanic Z shift = 0.64mm (misto 1.92mm)
teplotni kompenzace default = ON
2017-11-27 14:43:56 +01:00
XPila
60930beb52
Merge pull request #108 from PavelSindler/power_panic
...
Power panic works with folders
2017-11-27 07:27:17 +01:00
Robert Pelnar
1113124bde
PINDA calibration and precalibrated characteristics.
2017-11-27 07:09:53 +01:00
PavelSindler
42b533b5d8
first working version
2017-11-27 06:20:51 +01:00
PavelSindler
a40c759ee7
First run: show calibration status messages in case that user refused to use wizard
2017-11-27 02:03:42 +01:00
PavelSindler
5a77113fb5
init
2017-11-27 01:59:47 +01:00
PavelSindler
7de187d813
if user dont confirm live adjust Z by pressing the knob, save last live adjust value to eeprom
2017-11-27 00:17:45 +01:00
PavelSindler
4c7cc5520e
"confirm nozzle clean" message re-added
2017-11-26 21:26:36 +01:00
Robert Pelnar
e5fee387db
Fixed bug - unload filament restarts the printer.
2017-11-26 17:14:39 +01:00
Robert Pelnar
f2e9bdef24
Fsensor synchronization and triggering improved
...
Watchdog implemented (4s interval, triggered from manage_heater)
Stallguard sensitivity for XY decreased by 1
Extruder current adjusted to 5.5kg force
Build number = 111
2017-11-24 21:53:35 +01:00
Robert Pelnar
213ee43cc9
Merge usptream
...
Crashdetection fixed
pl language removed (because of low flash capacity)
build number = 110
2017-11-22 08:41:52 +01:00
PavelSindler
ae6a0b4d29
Initial message changed. Needs to be updated in bootlader.
2017-11-21 14:16:55 +01:00
Robert Pelnar
b8525f8043
Print class printf function (experimental, disabled by default)
...
LiquidCrystal VT100 escape codes (EraseScreen, CursorHome, ...)
Stream support for lcd and uart, fprintf and printf (stdout=uartout)
Dcodes enabled, code reduced, printf used
Splash screen with esc codes
2017-11-20 20:09:54 +01:00
Robert Pelnar
aee62750e7
Build 109
2017-11-16 22:03:36 +01:00
XPila
279ea79bf6
Merge pull request #86 from PavelSindler/keepalive_messages
...
host keep alive messages
2017-11-16 20:53:09 +01:00
XPila
2a85de48ea
Merge pull request #88 from XPila/MK3
...
Mk3
2017-11-16 20:52:46 +01:00
Robert Pelnar
ee2f927148
Build Number = 108
...
FSensor log can be enabled with D9125L1
Selftest menu
PINDA D codes
2017-11-16 20:51:50 +01:00
PavelSindler
16a7adfe33
merging with upstream
2017-11-15 15:45:26 +01:00
PavelSindler
91d125369e
keepalive messages initial version
2017-11-15 15:09:29 +01:00
PavelSindler
19d89b37b5
Merge pull request #83 from PavelSindler/lin_adv_fix
...
Lin adv. fix from MK2 fw
2017-11-15 11:53:39 +01:00
PavelSindler
9e2533ecdf
Support menu translated and fixes, snmm M600 long beep fix
2017-11-14 16:10:10 +01:00
PavelSindler
4d9780a3c6
Merged lin adv. fix from MK2
2017-11-14 13:57:32 +01:00
XPila
dfe3541d2b
Merge branch 'MK3' into MK3
2017-11-13 18:48:19 +01:00
Robert Pelnar
01de834e0d
SG_THR_X = 2, holding currents == running currents
...
Farm preheat menu
dcode D5 - read/write/erase FLASH
dcode D6 - bootloader update test (for new stk500-prusa)
_NO_ASM - MINGW simulator support
fixed bug - "Fil. sensor [on/off]" menu
Build number = 107
2017-11-13 18:45:11 +01:00
PavelSindler
eda0c6bd39
english version of xyz: place/remove steel sheet; wait for cooling down removed,
2017-11-13 17:09:26 +01:00
PavelSindler
5707f8b14e
Merge remote-tracking branch 'upstream/MK3' into wizard
2017-11-13 14:39:14 +01:00
PavelSindler
fbbcc27f1a
X max lowered to 250, XYZ/Z calibration: Z top coordinate changed, changes in xyz cal. because of stell sheet, still not final version
2017-11-12 11:30:06 +01:00
XPila
55325a5a32
Merge branch 'MK3' into MK3
2017-11-07 17:15:27 +01:00