Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PFW-1536: Reprint function implemented for MK3S/MK3S+ #4462

Closed
wants to merge 147 commits into from
Closed
Show file tree
Hide file tree
Changes from 64 commits
Commits
Show all changes
147 commits
Select commit Hold shift + click to select a range
50069a4
Reprint function integrated on 3.13v
jfestrada Oct 21, 2023
7925241
Fix the length of the PL translation of MSG_REPRINT
jfestrada Oct 21, 2023
0eba0a2
Fix SV translation length of MSG_REPRINT
jfestrada Oct 21, 2023
8c65187
Change to enquecommandf_P and enquecommand_P
jfestrada Oct 22, 2023
af61fdf
Remove MYSERIAL.println code (debug purpose) and old commented code
jfestrada Oct 22, 2023
d052b5c
Remove some MYSERIAL calls
jfestrada Oct 24, 2023
31d6c11
- Serial message --> /// action:reprint done
jfestrada Oct 30, 2023
ead754c
Added support for reprint and streamed GCODE
jfestrada Nov 1, 2023
c44f62e
Execution of lang/update-pot.py and lang/update-po.py
jfestrada Nov 1, 2023
934267e
Fix execution of update-po.py
jfestrada Nov 1, 2023
1813220
Apply the reprint_pr_changes_diff2.txt provided by @3d-gussner
jfestrada Nov 6, 2023
4d48dc0
Updates to translations of "Reprint" to Slovak and Romanian languages
jfestrada Nov 7, 2023
52401c1
Fixed Reprint from USB and from SD, some debug is needed
jfestrada Nov 7, 2023
e8ddce2
Fix: Reprint menu does not appear during the heating
jfestrada Nov 8, 2023
050ea62
Fix: There was a situation where enableRprintUSB was enabled but the …
jfestrada Nov 8, 2023
256ebb6
mmu: Add CheckErrorScreenUserInput
gudnimg Oct 18, 2023
53c9d65
mmu: formatting
gudnimg Oct 18, 2023
2fab9d5
mmu: add DisableMMUInSettings
gudnimg Oct 18, 2023
3bcbfdb
mmu: add ResetCommunicationTimeoutAttempts
gudnimg Oct 18, 2023
3b3bdcc
mmu: remove ResetOnExit
gudnimg Oct 18, 2023
db0da61
mmu: remove obsolete EEPROM comments
gudnimg Oct 18, 2023
c68e26d
mmu: remove isErrorScreenRunning()
gudnimg Oct 19, 2023
451f604
MBL: optimise EEPROM read/writes
gudnimg Oct 25, 2023
96db34a
TM: Optimise EEPROM read and writes
gudnimg Oct 25, 2023
ff25f38
Fix regression in MMU enable menu
gudnimg Oct 29, 2023
237db89
PFW-1523 Implement M79 timer for PrusaLink
gudnimg Oct 21, 2023
99ff9f7
MMU: Set PAUSED_FOR_USER state on MMU error screen
gudnimg Oct 28, 2023
43c0379
power panic: only send M23 for SD prints
gudnimg Oct 9, 2023
7ea2c4f
power panic: read EEPROM_FILENAME until \0 is seen
gudnimg Oct 9, 2023
ace9012
Refactor menu_action_sdfile
gudnimg Oct 9, 2023
6cba5fd
power panic: simplify recovering SD filename
gudnimg Oct 14, 2023
b868dd3
power panic: read whole directory name block from EEPROM
gudnimg Oct 14, 2023
51017ee
power panic: support any valid DOS 8.3 extension
gudnimg Oct 22, 2023
38e0378
Add en- and disable MMU to M709
3d-gussner Oct 30, 2023
4e3cd06
Update requested changes
3d-gussner Nov 6, 2023
6e30ed3
Update doxygen for M709
3d-gussner Nov 8, 2023
6ca31fa
Updated MMU serial status message
3d-gussner Nov 9, 2023
c32218d
Update doxygen M709
3d-gussner Nov 11, 2023
5980809
PFW-1523 Refactor parsing quoted strings
gudnimg Nov 4, 2023
650480d
PFW-1523 Implement S parameter for M79
gudnimg Nov 4, 2023
b755125
PFW-1523 Force inline unquoted_string constructor
gudnimg Nov 4, 2023
d3f2de2
PFW-1523 Update M79 description
gudnimg Nov 7, 2023
d2809b0
PFW-1523 Trim trailing whitespace in util.h
gudnimg Nov 7, 2023
d3f0557
PFW-1523 Only overwrite name if not SD printing
gudnimg Nov 11, 2023
74aa991
Fix #3122
gudnimg Nov 12, 2023
529b61b
M702: fix documentation link
Nov 15, 2023
23ee18c
optimisation: simplify two LCD messages
gudnimg Oct 21, 2023
e0bc604
Fix filament change behavior when print is paused
gudnimg Sep 24, 2023
4f8838a
Add a comment
gudnimg Nov 11, 2023
940b14a
EEPROM: Formatting cleanup
gudnimg Nov 12, 2023
d49bcc2
Minor wording changes
gudnimg Nov 12, 2023
0755603
Replace unused EEPROM entry names with placeholders
gudnimg Nov 12, 2023
fde0ab8
MMU: Remove gcode_reset_stepper_timeout
gudnimg Nov 16, 2023
6ae9432
Basic Printer name in EEPROM
3d-gussner Oct 20, 2023
e14984d
optimisation: use disable_heater() in more places
gudnimg Apr 28, 2023
1b9704f
Add M125
3d-gussner Sep 20, 2023
5722843
Fix float
3d-gussner Sep 20, 2023
d9428e0
Fix issues
3d-gussner Nov 8, 2023
ac0bdb4
Code size improvments
3d-gussner Nov 9, 2023
d3d1a72
M125: Code size optimisation
gudnimg Nov 19, 2023
252c516
M125: make pause_position static
gudnimg Nov 19, 2023
a05a669
Don't reset pause_position on every M125
gudnimg Nov 19, 2023
6e94ca0
Don't pause with `S`et values
3d-gussner Nov 20, 2023
22cc4bf
Raise `END_FILE_SECTION` from 20000 to 30720 to prevent false positiv…
3d-gussner Nov 20, 2023
fff1538
PFW-1523 Implement S parameter for M79
gudnimg Nov 4, 2023
920fc60
Implement Marlin's print job timer
gudnimg Oct 22, 2023
0df2130
PFW-1206 Add M75-M78
gudnimg Nov 12, 2023
0c65e9a
Fix build failure
gudnimg Nov 19, 2023
67026f8
M77: Save statistics when timer is stopped
gudnimg Nov 19, 2023
55830e0
Show statistics menu for USB/Serial prints
gudnimg Nov 19, 2023
de80a73
Fix build failure
gudnimg Nov 21, 2023
ff670be
Set Ready
3d-gussner Oct 25, 2023
6fceff2
Add printer_state.cpp/.h
3d-gussner Nov 17, 2023
ec2bd93
Show Set Ready LCD menu only when M79 timer is running.
3d-gussner Nov 17, 2023
f356064
Fix cmake build
3d-gussner Nov 17, 2023
7a5154b
Update state
3d-gussner Nov 17, 2023
17fad7d
LCD menu only sends `// action:ready` or `// action:not_ready` via se…
3d-gussner Nov 21, 2023
fcee741
Cleanup documentation
3d-gussner Nov 21, 2023
9970183
Add `SetPrinterState(PrinterState::Idle);` after `lcd_commands_type =…
3d-gussner Nov 21, 2023
5e6671a
Whitespace
3d-gussner Nov 22, 2023
a9e5f44
Rebase fix
3d-gussner Nov 22, 2023
d526ea6
Revert "Rebase fix"
jfestrada Nov 22, 2023
1e2311b
Revert "Whitespace"
jfestrada Nov 22, 2023
9e7168a
Revert "Add `SetPrinterState(PrinterState::Idle);` after `lcd_command…
jfestrada Nov 22, 2023
568930f
Revert "Cleanup documentation"
jfestrada Nov 22, 2023
8fba919
Revert "LCD menu only sends `// action:ready` or `// action:not_ready…
jfestrada Nov 22, 2023
6126f42
Revert "Update state"
jfestrada Nov 22, 2023
8139c4a
Revert "Fix cmake build"
jfestrada Nov 22, 2023
ccca220
Revert "Show Set Ready LCD menu only when M79 timer is running."
jfestrada Nov 22, 2023
b49930d
Revert "Add printer_state.cpp/.h"
jfestrada Nov 22, 2023
a58cdf2
Revert "Set Ready"
jfestrada Nov 22, 2023
049da20
Revert "Fix build failure"
jfestrada Nov 22, 2023
9299575
Revert "Show statistics menu for USB/Serial prints"
jfestrada Nov 22, 2023
165c722
Revert "M77: Save statistics when timer is stopped"
jfestrada Nov 22, 2023
b2536b7
Revert "Fix build failure"
jfestrada Nov 22, 2023
e4308a3
Revert "PFW-1206 Add M75-M78"
jfestrada Nov 22, 2023
6f2a07e
Revert "Implement Marlin's print job timer"
jfestrada Nov 22, 2023
73c1100
Revert "PFW-1523 Implement S parameter for M79"
jfestrada Nov 22, 2023
ed1bc7c
Revert "Raise `END_FILE_SECTION` from 20000 to 30720 to prevent false…
jfestrada Nov 22, 2023
73ef775
Revert "Don't pause with `S`et values"
jfestrada Nov 22, 2023
d9274a5
Revert "Don't reset pause_position on every M125"
jfestrada Nov 22, 2023
eae8596
Revert "M125: make pause_position static"
jfestrada Nov 22, 2023
541f897
Revert "M125: Code size optimisation"
jfestrada Nov 22, 2023
4f42d63
Revert "Code size improvments"
jfestrada Nov 22, 2023
bd9c5b4
Revert "Fix issues"
jfestrada Nov 22, 2023
8373f73
Revert "Fix float"
jfestrada Nov 22, 2023
6afa3d6
Revert "Add M125"
jfestrada Nov 22, 2023
488b899
Revert "optimisation: use disable_heater() in more places"
jfestrada Nov 22, 2023
a95ec3a
Revert "Basic Printer name in EEPROM"
jfestrada Nov 22, 2023
72b094b
Revert "MMU: Remove gcode_reset_stepper_timeout"
jfestrada Nov 22, 2023
15af7b5
Revert "Replace unused EEPROM entry names with placeholders"
jfestrada Nov 22, 2023
27078ca
Revert "Minor wording changes"
jfestrada Nov 22, 2023
2aec95f
Revert "EEPROM: Formatting cleanup"
jfestrada Nov 22, 2023
3833f4f
Revert "Add a comment"
jfestrada Nov 22, 2023
98c9542
Revert "Fix filament change behavior when print is paused"
jfestrada Nov 22, 2023
4c3bfa0
Revert "optimisation: simplify two LCD messages"
jfestrada Nov 22, 2023
63cc1c7
Revert "M702: fix documentation link"
jfestrada Nov 22, 2023
29f2b17
Revert "Fix #3122"
jfestrada Nov 22, 2023
d6068ec
Revert "PFW-1523 Only overwrite name if not SD printing"
jfestrada Nov 22, 2023
a3d590a
Revert "PFW-1523 Trim trailing whitespace in util.h"
jfestrada Nov 22, 2023
1170754
Revert "PFW-1523 Update M79 description"
jfestrada Nov 22, 2023
22d77f2
Revert "PFW-1523 Force inline unquoted_string constructor"
jfestrada Nov 22, 2023
b3bfe76
Revert "PFW-1523 Implement S parameter for M79"
jfestrada Nov 22, 2023
a8064e3
Revert "PFW-1523 Refactor parsing quoted strings"
jfestrada Nov 22, 2023
399237c
Revert "Update doxygen M709"
jfestrada Nov 22, 2023
65412ff
Revert "Updated MMU serial status message"
jfestrada Nov 22, 2023
baec0a8
Revert "Update doxygen for M709"
jfestrada Nov 22, 2023
f31f0e7
Revert "Update requested changes"
jfestrada Nov 22, 2023
8d663bf
Revert "Add en- and disable MMU to M709"
jfestrada Nov 22, 2023
f367dfc
Revert "power panic: support any valid DOS 8.3 extension"
jfestrada Nov 22, 2023
226b3e3
Revert "power panic: read whole directory name block from EEPROM"
jfestrada Nov 22, 2023
6ff0984
Revert "power panic: simplify recovering SD filename"
jfestrada Nov 22, 2023
69df9bd
Revert "Refactor menu_action_sdfile"
jfestrada Nov 22, 2023
487cc29
Revert "power panic: read EEPROM_FILENAME until \0 is seen"
jfestrada Nov 22, 2023
b786f67
Revert "power panic: only send M23 for SD prints"
jfestrada Nov 22, 2023
30eab77
Revert "MMU: Set PAUSED_FOR_USER state on MMU error screen"
jfestrada Nov 22, 2023
c3b965c
Revert "PFW-1523 Implement M79 timer for PrusaLink"
jfestrada Nov 22, 2023
1078d8e
Revert "Fix regression in MMU enable menu"
jfestrada Nov 22, 2023
5e12fcc
Revert "TM: Optimise EEPROM read and writes"
jfestrada Nov 22, 2023
6a41611
Revert "MBL: optimise EEPROM read/writes"
jfestrada Nov 22, 2023
5777829
Revert "mmu: remove isErrorScreenRunning()"
jfestrada Nov 22, 2023
d5ced20
Revert "mmu: remove obsolete EEPROM comments"
jfestrada Nov 22, 2023
9d6dd60
Revert "mmu: remove ResetOnExit"
jfestrada Nov 22, 2023
d898aad
Revert "mmu: add ResetCommunicationTimeoutAttempts"
jfestrada Nov 22, 2023
f68cb04
Revert "mmu: add DisableMMUInSettings"
jfestrada Nov 22, 2023
a694139
Revert "mmu: formatting"
jfestrada Nov 22, 2023
407569c
Revert "mmu: Add CheckErrorScreenUserInput"
jfestrada Nov 22, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ set(FW_SOURCES
Filament_sensor.cpp
first_lay_cal.cpp
heatbed_pwm.cpp
host.cpp
la10compat.cpp
language.c
lcd.cpp
Expand Down
3 changes: 3 additions & 0 deletions Firmware/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@
*/
#define AUTO_REPORT

// Keepalive period which is restarted with M79
#define M79_TIMEOUT 30 * 1000 // ms

//===========================================================================
//=============================Mechanical Settings===========================
//===========================================================================
Expand Down
5 changes: 4 additions & 1 deletion Firmware/Marlin.h
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,10 @@ void save_print_file_state();
void restore_print_file_state();
void save_planner_global_state();
void refresh_print_state_in_ram();

/// Updates the feedrate multiplier when a print is saved such that
/// it is not overwritten when the print is later resumed
void refresh_saved_feedrate_multiplier_in_ram();
void clear_print_state_in_ram();
extern void stop_and_save_print_to_ram(float z_move, float e_move);
void restore_extruder_temperature_from_ram();
Expand Down Expand Up @@ -456,5 +460,4 @@ extern "C" void softReset();
void stack_error();

extern uint32_t IP_address;

#endif
Loading