29882b625b
Remove LcdCommands::FarmModeConfirm
2022-11-17 05:46:33 +01:00
e11ef11a64
PFW-1425 Rename "Load to Extruder" to "Loading Test"
2022-11-16 06:00:15 +01:00
7b43f322de
PFW-1425 Move Reset MMU setting
2022-11-15 17:32:27 +01:00
b4920d7fa8
PFW-1425 use mmu2.Enabled instead of EEPROM read
2022-11-15 17:32:27 +01:00
3f4ac254ab
PFW-1425 Move MMU settings under a common if statement
...
We only need to check if the MMU is enabled once,
no need to do it in every submenu.
This way we save little bit of flash memory.
Change in memory:
Flash: -24 bytes
SRAM: 0 bytes
2022-11-15 17:32:27 +01:00
8f3f071fd4
PFW-1425 Move Load to Extruder menu to Settings menu
...
No change in memory footprint
2022-11-15 17:32:27 +01:00
5239f1c176
cleanup: remove old extern for mmu_print_saved
2022-11-15 09:44:02 +01:00
4f58812478
optimise lcd_sdcard_menu with lcd_print_pad
...
Change in memory:
Flash: -46 bytes
SRAM: 0 bytes
2022-11-13 09:29:37 +01:00
184e19dd60
further optimise lcdui_print_status_line
...
We can use lcd_print_pad to determine
whether the end of the file name was reached
lcd_print_pad now returns the last character pointed to.
If the end of the string was reached, it will be the null delimeter which
evaluates to "false" in an if statment (same as NULL).
Else "true" means the end of the string was not reached.
Change in memory:
Flash: -42 bytes
SRAM: 0 bytes
2022-11-13 09:29:37 +01:00
0af7ef0201
optimisation: reduce code size in showing file name being printed
...
Change in memory:
Flash: -52 bytes
SRAM: 0 bytes
2022-11-13 09:29:37 +01:00
a2bbc4f585
Merge pull request #3745 from leptun/MK2.5_XYZ_Cal_fixes
...
MK2.5 XYZ calibration fixes
2022-11-12 21:48:16 +01:00
006fe110cc
Don't raise MMU error screen until retry is done
...
Change in memory:
Flash: +8 bytes
SRAM: 0 bytes
2022-11-12 18:47:10 +01:00
68bd7f9b19
Fix excessive flash usage.
2022-11-12 18:47:10 +01:00
ecef69012a
Fix PFW-1364 & possible comms timeout during reheat
2022-11-12 18:47:10 +01:00
509813f60b
optimsation: TCodes accepts uint8_t not float
...
Change in memory:
Flash: -20 bytes
SRAM: 0 bytes
2022-11-12 16:50:45 +00:00
661b3a83ff
MK2.5: fix swapped yes/no messaged for Z manual alignment
2022-11-10 22:20:46 +01:00
1cdc2e712b
MK2.5: unblock planner after plan_abort_hard()
2022-11-10 22:20:01 +01:00
fd832f9ccf
Merge pull request #3737 from gudnimg/fix-longpress-inactivity-timeout
...
Fix long-press LCD inactivity timeout
2022-11-08 14:10:57 +01:00
76a164e651
fixup
2022-11-08 13:49:40 +01:00
08460bd403
PFW-1397 Drop ON_MENU_ENTER
...
Using _menu_data_t turns out to save *just* a little bit more flash. So for now just use it.
2022-11-08 13:49:40 +01:00
390f69a82f
PFW-1397 Fix: ON_MENU_ENTER was always run
2022-11-08 13:49:40 +01:00
59a452ac27
PFW-1397 minor comment tweaks
2022-11-08 13:49:40 +01:00
f160f5594d
PFW-1397 cleanup statistics menu
...
Change in memory:
Flash: -18 bytes
SRAM: -1 byte
2022-11-08 13:49:40 +01:00
82bd9db1d6
PFW-1397 Implement ON_MENU_ENTER to simplify code
...
ON_MENU_ENTER runs code within the brackets only once
after a new menu is entered.
For the tool change menu, this allows us to display the data and
read from EEPROM only once.
2022-11-08 13:49:40 +01:00
a896dfd4e0
PFW-1397 To reserve EEPROM write cycles, only update toolchange counter when a print finishes or is stopped
2022-11-08 13:49:40 +01:00
3120bf0aa2
PFW-1397 Implement new function increment_tool_change_counter()
...
Reduces flash consumption by 44 bytes
2022-11-08 13:49:40 +01:00
fcfb868167
PFW-1397 Add a temporary menu item to show the statistic
...
The location of the menu has not been decided. Currently I placed it where convenient.
2022-11-08 13:49:40 +01:00
5a60a85467
PFW-1397 Increment toolchange statistic
2022-11-08 13:49:40 +01:00
0af7d28074
PFW-1397 Allocate EEPROM memory for toolchange counter
2022-11-08 13:49:40 +01:00
7fe22e8f79
Fix long-press LCD inactivity timeout
...
Fixes #3715
When a long-press is triggered, the LCD inactivity timer
needs to be restarted. This is done with lcd_timeoutToStatus.start()
This also fixes situations where a long-press is triggered, and the timer
times out immediately (because it was not reset properly)
Change in memory:
Flash: +8 bytes
SRAM: 0 bytes
2022-11-06 13:43:14 +00:00
853adbf411
Bump up build number
...
+1 for commit
+1 for merge
2022-11-04 11:16:07 +01:00
7c009cadb8
Bump up Revision to ALPHA1 6051
...
Temporary fix for MSG_BTN_MORE
pre-release pot and po update
2022-11-04 10:21:39 +01:00
7b20f8c6f3
Merge pull request #3717 from 3d-gussner/MK3_Temp_Model_menu
...
Add Menu `Calibration -> Temp. model cal`
2022-11-03 12:12:55 +01:00
1e0909d50c
Disable `Error:` messages for MMU2 errors
2022-11-03 12:09:03 +01:00
8543942acb
Fix Z-leveling
2022-11-03 06:22:57 +01:00
fd6da0e766
Fix typo
...
Add lcd_setatatus_serial to output lcd status message and serial at the same time
2022-11-02 10:09:32 +01:00
7bc7f21fa5
mmu: move RetryIfPossible outside the error screen
...
This fixes issue where 'retryAttempts=3' may be spammed in the logs
Change in memory:
Flash: 0 bytes
SRAM: 0 bytes
2022-11-01 06:22:39 +01:00
2ac2cd2255
Fix MK25/S builds
2022-10-26 14:27:22 +02:00
072b3f8300
Temp Model cal. menu
2022-10-26 13:34:27 +02:00
f4a2c1c794
Update translations
...
Fix button msg
Update Dutch `F. jam detect`
2022-10-25 10:29:35 +02:00
45c72d48ed
optimisation: use failstats_reset_print in factory_reset_stats
...
Change in memory:
Flash: -56 bytes
SRAM: 0 bytes
2022-10-23 09:58:56 +00:00
edc5d013dd
Merge pull request #3698 from leptun/farm_presort_cache
...
Farm mode: cache filenames in the presort function
2022-10-21 15:43:49 +02:00
b792d47350
Merge pull request #3694 from 3d-gussner/MK3_Hotend_fan
...
PFW-1415: Rename `Extruder fan` to `Hotend fan`
2022-10-19 08:47:15 +02:00
b485992c9e
If in farm mode, force the sorting direction to be reversed
...
So in an ideal scenario, the newest file is first. This of course breaks as soon as a file is deleted/renamed/moved, but it should at least be fixed now compared to before where the direction could be influenced by a disabled setting
2022-10-18 17:29:31 +02:00
798f215f88
Refactor SD menu settings
2022-10-18 17:24:35 +02:00
eaaf1d6872
Rename Sheets
...
- `Satin 1` to `Satin `
- `Satin 2` to `NylonPA`
2022-10-18 10:20:01 +02:00
e18bfce597
Farm mode: cache filenames in the presort function
2022-10-17 20:17:28 +02:00
e83728f72c
Change fan RPM display to 5 digits
...
All credits to @ WarrenSchultz for initial PR https://github.com/prusa3d/Prusa-Firmware/pull/3656
2022-10-17 15:41:05 +02:00
f2fe9a51ee
rename `Extruder fan` to `Hotend fan`
2022-10-17 13:49:18 +02:00
2682b64a09
Optimisation: Reduce code size in rendering SD file names and folders
...
Change in memory:
Flash: -88 bytes
SRAM: 0 bytes
2022-10-12 20:19:21 +00:00
2c695f14be
Increase required MMU version to 2.1.4.x
2022-10-12 07:45:13 +02:00
6eab0dda59
Add parentheses - be more explicit in error codes' masking and comparison
2022-10-11 15:51:01 +02:00
0aeb74e5b1
Intercept M708 A0xb: set ExtraLoadDistance on the printer side too
2022-10-11 15:51:01 +02:00
b0466ae20f
Add infrastructure for MMU parametrization after comm start
...
For now, only the Extra loading distance is being sent, but the infrastructure can be easily extended for other registers as well.
2022-10-11 15:51:01 +02:00
c7e4c9ce99
Allow backwards compatibility with legacy MMU g-codes
...
This piece just changes the default extra load length on the MK3 side.
The same needs to be done on the MMU side but:
- the MMU exposes its register for this (so we can change the extra load distance by writing into the register via G-code)
- the printer shall probably set this value on its own after line up of MMU communication
2022-10-11 15:51:01 +02:00
013ce588a5
Support reading/polling multiple registers
...
In Idle and Command mode it is now possible to specify a list of registers which shall be periodically read from the MMU.
To keep the code and RAM size down registers are intentionally separated into 8bit and 16bit sets.
Adding a register into the set is just a matter of parametrization, there is no need to change the state machines anymore.
2022-10-11 15:51:01 +02:00
ebb79351a7
Add preliminary support for MMU_SELFTEST_FAILED error messages
2022-10-11 15:51:01 +02:00
d5ca47d1a6
Merge pull request #3646 from gudnimg/fix-mmu-buttons-v2
...
PFW-1403 Fix issue where physical MMU buttons do not dismiss error screen
2022-10-11 13:42:39 +02:00
8882d8f2c8
Only move XY when position is known
...
I had a crash when producing an error screen and printer was unhomed.
Extruder was located at the far right side, and immediately crashed when attempting to park.
2022-10-11 07:16:52 +02:00
9f3361577e
Merge pull request #3643 from gudnimg/PFW-1358
...
PFW-1358 More button utilizes text and an empty character on the right
2022-10-10 18:02:22 +00:00
98cfc37017
Merge pull request #3674 from gudnimg/mmu-first-lay-cal-purge-line
...
MMU: Sync first layer purge line with PrusaSlicer generated output
2022-10-10 17:59:18 +00:00
213f0e8c71
PFW-1358 Update second_col description
...
Value is no longer hardcoded
2022-10-10 17:48:56 +00:00
eb43d712df
Enable MISO pullup during SD CMD0
...
Fix typo
2022-10-10 09:43:50 +02:00
ccf0c0a09f
Merge pull request #3675 from gudnimg/pad-mmu-status-messages
...
Fix issue where MMU status messages are not padded
2022-10-09 10:49:55 +00:00
1c6345a85b
Fix issue where MMU status messages were not padded
...
Also combined common cases to reduce code size
2022-10-09 10:37:33 +00:00
76dc51d2f0
Sync first layer purge line with PrusaSlicer generated output
...
If you generate a multicolor gcode file with PrusaSlicer, the purge
line gcode will look like this.
This reduces clicking sounds from the extruder, filament extrusion is reduced by 6mm.
2022-10-09 10:03:54 +00:00
d483531606
PFW-1358 update c values
2022-10-08 09:40:43 +00:00
00ccdcd467
PFW-1358 change MSG_BTN_MORE from I1 to N1
2022-10-08 09:25:06 +00:00
d6e0f47739
PFW-1403 Rename ReportErrorSource to ErrorSource for shorter code
2022-10-08 08:51:32 +00:00
33690b927a
PFW-1403 Fix issue where physical MMU buttons do not dismiss error screen
2022-10-08 08:51:32 +00:00
8f0de44d84
PFW-1358 Move 'More' button to the corner of the screen
...
Make 'More' button position consistent with 3-button screen.
2022-10-08 08:50:40 +00:00
7264391c5f
PFW-1358 Fix and optimise button choice positions
2022-10-08 08:50:40 +00:00
9046fb3d44
PFW-1358 Adjust positions of button choices
2022-10-08 08:50:39 +00:00
06427087c0
PFW-1358 Change "More" button to single character
2022-10-08 08:50:39 +00:00
233174cf86
Fill the doc for the EEPROM value at 0x0DA1 - active_sheet
2022-10-07 11:59:57 +02:00
2067cddc46
Merge pull request #3631 from 3d-gussner/MK3_fix_eeprom_documentation_part1
...
MK3 fix eeprom doxygen documentation
2022-10-06 15:29:15 +02:00
629fc9d0f1
Merge pull request #3638 from wavexx/tm_cal_click
...
TM: Consume LCD click after calibration
2022-10-06 14:29:40 +02:00
bab83704a1
Fix Typo 0X0 to 0x0
2022-10-06 13:23:16 +02:00
bfaed2768c
Merge pull request #3652 from wavexx/cmake_build_v2
...
cmake build improvements v2
2022-10-05 14:20:28 +02:00
d867da201f
cmake: Define FW_VARIANT instead of copying Configuration_prusa
2022-10-05 01:26:30 +02:00
1d3ee1caba
build: Add Configuration_var.h as a configuration wrapper
...
Instead of including Configuration_prusa.h directly, include
Configuration_var which then includes the proper variant file though a
preprocessor macro.
This allows to keep the existing build system intact, but also redefine
at compile time the final header without having to make copies on the
file system.
2022-10-05 01:26:26 +02:00
2ae376d633
build: Size optimization
...
Explicitly force-noinline xyzcal_scan_pixels_32x32_Zhop to match the
previous LTO build behavior.
2022-10-04 12:13:09 +02:00
5ed6bd7f8b
cleanup: Fix more spourious missing return warnings
...
Rewrite to use a temporary and get rid of the warning.
The generated asm is *unchanged*.
2022-10-03 21:54:08 +02:00
992845198d
Merge pull request #3648 from wavexx/more_cleanups
...
cleanup: Expand tabs to fixup suspicious indentation warnings
2022-10-03 11:53:42 +02:00
4cc6695195
cleanup: Expand tabs to fixup suspicious indentation warnings
2022-10-02 20:42:36 +02:00
a8e85bd146
cmake: Work-around gcc 7 not supporting SOURCE_DATE_EPOCH
2022-10-02 20:32:32 +02:00
1d520f9165
cmake: Make builds fully reproducible by default
...
- Work-around SOURCE flags being reset for each project when setting the
random-seed property by calling a support function.
- Likewise, set correct flags for reproducibility when creating archives.
- Strip source prefix paths from debug info
This should set the EPOCH using the last git commit date when available,
but it's not currently implemented. Just set the EPOCH to be 0 for now.
2022-10-02 20:32:32 +02:00
d8c9c4450f
Merge pull request #3641 from vintagepc/build-with-cmake
...
Build the firmware with cmake
2022-10-02 13:05:32 -04:00
c7b6b9a99b
cleanup: Suppress unused argument warnings
2022-09-30 15:08:11 +02:00
c522330433
Merge remote-tracking branch 'upstream/MK3' into build-with-cmake
2022-09-30 09:04:35 -04:00
49f96213a4
Also consume longpress in lcd_consume_click()
2022-09-30 14:29:37 +02:00
b95d508574
cleanup: Remove implicit fallthrough in CRC validation
2022-09-30 12:55:47 +02:00
71be6b19d4
cleanup: Remove return value from MMU2Serial::write()
...
Removes a missing return warning.
Looks like we don't handle overflow at the moment and in all surrounding
code, so let's remove the return value for now.
2022-09-30 12:55:47 +02:00
6cfe000ac9
cleanup: Reorder members to match initialization order
2022-09-30 12:55:47 +02:00
398a4bf403
cleanup: Do not return const values from functions
...
This generates a warning under -Wextra, since in most cases a const
value doesn't prevent buggy code (as copies are allowed) while
preventing some optimizations (such as move operations) to take place.
2022-09-30 12:55:47 +02:00
d6af13dfc1
cleanup: Supress missing return warnings
...
Rewrite the function with a temporary to avoid the spourious no-return
warning.
The generated code is *unchanged*.
2022-09-30 12:31:07 +02:00
31ea48246a
TM: Consume LCD click after calibration
...
Consume any pending LCD click after the temperature model calibration.
Since we're already in the status menu, the usual consume action is not
done automatically here.
2022-09-30 12:24:54 +02:00
74e15ac233
Rename EN_ONLY to EN_FARM
...
remove DEBUG/DEVEL/ALPHA/BETA lcd warning
2022-09-29 16:39:02 +02:00
346dfbdbb3
Fix MSG_SPOOL_JOIN
2022-09-29 10:54:46 +02:00
c7b500af1e
BETA firmware message only in English
...
Rephrase BETA firmware message to fit on two screens
ALPHA message same as DEVEL
Fix ALPHA DEVEL message
2022-09-29 10:48:16 +02:00
1a8f18318c
Add Temp Model eeprom documentation
2022-09-28 18:15:23 +02:00
302e4b679c
replace tab with spaces
2022-09-28 17:37:46 +02:00
709d07310a
lcd_print_pad: do not overflow len when truncating the string
2022-09-26 11:26:10 +02:00
7fb53899dc
Merge branch 'MK3' into MK3_MMU2_fix1
2022-09-23 14:55:23 +02:00
26b091d50e
Remove unneeded lcd_finishstatus()
2022-09-23 11:54:16 +02:00
80c06bda55
Improve warning behavior during thermal anomaly
...
The current code forces any warning to return the user to the status
screen in order to show the message.
Thermal anomaly warnings can repeat at very short intervals, making menu
navigation (to pause/tune the print) impossible.
We now check if the message to be displayed is the same and only force a
kickback for new messages.
This partially reverts https://github.com/prusa3d/Prusa-Firmware/pull/3600
since we need the string to be null terminated for ease of comparison.
We pad the status line at display time instead using the new
lcd_print_pad() function which achieves the same effect.
2022-09-22 16:12:35 +02:00
24b638b5d4
fixed undefined behaviour when left shifting a negative number
2022-09-21 16:21:19 +02:00
9a9aadca87
Do not hang during startup
...
In ultralcd_init() do not use lcd_setstatuspgm() to initialize the
welcome message.
The internal call to lcd_finishstatus() requires the serial to be
already available. Split the function into lcd_padstatus() to pre-pad
the string and save some space.
2022-09-21 16:12:16 +02:00
f7d4095479
Merge branch 'MK3' into MK3_MMU2_fix1
2022-09-21 15:18:44 +02:00
2cdd3ba364
Move strings to progmem
2022-09-21 14:53:54 +02:00
16d1ef8510
Merge pull request #3560 from leptun/splash_version
...
Show firmware version on splash screen
2022-09-21 14:47:41 +02:00
a1213d6a6e
Merge pull request #3600 from gudnimg/init-lcd-status
...
Fix initialization of LCD status line message
2022-09-21 14:46:10 +02:00
ca9a28eff2
Merge pull request #3612 from wavexx/tm_update_r0
...
Temperature model: update R0 estimate
2022-09-21 14:46:03 +02:00
bccdab4c22
Merge pull request #3615 from wavexx/line_cnt_reset_fix
...
Do not reset line on serial commands without N
2022-09-21 14:45:46 +02:00
183e21aa0b
Merge pull request #3599 from 3d-gussner/MK3_MMU2_messages
...
PFW-1339 - Update MMU2 translations
2022-09-21 10:27:01 +02:00
129df6dd4a
Do not reset line on serial commands without N
...
Fix regression introduced in fc10ca3146
2022-09-21 10:19:16 +02:00
1c4e9463ec
Temperature model: update R0 estimate
...
Update the default R0 estimate thanks to a larger dataset.
This improves the error margin during self-check.
2022-09-20 16:57:54 +02:00
eb7de5149b
Don't inline the function
...
Change in memory:
Flash: -44 bytes
SRAM: 0 bytes
2022-09-20 06:34:24 +02:00
c8a8484ca7
Remove atomic_update parameter
...
Change in memory:
Flash: +24 bytes
SRAM: -0 byte
2022-09-20 06:34:24 +02:00
76fb4610ea
Optimisation: Remove duplicated code in cmdqueue_could_enqueue_back()
...
Code is 28 lines shorter :)
Change in memory:
Flash: -42 bytes
SRAM: 0 bytes
2022-09-20 06:34:24 +02:00
156b5e5b99
Update current FW version
2022-09-19 18:15:39 +02:00
6a470791d3
Allow sending uint16_t values to registers
2022-09-19 15:13:37 +02:00
770fdcd83b
Fix typo, thanks to @gudnimg
2022-09-19 08:02:40 +02:00
28b0ef1acb
PFW-1369 Use same ramming sequence as default settings in Slicer
2022-09-19 07:23:03 +02:00
075a80e264
Add missing text
...
Finish Dutch translation
2022-09-17 17:38:45 +02:00
068f4763e2
Update translatable strings to match our extraction macros
...
Update pot and po files
2022-09-17 16:53:30 +02:00
47d7ea5dfd
Add MSG_LOAD_ALL and replace it a two loactions -10bytes flash
2022-09-17 16:36:09 +02:00
25a7dc8397
Fix: Filament Already Loaded only has two buttons
2022-09-17 16:36:09 +02:00
15a8c8fe37
Fix: Unload Manually did not send any button to the MMU
2022-09-17 16:36:09 +02:00
9b4a621275
Fix: Fsensor errors only have one reset button
2022-09-17 16:36:09 +02:00
037d51b049
Fix: Filament Already Loaded only has two buttons
2022-09-17 12:21:42 +02:00
3b60b894da
Fix: Unload Manually did not send any button to the MMU
2022-09-17 12:21:42 +02:00
e7b7d97f11
Fix: Fsensor errors only have one reset button
2022-09-17 12:21:42 +02:00
be7c1d55c8
Remove redundant for-loop
...
Now that lcd_status_message is now initialised correctly at boot-up,
this for-loop is no longer required. Now lcd_status_message is
only set in lcd_updatestatus() which always calls lcd_finishstatus()
lcd_finishstatus() makes sure the message does not exceed 20 characters
Saves 34 bytes of flash
2022-09-17 09:13:07 +00:00
4d6d267aef
Don't initialise lcd status message in definition
...
static variables are automatically zero initialised. Now that the
status line message is initialised in ultralcd_init(), we don't
need to set the variable in global scope.
Saves 22 bytes of flash and 1 byte of SRAM
2022-09-17 08:57:30 +00:00
f1e127ace4
Initialise status line message in setup()
...
Fixes #3581
2022-09-17 08:53:36 +00:00
404c622301
Finish German translation
...
increase 2nd langusge size to 0x3500 13567bytes to fit mmu2 translations 🤞
2022-09-17 10:35:30 +02:00
ec22e5faeb
Shorten message to 20 chars
...
add 01234567890123456789 ruler
2022-09-17 10:34:24 +02:00
539cdbfeea
Lower MSG_ rows
2022-09-17 08:48:56 +02:00
78fdf33f67
Update Firmware.pot and Firmware_de.po
...
Started German translation Part 1
Updated c= r= for German translations being longer than 8 rows
2022-09-16 20:42:50 +02:00
8480c1cb7a
Added //#define FARM_CONNECT_MESSAGE
2022-09-16 19:33:22 +02:00
88b58cdcd5
Update messages missing c= r=
...
Change MMU2 KEEPALIVE_STATE to IN_PROCESS
2022-09-16 19:24:11 +02:00
f4f09e4062
update mmu2 messages c= r= values
2022-09-16 19:18:23 +02:00
0f8d84082a
Update button menu documentation as there are 1/2/3 options
2022-09-16 19:11:11 +02:00
9d959f5d12
Prepare progress messages for translation
...
Remove duplicate messages
2022-09-16 19:08:06 +02:00
89a03c1f0d
MMU2/lang: Update translatable strings to match our extraction macros
2022-09-16 19:02:04 +02:00
50b6044703
Use origin message on serial
2022-09-16 18:17:50 +02:00
3f6b05cc35
Remove PAT9125 stats as these aren't different to IR stats
2022-09-16 18:04:21 +02:00
2ba863d8a5
Reuse MSG_IR_0x_OR_..
...
fix lowercase
remove todos
2022-09-16 17:23:38 +02:00
edad625cf7
RIP Bondtech long live the Extruder
2022-09-16 16:31:27 +02:00
37cde856e9
Rename Auto_deplete to Spool_join
...
Fix some missing MSG_ c= r=
2022-09-16 16:25:47 +02:00
f18493f361
Save some space due to shorter MMU error texts
...
applies https://github.com/prusa3d/Prusa-Error-Codes/pull/62
2022-09-16 12:12:08 +02:00
2d98cae8bd
Fixup MK3_MMU2 branch after rebase onto MK3
2022-09-16 11:08:03 +02:00
16713aa25a
Optimisation: scopeState is already set by SendReadRegister
...
Saves 2 bytes of flash
2022-09-16 10:23:47 +02:00
e9f5a95d4b
PFW-1362 Make sure FINDA runout is impossible with MMU disabled
...
Since mmu_loop() is called in the main loop() function
when the MMU is disabled, we need to utilise the
MMU protocol layer to prevent FINDA runout from happening
if MMU is disabled.
We also need to keep in mind we probably can't trigger
a FINDA runout in the middle of a Q0 query.
So my solution now is to wait for the "Finished" state
and check if the FINDA is off during printing.
When "Finished" state appears, the FINDA value should be up
to date.
2022-09-16 10:23:47 +02:00
94119744ad
PFW-1362 Change isSpoolJoinEnabled to return bool
2022-09-16 10:23:47 +02:00
65a0036dbe
PFW-1362 Optimise debug message
...
Saves 20 bytes of flash :)
2022-09-16 10:23:47 +02:00
998ed87f25
PFW-1362 Use PROGMEM messages
...
The main purpose of these two messages is just to see if SpoolJoin is enabled or not.
"On" and "Off" are descriptive enough.
Saves 16 bytes of flash
2022-09-16 10:23:47 +02:00
63b4abb66d
PFW-1362 SpoolJoin needs to known what the previous slot was
2022-09-16 10:23:47 +02:00
1010f23959
Fix an issue where findaPressed is never set
...
This caused instant FINDA runout when the print starts. Now fixed :)
2022-09-16 10:23:47 +02:00
b292a5bf4e
PFW-1362 temporarily don't use SpoolJoin in Tcodes
...
I think in the current implementation, this will cause more harm than good.
But we can improve SpoolJoin later
2022-09-16 10:23:47 +02:00
7dcfc1484e
PFW-1362 temporary debug messages
2022-09-16 10:23:47 +02:00
8610636906
PFW-1362 Add a log when FINDA filament runout is triggered
2022-09-16 10:23:47 +02:00
c5bb34f226
PFW-1362 Show if SpoolJoin is enabled or disabled at bootup
2022-09-16 10:23:47 +02:00
fb27a7d72b
PFW-1362 Remove "NA" EEPROM status
2022-09-16 10:23:47 +02:00
166ecbc7d8
PFW-1362 Fsensor is not required for Spooljoin
...
Since the Fsensor is not required to use SpoolJoin,
it makes little sense to me that we need the fsensor
to "enable" SpoolJoin
2022-09-16 10:23:47 +02:00
d51026d8f7
PFW-1362 Rename settings for consistency
2022-09-16 10:23:47 +02:00
7c95f87867
PFW-1362 Fsensor status is not required for SpoolJoin
2022-09-16 10:23:47 +02:00
715af8fcc2
Rename files to SpoolJoin
2022-09-16 10:23:47 +02:00
afc67332c7
PFW-1362 Initial commit
2022-09-16 10:23:47 +02:00
2276217cbb
Optimisation: Remove forceMenuExpire variable
...
During first layer calibration we have the live Z baby step menu
on the LCD and the user can tune their Z offset live.
Once the first layer calibration is done, we want to exit the menu
immediately. For this purpose it is much more efficient to
call lcd_return_to_status(). There is no visual difference
on the LCD for the user.
Change in memory footprint:
Flash: -34 bytes
SRAM: -1 byte
2022-09-16 10:23:47 +02:00
e39d1458a1
Fix lost changes during rebase
2022-09-16 10:23:47 +02:00
fae420f1e2
Fix MMU_ALWAYS_CUT enabled in variants
2022-09-16 10:23:47 +02:00
8e9a49082b
Set Cutter OFF if 0xff
2022-09-16 10:23:47 +02:00
b3ec36228d
Update doxygen documentation for M704-M709
2022-09-16 10:23:47 +02:00
2e7258d7a8
Include fix protocol from MMU PR#199
2022-09-16 10:23:47 +02:00
4d3a5433ad
Implement read/write registers for M707/M708
2022-09-16 10:23:47 +02:00
04a1a67b05
PFW-1386 Address TODO
...
We want to move the Z-axis after the XY move is done.
raise_z cannot be used here because it relies
on current_position[] for all axis.
It is actually 10 bytes cheaper to use the previous method
because syncing current_position with lastpos is surprisingly expensive
2022-09-16 10:23:47 +02:00
27ff01cf91
Shorter code
...
Change in memory:
Flash: 0 bytes
SRAM: 0 bytes
2022-09-16 10:23:47 +02:00
db1b0ea9ac
Optimisation: Set lastpos using memcpy directly
...
Verified the change by running the M600 gcode. All axis move as expected.
Change in memory:
Flash: -64 bytes
SRAM: 0 bytes
2022-09-16 10:23:47 +02:00
f984072eab
Remove unused #define
2022-09-16 10:23:47 +02:00
f49b88c1a1
Optimisation: lcd_commands "M702 C" should be "M702"
...
Change in memory:
Flash: -2 bytes
SRAM: 0 bytes
2022-09-16 10:23:47 +02:00
0c1052b0da
Optimisation: mmu_M600_load_filament
...
Don't render full screen for Loading Filament X
this is already done in load_filament_to_nozzle
so no need to do it twice
Change in memory:
Flash: -54 bytes
SRAM: 0 bytes
2022-09-16 10:23:47 +02:00
bf9ba3c003
Optimisation: setTargetedHotend serial message
...
Change in memory:
Flash: -130 bytes
SRAM: 0 bytes
2022-09-16 10:23:47 +02:00
635ae2bf20
M600: Small optimisation in if statements
...
Change in memory:
Flash: -4 bytes
SRAM: 0 bytes
2022-09-16 10:23:47 +02:00
f297131792
M600: lcd_change_fil_state does not need to be global
...
Refactor lcd_alright() to save flash
Change in memory:
Flash: -98 bytes
SRAM: -1 bytes
2022-09-16 10:23:47 +02:00
2216ba9fbf
M600: Ask for which slot to use when loading
...
This fixes an issue where the assumed slot to use is unknown and
the printer will hang on loading filament 100.
Another good thing is this is an old user feature request which
we have in our 3.12 milestone.
Change in memory:
Flash: +14 bytes
SRAM: -1 bytes
2022-09-16 10:23:47 +02:00
3e86bbb93f
M600: Don't unload if filament is unknown
...
Change in memory:
Flash: +8 bytes
SRAM: 0 bytes
2022-09-16 10:23:47 +02:00
05bf5de518
Fix calibrate_z_auto crashing Z-axis
...
Steps to reproduce:
1. Run M45 Z after booting the printer up
Change in memory:
Flash: -4 bytes
SRAM: 0 bytes
2022-09-16 10:23:47 +02:00
03b8a6e464
Use raise_z in more places
...
Change in memory:
Flash: -474 bytes
SRAM: 0 bytes
2022-09-16 10:23:47 +02:00
4758ac3f1b
PFW-1399 Don't show cut filament menu if setting is not enabled
2022-09-16 10:23:47 +02:00
55d2eaf8c0
M706: Only cut filament if the setting is enabled
2022-09-16 10:23:47 +02:00
66994d010d
Fix a few cases where rebase overwrote stuff
2022-09-16 10:23:47 +02:00
0537908d8c
Fixup 2
2022-09-16 10:23:47 +02:00
37b50477cd
Fixup after rebase onto MK3
2022-09-16 10:23:47 +02:00
18423685b6
Cleanup ExpectsResponse usage
2022-09-16 10:22:39 +02:00
d5377c1781
Remove extra "scopeState = ScopeState::FINDAReqSent"
...
saves ~20B in total
2022-09-16 10:22:39 +02:00
e205d0ee2f
Autoretry Idle scope: transf. into Finished, should stay in Processing
2022-09-16 10:22:39 +02:00
78cbea08e6
Fix pgm_read* usage
2022-09-16 10:22:39 +02:00
6c0d3b0b78
Optimize MMU protocol logic
2022-09-16 10:22:39 +02:00
05ad1dc2f6
Refactoring of protocol logic to lower RAM consumption
...
Should also place the statistics request to the right spot in the state machine.
2022-09-16 10:22:39 +02:00
dfddf3eaa5
Initial commit for MMU statistics
2022-09-16 10:22:39 +02:00
2616df66af
PFW-1386 st_get_position_mm() is more accurate when using endstops (not homed printer)
...
If the endstops kick in, then st_get_position_mm shows the actual travel distance. current_position[Z-AXIS] does not get updated correctly thus we cannot use it when unhomed.
current_position[Z-AXIS] is later set to Z_MAX_POS,
we cannot use that either to calculate the travel distance
2022-09-16 10:22:39 +02:00
f409426bdc
PFW-1386 Refactor raise_z
...
Removed the "plan" parameter.
We were incorrectly returning from the function if the printer was homed,
but plan = false. This would leave current_position with an incorrect value
If the printer is homed => finish the move and return the travel distance
If the printer is not homed => rely on end stop to prevent damage,
return travel distance even if the endstop stopped the move.
2022-09-16 10:22:39 +02:00
4a1479b5bc
PFW-1386 Clamp Z-axis when homed
2022-09-16 10:22:39 +02:00
fa6e30389a
PFW-1386 Add a TODO
...
When recovering the Z-axis in M600, we'd like the Z move to
happen after the XY move.
2022-09-16 10:22:39 +02:00
0a90c7ffda
PFW-1386 Use Marlin 2 unload sequence for single material
...
The current unload sequence does not give good results.
The Marlin 2 sequence looks good on my end. This can be later
used to improve M600
Added all the constants from Marlin 2
2022-09-16 10:22:39 +02:00
ff91b4670d
PFW-1386 Use same code for Z-lift in M600 as in M701/M702
...
This reduces flash usage by 128 bytes!
2022-09-16 10:22:39 +02:00
099c3a1f1f
PFW-1386 fixup
2022-09-16 10:22:39 +02:00
38952f1f33
PFW-1386 Optimisation: st_synchronize is not needed after raise_z_above
...
Saves 16 bytes of flash
2022-09-16 10:22:39 +02:00
214b6a9220
PFW-1386 M701, M702: Move Z-axis using relative position
...
* Created a new function raise_z() which will move the Z axis by some
X millimeters. If plan = false, the function will return the
actual travel distance since the move is blocking.
* raise_z_above() is refactored to call raise_z()
Now the M701 and M702 will move the Z-axis relatively, and also
when done, revert the Z axis position when done.
This is a similar behavior as in Marlin 2.
2022-09-16 10:22:39 +02:00
217b537961
PFW-1386 Remove old debug message to save space
...
Saves 34 bytes of flash
2022-09-16 10:22:39 +02:00
bb0bbfb45f
PFW-1386 Minor correction to M707 and M708 useage example
2022-09-16 10:22:39 +02:00
d78c575399
PFW-1386 Address should accept hexidecimal values
...
Now these are equal:
M707 A255 C1
M707 A0xFF C1
Both address inputs are interpreted as FF
2022-09-16 10:22:39 +02:00
ba7dae5c79
PFW-1386 I don't see a reason for these lines
...
So I'm removing them
2022-09-16 10:22:39 +02:00
3192a95e78
PFW-1386 Optimise default value assign z_target
2022-09-16 10:22:39 +02:00
20c865c2d4
PFW-1386 Implement 'U' parameter for M702
...
Similar to 'L' in M701, this does not apply to the MMU
The U parameter controls how much mm the extruder will unload
Default value is 80mm
2022-09-16 10:22:39 +02:00
7e9166976f
PFW-1386 Implement 'L' parameter for M701
...
It is only used when the MMU is disabled. With the MMU we use a defined ramming sequence.
When the MMU is disabled I borrowed the usages from Marlin 2.
The L parameter only defines the length for the "fast" load length.
Default value is 70mm, same as M600
2022-09-16 10:22:39 +02:00
94dd4aec73
PFW-1386 M701 now loads to nozzle with MMU
2022-09-16 10:22:39 +02:00
8462b38446
PFW-1386 Create a common function for M704 to M706
...
Saves 36 bytes of flash
2022-09-16 10:22:38 +02:00
d6564d3617
PFW-1386 if automatic = false, raising Z-axis is done via gcode
2022-09-16 10:22:38 +02:00
32ec1587b9
PFW-1386 Implement changes to M702
2022-09-16 10:22:38 +02:00
9b0d89213b
PFW-1386 Raising Z-axis during M701 is now done via Gcode
...
If the Z-parameter is not issued, then default behavior will raise
the Z-axis by MIN_Z_FOR_LOAD
2022-09-16 10:22:38 +02:00
5bb36546b4
PFW-1386 Implement changes to M701
2022-09-16 10:22:38 +02:00
fb087fc535
PFW-1386 Add M707 and M708
...
WriteRegister and ReadRegister function will create new compiler
warnings due to unused parameters, we can ignore it for now.
2022-09-16 10:22:38 +02:00
3664d29b21
PFW-1386 Add M709
2022-09-16 10:22:38 +02:00
de0539b630
PFW-1386 Implement M704, M705, and M706
2022-09-16 10:22:38 +02:00
70532333dc
Optimize filament sensor implementation
...
- remove virtual methods (we only have one fsensor implementation at a time)
- comment out some of the debugging texts
- remove volatile and replace them with proper synchronized access to relevant variables
2022-09-16 10:22:38 +02:00
2662e09f1e
Another message remove from RAM
2022-09-16 10:22:38 +02:00
0e036b9d8a
Save some more RAM in protocol_logic
2022-09-16 10:22:38 +02:00
022aa53b2d
Remove active_extruder completely
...
we only use 1 extruder + saves ~800B
2022-09-16 10:22:38 +02:00
0889109760
Fix corrupted chars in "Engaging Idler" message
2022-09-16 10:22:38 +02:00
bac3168ca4
Optimise power_on and power_off
...
eeprom_update_byte only updates the EEPROM if the value is different
Saves 40 bytes of flash memory
2022-09-16 10:22:38 +02:00
0d64cfa2e5
extruder variable should be one byte
...
Saves 1 byte of SRAM and 132 bytes of flash
2022-09-16 10:22:38 +02:00
87a4f58e66
PFW-1363 Change MMU Error parking position
2022-09-16 10:22:38 +02:00
703c463a49
Optimize unload
...
Toolchange during print is now much quieter.
Excessive E-motor movement during print is now gone
2022-09-16 10:22:38 +02:00
47e57646ea
Optimize load
...
Don't start moving the E-motor immediately
Instead of starting the E-motor move when the load to extruder starts,
we can start when we are loading to the fsensor. At that stage
the MMU has changed from a fast load to a slow load.
2022-09-16 10:22:38 +02:00
2f0ceabce5
Upgrade protocol to v2.1 - read/write registers + CRC
2022-09-16 10:22:38 +02:00
f18721bee3
Fix unintentional typo
2022-09-16 10:22:38 +02:00
6d6f9583ea
Initialize retryAttempts in constructor
2022-09-16 10:22:38 +02:00
485ed4a213
Fix issue where logs show two corrupted chars
...
Issue only appears when LANG_MODE = 1
2022-09-16 10:22:38 +02:00
938fac4058
Remove old comment, button is acknowledged now
2022-09-16 10:22:38 +02:00
f717aa161c
Remove TODO in ActivatePlannedRequest
2022-09-16 10:22:38 +02:00
b9d9308f9f
Support 3x Retry in Idle state machine
2022-09-16 10:22:38 +02:00
ab32769487
Send button from current state machine
2022-09-16 10:22:38 +02:00
4f30cf0ba3
Add missing ProtocolError
2022-09-16 10:22:38 +02:00
bc85a41059
Fix xflash flashing
2022-09-16 10:22:38 +02:00
53e2d68183
Retry up to 6x in case of incorrect MMU FW version
...
Because it looks like the communication drop outs are caused by some electrical issues and we can loose even a byte from the version response, which is deadly for future operation.
2022-09-16 10:22:38 +02:00
6e5fcb5838
Tune a few MMU progress codes' texts to fit on the LCD
2022-09-16 10:22:38 +02:00
14b2befb7d
Switch from Start Seq into Idle immediately + disable FS autoload on MMU
2022-09-16 10:22:38 +02:00
400fec5d9f
Reset CustomMsg when Command in progress is None
...
When a Progress report is started, we set the CustomMsg to MMUProgress.
But there was an issue where, once the reported "Progress" action was done.
We did not reset the CustomMsg to Status. So if we are printing from the
SD card, the file name is not displayed on the LCD.
2022-09-16 10:22:38 +02:00
5b184d885c
Add LCD_BUTTON_TIMEOUT to enum
2022-09-16 10:22:38 +02:00
e59651a279
Remove description in header file
...
The description are more detailed in the ultralcd.cpp file
No need to document the function in two places :)
2022-09-16 10:22:38 +02:00
2fc8b50f11
Fix lcd_show_multiscreen_message_yes_no_and_wait_P after rebase
2022-09-16 10:22:38 +02:00
be3f9376ba
Add missing break
2022-09-16 10:22:38 +02:00
09cb9c6ecd
Fixup after rebase + discussion
2022-09-16 10:22:38 +02:00
1d2acb5bd6
Bump MMU FW version to 2.0.19 to match/enforce the necessary compatibility level
2022-09-16 10:22:38 +02:00
fa176c69db
Fix protocol error recovery
...
Communication timeout and Protocol Errors are now distinguished.
In case of a Protocol Error, the printer waits for heartBeatTimeout to allow filling up the input UART buffer (we expect the MMU still produces some bytes).
Once the timeout elapsed, the input UART buffer is cleared and a new Start Sequence is initiated.
2022-09-16 10:22:38 +02:00
6bf2aebf04
Fix typo
2022-09-16 10:22:38 +02:00
80c640deb9
PFW-1373
...
Fix the unload procedure when the user has paused a print
then stopped the print after the temperature has reached below 175°C
Now the E-motor will move as expected
2022-09-16 10:22:38 +02:00
ba52430e1d
Magic numbers are bad...
2022-09-16 10:22:38 +02:00
69c39e2281
An attempt at fixing the retry. Discussion needed.
2022-09-16 10:22:38 +02:00
c412f062c8
Perform 3xRetry automatically
...
This is a draft PR showing the potential 3x retry implementation on the printer's side.
It is much less code and looks more reliable than the same functionality in the MMU FW.
Still, more work needs to be done:
- [ ] Button is sent to the MMU even before returning from the parking position
- [ ] Then the button is sent again
- [ ] Then the printer runs out of retryAttempts
We need to find a better spot to check for "automatic" retry and issuing of the buttons
2022-09-16 10:22:38 +02:00
999320f671
Limit build number to uint8_t ( #49 )
...
Currently the MMU only sends one byte so there is no need
in storing the version with two bytes
2022-09-16 10:22:38 +02:00
6b7a018f9b
PFW-1354 Fix slow button processing ( #37 )
...
* Fix MK3S buttons being processed too slowly
After a button is selected on the MK3S MMU error screen, we need to process it before asking for another MMU Query.
Because the MMU Query will make the Error screen return and overwrite the status screen
* Add back CheckUserInput for ButtonPushed event
2022-09-16 10:22:38 +02:00
d420b20bd9
Add a missing break
...
I don't see any difference in behaviour but this should be more correct
2022-09-16 10:22:38 +02:00
3520020b24
* Correct the unload length on the MK3S side
...
* Pull all numbers into global constants
2022-09-16 10:22:38 +02:00
6eb2767dd2
PFW-1334 Distinguish between a retry unload and U0 unload
...
U0 unload uses the ramming sequence, while the retry unload does not because the MMU starts unloading much sooner
2022-09-16 10:22:38 +02:00
9a52bb5d04
Add MMU2_UNLOAD_TO_FINDA_FEED_RATE
2022-09-16 10:22:38 +02:00
59d19a8330
PFW-1334 Move E-motor on FSENSOR error retry
2022-09-16 10:22:38 +02:00
b8432e6bf2
Partial fix for PFW-1334
...
When a FSENSOR error happens, the first step for the MK3S should be to stop any loading by stopping the E-motor.
From this point, the buttons should determine what the MK3S does next.
2022-09-16 10:22:38 +02:00
2aa6cfc1ab
Optimise mmu_cut_filament_menu ( #40 )
...
preheat_or_continue should be used here to reduce copying code
2022-09-16 10:22:38 +02:00
8eb054e789
Fix trying to use serial before it's intiialized
2022-09-16 10:22:38 +02:00
ace5130d9f
PFW-1375 MMU error reported by MK3S does not appear on LCD
2022-09-16 10:22:38 +02:00
7d3a50450d
PFW-1340 Hide Done button for two errors
...
* FSENSOR_DIDNT_TRIGGER
* FSENSOR_DIDNT_GO_OFF
The Done button does not Move the E-motor because it
expects the user to have manually resolved the problem
Also if the filament is in the gears, we cannot pull the filament out.
In this case the Retry button is more suited as it will unload the filament.
2022-09-16 10:22:38 +02:00
4dd689ba9a
Fix PFW-1357 ( #35 )
...
lcd_encoder_diff would be set to 0 if lcd_update_enable(true)
is called outside ReportErrorHookMonitor
This would put enc_dif out of sync with lcd_encoder_diff and could cause false rotation triggering
2022-09-16 10:22:38 +02:00
d7d6885765
PFW-1351 Cooldown timeout ( #33 )
...
* PFW-1351 WIP
* Fix bug with cooldown timing due to bad bitfield.
* Use default safety timer value for timeout
2022-09-16 10:22:38 +02:00
d1b216da0d
Disable fsensor newVolt debug reporting
2022-09-16 10:22:38 +02:00
f94c2cba46
Fix rendering temp. + toolchange on MMU error screen
2022-09-16 10:22:38 +02:00
a004273e8f
Avoid drawing MMU Error screen while MMU moves manually
2022-09-16 10:22:38 +02:00
98adcbaff2
Bump required MMU FW version to 2.0.18
2022-09-16 10:22:38 +02:00
dab26fe50b
Report detected MMU version in the Support menu
...
It was just subtly broken, all the functionality had already been implemented.
2022-09-16 10:22:38 +02:00
121d43f896
Add a Try-Load-to-Bondtech operation
...
PFW-1347
2022-09-16 10:22:38 +02:00
0e96169bb3
remove logspam
2022-09-16 10:22:38 +02:00
4ea53ad4bf
fix bug I introduced
2022-09-16 10:22:38 +02:00
c07a5f396d
Fix button enum
2022-09-16 10:22:38 +02:00
d9676eff25
Fixed buged temperature resume.
2022-09-16 10:22:38 +02:00
f9bedc3c94
Button handling WIP
2022-09-16 10:22:38 +02:00
9a20c85a5d
First pass, improving the error recovery.
2022-09-16 10:22:38 +02:00
1e391f303c
PFW-1344 Fullscreen message Loading Filament
...
When loading a filament through the LCD,
show a full screen message:
Loading Filament N
Where N can range from 0 to 5.
2022-09-16 10:22:38 +02:00
8aa16a6429
Write documentation for lcdui_print_extruder
2022-09-16 10:22:38 +02:00
8fd1653b84
PFW-1343 initial commit
2022-09-16 10:22:38 +02:00
ed04c24ba0
Implement 'Filament not loaded' option for M600 with MMU
2022-09-16 10:22:38 +02:00
caf98936e3
Minor cleanup
2022-09-16 10:22:38 +02:00
b9c23cd6b8
Add Unloading message to LCD
...
Also made mmu_M600_load_filament static to limit its scope
2022-09-16 10:22:38 +02:00
d5cdb412ba
Introduce a way to read the previous tool used
2022-09-16 10:22:38 +02:00
2d02877686
Disable automatic in M600
2022-09-16 10:22:38 +02:00
e39bc3f12d
During Tx, temporarily allow cold extrusion
...
This prevents a FSENSOR DIDNT TRIGGER error
and allows the bondtech gears to grab the filament.
2022-09-16 10:22:38 +02:00
45a5e719a2
Disable filRunout when MMU.Enabled()
...
It turned out the runout is caused by the ramming sequence in the G-code, which is interpreted before the actual MMU command gets into processing.
The frequency of these errors/runouts differed one machine from another and was really hard to track down.
Therefore - once the MMU is enabled (active and running) we'll disable filament runout handling caused by the printer's filament sensor.
2022-09-16 10:22:38 +02:00
a1881b4a07
Disable filament runout when MMU is unloading
2022-09-16 10:22:38 +02:00
Alex Voinea
Guðni Már Gilbert
VintagePC
3d-gussner
DRracer
D.R.racer
Tomáš Jozífek
Yuri D'Elia
Yuri D'Elia
Tom Mittendorf
Guðni Már Gilbert