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

48 Commits

Author SHA1 Message Date
Yuri D'Elia
dbe2ed4150 Fix pause/resume when using M25/M601 
Remove the conflicting and mostly useless card.paused flag (the printing
is either paused, or not) and switch to isPrintPaused only which
accounts for both cases (SD/USB) correctly.

Fix M27/getStatus to show the current real status of the SD print.

Synchronize the queue on M601, as required to precisely pause the print
at the correct instruction.

Alias M25 to M601, which when combined with PR #1899 fixes issue #1614.

Guard against incorrect usage in M601, M602 and M603.
 2019-11-28 17:37:58 +01:00
DRracer
e56cb14bb9
Merge pull request #1739 from draeath/MK3-fix-sdcard-sorting 
use modification times for sdcard time sorting. fixes #477
 2019-11-04 17:31:38 +01:00
leptun
bf09eb943d fix workDirDepth not reset after card init. 2019-09-29 21:09:11 +03:00
Paul Bransford
720ea49fa3 Merge branch 'MK3' into MK3-fix-sdcard-sorting 2019-08-08 19:48:50 -04:00
MRprusa3d
a408f90659 recovery from "Stop()" 2019-05-18 21:28:59 +02:00
Ondrej Tuma
b7fe43bf68 Deleted bad cols/rows definitions for translation. 2019-05-07 12:52:23 +02:00
Paul Bransford
863c7158b2 use modification times for sdcard sort 2019-04-16 06:24:47 -04:00
Robert Pelnar
eea755496b Conditional translation for SYSTEM_TIMER_2 because we want to have posibility to switch between old/new implementation. 
Timing functions (millis, micros and delay) replaced in whole source, defined in Marlin.h.
This commit enables original implementation (SYSTEM_TIMER_2 undefined)
Verified with passed complete wizard process.
 2019-01-27 22:48:51 +01:00
Robert Pelnar
434a723151 Timing functions 'micros' and 'delay' replaced in whole source with 'micros2' and 'delay2' 2019-01-27 17:37:27 +01:00
Robert Pelnar
e229f3343e Lang - text "volume.init failed" removed from dictionary 2018-11-22 18:48:22 +01:00
Robert Pelnar
ddf898cb41 Lang - text "SD init fail" removed from dictionary 2018-11-22 18:41:00 +01:00
Robert Pelnar
3384dd8487 Lang - text "SD card ok" removed from dictionary 2018-11-22 18:39:35 +01:00
Robert Pelnar
f0e3021d33 Lang - text "openRoot failed" removed from dictionary 2018-11-22 18:20:24 +01:00
Robert Pelnar
f4bbce4142 Lang - text "open failed, File: " removed from dictionary 2018-11-22 18:15:22 +01:00
Robert Pelnar
9c964277ac Lang - text "error writing to file" removed from dictionary 2018-11-22 17:57:52 +01:00
Robert Pelnar
0baa6412fc Lang - text "Cannot enter subdir: " removed from dictionary 2018-11-22 17:49:28 +01:00
Robert Pelnar
a0e4acead3 lang - removed unused code and some service messages changed to "not translated" 2018-11-01 14:07:16 +01:00
Marek Bel
7364b6cf80 Do not compare signed value with unsigned, add parentheses. 2018-08-07 12:52:51 +02:00
Marek Bel
2e719c7885 Fix stack corruption for folder name longer than 12 characters. Save 260B of flash memory. Move duplicate code to separate method. Fix compiler warnings: sketch/cardreader.cpp:448:25: warning: ordered comparison of pointer with integer zero [-Wextra] 
sketch/cardreader.cpp:453:22: warning: ordered comparison of pointer with integer zero [-Wextra]
 2018-08-07 12:52:51 +02:00
Marek Bel
7a6cbf75b9 Fix compiler warnings: sketch/cardreader.cpp: In member function 'void CardReader::openFile(const char*, bool, bool)': 
sketch/cardreader.cpp:350:25: warning: ordered comparison of pointer with integer zero [-Wextra]
sketch/cardreader.cpp:355:22: warning: ordered comparison of pointer with integer zero [-Wextra]
 2018-08-07 12:52:51 +02:00
Marek Bel
665a885a21 Merge commit 'baddf38dbc2c72ab095deaf9b3e251ea2faeb699' into fix_compiler_warnings 2018-08-01 16:44:17 +02:00
Marek Bel
08b56fe1a4 Fix compiler warning sketch/cardreader.cpp:706:25: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]. 
Remove redundant and masked int d variable.
Fix indentation of presort() to make it clear, that it is not part of for loop.
 2018-07-25 15:51:00 +02:00
PavelSindler
565a6db3e4 use timer class 2018-07-22 16:26:12 +02:00
Petr Ledvina
baddf38dbc Make card filename const 
Fixes warning in filename_wldsd
 2018-07-17 17:55:05 +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
Robert Pelnar
8d5e6a65cd LCD sdcard menu fix 
+removed debug code
 2018-07-12 16:27:02 +02:00
PavelSindler
1077895fd4 Don't return "Not SD printing" in case that SD card print is paused 2018-06-13 18:22:58 +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
64f7272ea7 M27: returns print saved (fixes setting temperatures to zero during crash detection) 2018-05-24 18:49:35 +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
bd587faab9 New ML support - migration - replaced source, removed original ML support files (backup) 2018-05-22 03:20:03 +02:00
PavelSindler
4681361883 correction in M27 message 2018-04-26 11:50:48 +02:00
PavelSindler
cf0c83a6c1 M27 fix 2018-04-25 21:23:38 +02:00
Robert Pelnar
1a01282e33 cardreader - new member "paused" 
tmc2130 - decreased crash sensitivity for Y
 2018-01-31 15:20:27 +01:00
PavelSindler
1ef5543a2a dont sort files when print is finished 2017-12-12 15:26:48 +01:00
PavelSindler
1c61f2f29c First working version 2017-12-11 11:30:49 +01:00
PavelSindler
26135ea227 all sd sort files: initial version; sorting type switch not added to SD card menu itself 2017-12-10 11:08:50 +01:00
PavelSindler
44218a1b53 incomplete file check ported from MK2: initial version 2017-12-06 14:55:53 +01:00
PavelSindler
42b533b5d8 first working version 2017-11-27 06:20:51 +01:00
PavelSindler
a8678cb2fd recover print 2017-07-04 11:31:39 +02:00
michalprusa
3faef75a0d 3.0.10 sync 2017-03-24 19:47:50 +01:00
michalprusa
307d17422d 3.0.6 sync 2016-08-11 10:42:53 +02:00
michalprusa
30f0528aba Initial commit 2016-07-22 15:28:01 +02:00