515a625180
Typo: hysterezis -> hysteresis
2022-12-22 12:54:42 +01:00
8414c272bf
Merge pull request #3787 from gudnimg/PFW-1439
...
PFW-1448 Fix underextrusion + compensate load to nozzle extruder sequence for Extra Loading Distance
2022-12-22 11:07:28 +01:00
9ca7760c2e
Merge pull request #3830 from 3d-gussner/MK3_XYZ_cal_fix
...
MK3: XYZ cal change message and add LCD ouput
2022-12-20 14:16:49 +01:00
0bcb4ab59d
Merge pull request #3822 from wavexx/tm_partial_lock
...
MK3: TM: Prevent lockout on invalid model values
2022-12-20 14:13:56 +01:00
7fef570d1b
Change xyz cal message `up to 24 min.` instead `approx. 12 min.`
2022-12-20 10:30:53 +01:00
355b670cd4
Remove SWSPI which is not used/implemented
2022-12-20 10:10:45 +01:00
2b38080c7e
Merge pull request #3833 from leptun/MK3_fix_MK2.5_softReset
2022-12-20 10:02:14 +01:00
ea6450f072
Add LCD output during xyz calibration
2022-12-20 08:36:19 +01:00
65f5b9e53d
Merge pull request #3818 from wavexx/tm_default_state
...
TM: Provide full defaults for model data and enable it by default
2022-12-20 07:08:25 +01:00
62ea78d46e
Handle configurable distance past gears
2022-12-19 23:49:12 +01:00
70356b71df
Handle filament sensor position that is not 0
2022-12-19 23:41:43 +01:00
c72ae8a2f3
PFW-1439 Remove parameters from execute_load_to_nozzle_sequence
2022-12-19 21:12:12 +00:00
6ee5f08505
PFW-1439 Compensate load to nozzle extruder sequence for Extra Loading Distance
...
The Extra Loading Distance is configurable by the user.
We need to compensate the hardcoded sequence
such that it does not extrude too much or
too little. Currently the firmware
extrudes too little.
2022-12-19 21:12:11 +00:00
97ddcc66bb
Merge pull request #3839 from leptun/MMU2_split_variant_config
...
MMU2 split variant config
2022-12-19 20:31:01 +01:00
c0f96e062b
TM: Force initialization after reset
2022-12-19 18:08:01 +01:00
ba0f051f72
Revert accidental removal of check
2022-12-18 15:55:48 +01:00
4c32e8b403
PFW-1457 make CHECK_FSENSOR into a function
2022-12-18 12:23:20 +00:00
5c1c6d9f3b
Adjust MMU2 specific distances
2022-12-18 10:30:43 +01:00
8623d9ff55
Split the mmu2 config into MMU2 and MMU2S
2022-12-18 09:58:20 +01:00
fee68b0f0d
PFW-1457 Do not unload at start of First Layer Cal
...
Fixes issue where First Layer Cal. triggers an unload before any
filament is loaded
The purpose of this if() statement is to handle the case where
a user or developer is sending T-codes to the printer directly
via Serial. Such as when one first sends T0 and then T4.
And unload must be triggered in-between, we can do this automatically
if FINDA detect filament.
Change in memory:
Flash: -10 bytes
SRAM: 0 bytes
2022-12-18 05:51:21 +00:00
dba3428ef2
Improve MSG_ACK_ERROR message
2022-12-17 20:25:47 +01:00
80c7790e87
Also prevent longpress when Stopped
2022-12-17 17:30:44 +01:00
271523ad45
TM: Disallow preheat/filament actions when stopped
...
Require acknowledgement first
2022-12-17 17:00:33 +01:00
f8290f25cd
TM: Allow to resume without a running print
...
If there is no running print, and the printer is Stopped, add a new
"Acknowledge error" menu entry to unlock the printer.
This simply calls lcd_print_stop(), which is identical in behavior to a
thermal error with a running print.
2022-12-17 16:48:39 +01:00
0972ef70d0
Use menu_set_block() in ThermalStop()
...
Set a menu block for fatal thermal errors instead of abusing
lcd_return_to_status() to kick the user out of the menus.
This now allows a thermal model error to be recoverable through menu
access.
2022-12-17 16:42:22 +01:00
8d719efa79
Do not show/call LCD status updates when unchanged
...
This mostly prevents useless serial noise
2022-12-17 16:35:26 +01:00
365f845c99
TM: correctly mark repeated anomalies
2022-12-17 16:33:42 +01:00
6e2f016655
TM: Clear the Stopped state when stopping the current print
...
We allow resuming from the LCD via start print and resume print,
it makes sense to clear the error on stop too.
For this reason distinguish whether the action is performed
automatically or manually (ie: interactively).
The error is only cleared when the command is run interactively.
2022-12-17 16:11:31 +01:00
119dc10b8f
Rename print_stop() to lcd_print_stop_finish() for clarity
2022-12-17 16:03:03 +01:00
c5d406d12f
Fix interrupts not enabled during setup()
2022-12-16 16:46:08 +01:00
eb8ec9f8b9
If an old firmware is detected, make sure the protocol is actually stopped
...
The printer shouldn't continue endlessly asking for a version if an old MMU is detected.
Also if the protocol is supposed to be turned off, it
shouldn't be sending S0 queries.
2022-12-16 16:23:19 +01:00
9f3f0baa47
mmu: Use strncpy when possible
...
Since tmp is always null-terminated we can save some time compared to a
memcpy call.
2022-12-16 16:21:59 +01:00
b3b9778341
mmu: Silence repeated S0 requests
...
Update "S0" CRC on replies so that the message is properly silenced.
2022-12-16 16:21:59 +01:00
78cf51274f
mmu: Embed the newline in MMU2_ECHO_MSG/MMU2_ERROR_MSG
...
This allows to redefine both macros to silence debugging messages, since
we can't redefine the base SERIAL_ECHO.
2022-12-16 16:21:59 +01:00
5f2f6dde13
array<>::size should return constexpr expression
...
This allows to size buffers at compile time (matches c++11 behavior).
2022-12-16 16:21:59 +01:00
2e7c237a17
Cleanup: remove automatic parameter from unload_filament()
...
In M600 and M702, the Z-lift is taken care of outside this function
so it makes no sense to have a Z-lift within unload_filament()
Only exception to this is in the wizard, there I moved the Z-lift to
happen before we start heating the nozzle.
Change in memory:
Flash: -12 bytes
SRAM: 0 bytes
2022-12-16 16:20:09 +01:00
090c72367d
Minor Fix for PR2235
...
Shorten message to c=12 as some translation of `Yes/No` are 4 chars long
2022-12-16 16:10:15 +01:00
d43a7da20d
fix watchdog not getting disabled on user app boot
2022-12-16 16:01:29 +01:00
74545e2133
Fix `µ` character shown on translations
2022-12-16 15:59:37 +01:00
c05ac535be
TM: reset fan measuring state when changing speed
...
Ensure that fan checks are reset and use the new speed at each step of
the calibration.
This also gives extra time to the fan to ramp-up from a cold start,
when a fancheck could previously start right *after* the speed change.
Should fix #3791
2022-12-16 15:30:30 +01:00
d80e32fa31
retrigger build
2022-12-16 12:55:30 +01:00
3f6089f2c1
More documentation for pins file
2022-12-16 12:29:59 +01:00
e8c8945650
Disable the watchdog early in the program
2022-12-16 12:25:44 +01:00
451f601697
Fix MK2.5 softReset()
2022-12-16 12:10:47 +01:00
001876a807
Parenthesize IS_SD_PRINTING defensively
2022-12-15 08:13:38 +01:00
3066fd1db3
Replace two expressions with cmd_head
2022-12-15 08:13:02 +01:00
a588a5f695
Allow M310 to bypass the Stopped state for recovery
...
Since M310 cannot change the heaters, allowing M310 S0 (and changing
parameters) allows to recover a usb-controlled printer which has been
locked-out due to bad model settings.
2022-12-14 13:47:11 +01:00
c7865a83f2
Keep a pointer past the line number in cmdqueue
...
This allows to skip line numbers transparently and perform faster
checks on the actual command to process.
2022-12-14 13:47:11 +01:00
5c4ec5dd4f
TM: Do not lockout the menus on thermal errors
...
This prevents the ability to run gcode from the SD card.
In a thermal error with faulty values, and without serial access, this
is the only way to process an M310 instruction and recover.
2022-12-13 18:38:26 +01:00
36575a4f83
Restore the previous model state when performing a nozzle change
...
Do not force-enable the model if it was previously disabled.
2022-12-12 20:17:56 +01:00
c5ec77a1ce
wizard: Allow finishing the calibration through menus
...
If the wizard is interrupted during model calibration, allow the
menu to mark "temperature model" calibration as complete.
2022-12-12 18:25:17 +01:00
0c042440ee
eeprom: Document new calibration state
2022-12-12 18:25:17 +01:00
118b39da39
wizard: Rework the thermal model calibration logic
...
- Correctly sequence the enqueued commands in order to check for the
real calibration result.
- Perform autocalibration with self-check enabled.
- Only save/continue the wizard if autocalibration succeeds.
2022-12-12 18:25:07 +01:00
38d893589f
selftest: Handle thermal errors in lcd_selfcheck_check_heater
...
- Simplify lcd_selfcheck_check_heater loop
- Check for/abort on Stopped (indicating a thermal failure).
2022-12-12 18:24:58 +01:00
4e7c830661
Remove M999 remnants
...
This was already removed in fc10ca3146
2022-12-12 17:52:48 +01:00
249be543fc
TM: Restore all original values if autotune fails
...
- Ensures repeated autotune attempts with self-check can't succeed due
to different starting conditions.
- Allows for a simpler workflow during selftest and wizard if autotune
fails.
2022-12-12 17:52:48 +01:00
2051809e2f
TM: Store only the last autotune result state
...
- Remove tm::valid and temp_model_valid as it's a duplicate of the
calibrated() state.
- Add temp_model_autotune_result() for future use.
2022-12-12 17:52:48 +01:00
324e501b18
TM: Set default resistance levels for MK3/MK3S
...
Provide average calibrated values for all fan levels for MK3/MK3S
variants and enable the model by default.
This ensures the calibration step is not skipped unless explicitly
disabled.
Force-clear fan values during autotune to restore the previous
calibration behavior, as fan resistance levels can be too big and
prevent the autotune-with-selfcheck to fail.
2022-12-12 17:52:48 +01:00
877c0bd35c
Fix potential buffer overflow in LCD messages
2022-12-12 17:52:48 +01:00
e2f1bfe506
TM: Remove unnecessary display comments
...
Favor code readability
2022-12-12 17:52:48 +01:00
4d87f65b68
Merge pull request #3443 from gudnimg/m109-turn-off-fan
...
Turn off print fan while resuming print from RAM
2022-12-12 15:20:20 +01:00
d84e497007
Merge pull request #3805 from 3d-gussner/MK3_Fix_M862.4_strict
...
MK3: Fix `M862.4` with [strict] mode
2022-12-12 12:38:15 +01:00
613ea290f5
Add a comment
2022-12-10 10:04:17 +00:00
9ed46df97f
Don't show full screen message meant for single color setup
...
load_filament_to_nozzle will show a more precise full screen message when an MMU is used.
2022-12-10 10:00:58 +00:00
70451b6bd3
Turn off print fan while restoring print from RAM
2022-12-10 09:53:43 +00:00
40cc6dcb6d
Merge pull request #3783 from leptun/enable_PRUSA_SN_all_variants
...
Allow "PRUSA SN" to print the SN in eeprom on all variants
2022-12-09 14:51:57 +01:00
1e39012953
Merge pull request #3793 from gudnimg/PFW-1453
...
PFW-1453 Stop Print: Don't unload if FINDA is not triggered
2022-12-09 12:54:16 +00:00
68c5cdce1c
Merge pull request #3780 from gudnimg/stop-print-optimisations
...
optimisation: Improve Stop Print menu
2022-12-08 19:41:52 +01:00
92f2281b1a
Merge pull request #2335 from Panayiotis-git/MK3_NoBedHeating_onLoadUnload
...
@Panayiotis-git Thanks a lot!
Finally after 3 years 21 days your PR gets merged 🦕
2022-12-08 18:45:12 +01:00
0cedb92ac6
Simplify firmware/gcode version comparisons
2022-12-07 18:59:29 +01:00
96e4881da5
Merge pull request #3794 from gudnimg/fix-m862-q
...
Fix undefined pointer in `M862.2 Q` and `M862.3 Q`
2022-12-07 13:04:45 +01:00
6f5a67491c
Fix `M862.4` with [strict] mode
...
Max 8 falvor versions
2022-12-06 13:18:52 +01:00
1c9a3a6b25
Add Nozzle change menu to FARM mode under Settings
2022-12-05 18:22:18 +01:00
a8fe71df8c
PFW-1453 Stop Print: Don't unload if FINDA is not triggered
2022-12-05 16:45:57 +01:00
52965bd05d
Avoid using global variables
...
Flash: -68B
RAM: -4B
2022-12-05 16:43:51 +01:00
4c27d057b8
Don't inline fSetMmuMode
...
Saves 8 bytes of flash
2022-12-05 16:43:51 +01:00
074b62361f
Fix #3788
...
fSetMmuMode needs to be called
in order for the commands to work:
M862.2 Q
M862.3 Q
2022-12-05 16:43:51 +01:00
c75c81ce4f
Do not heat the bed, on load/unload
...
If during a paused print, the preheat is canceled, keep the bed target temperature
Display bed temperatures only if bed is also heated
Remove not needed variables nTargetOld and nTargetBedOld from the mFilamentItem function
Define new Setting "HeatBedOnLoad" [Yes/No]
2022-12-04 19:26:34 +02:00
fb530ce543
PFW-1454 Send button to MMU on MMU SELFTEST FAILED screen
...
Fixes an issue where the button on the MMU error screen doesn't do anything
when MMU SELFTEST FAILED is rendered
2022-12-04 11:04:00 +00:00
6d62fb0d65
Merge pull request #3784 from DRracer/opt01
...
Optimize rendering MMU Error sensor line
2022-12-02 17:12:05 +00:00
3e976e04ca
Merge pull request #3777 from 3d-gussner/PFW-1431
...
PFW-1431: Add "PA Preheat"
2022-12-02 13:34:18 +01:00
54ef2a6c28
Merge pull request #3769 from 3d-gussner/MK3_Temp_model_cal_wizard
...
PFW-1434: MK3 Temp model calibration during wizard
2022-11-30 15:33:38 +01:00
1bbcdb0c0d
Merge pull request #3774 from 3d-gussner/MK3_Nozzle_change
...
PFW-1435 Nozzle change menu
2022-11-30 15:32:18 +01:00
0a6388cc56
Update internal translations
...
Fix G28 W
2022-11-30 15:01:24 +01:00
500131d51d
fullscreen message: use \n to force the next word on the next line
...
Useful for printing short URLs since those contain punctuation characters, which get treated at the end of a word under usual circumstances
2022-11-30 10:17:28 +01:00
8f44d1102c
Add PA preheat menu
2022-11-30 06:42:32 +01:00
23613c7eb1
optimisation: Stop print menu
...
There is no need to manually track the cursor position.
We can use the menu API:
MENU_BEGIN()
...
// menu items in between here
...
MENU_END()
Change in memory:
Flash: -116 bytes
SRAM: 0 bytes
2022-11-26 10:18:47 +00:00
a666c0f6f4
Optimize rendering MMU Error sensor line
...
CPUFLASH: -32B
2022-11-25 13:30:53 +01:00
83c9e946e4
Fix recursion
2022-11-24 16:15:51 +01:00
4f3c188017
Update internal translations
...
Fix typo
2022-11-24 10:53:04 +01:00
fea1520dfb
Fix & optimize FW version parsing and checking
...
PFW-1433
2022-11-23 13:34:13 +01:00
32673e1681
Nozzle change menu
2022-11-23 11:39:26 +01:00
2cd42f8433
Fix typo
...
Add Norwegian translations thanks to @OS-kar
2022-11-22 08:26:20 +01:00
c8157919b1
PFW-1440 Fix issue where cooldown timer is not set after a faile retry
2022-11-21 12:54:53 +01:00
37ac33bc32
Fix compiler warning
2022-11-21 12:54:53 +01:00
fe6e3ca2b1
Unload first before retrying
...
Should free the filament if accidentally held by the fsensor.
2022-11-20 19:23:07 +01:00
5639620041
Avoid watchdog while doing VerifyFilamentEnteredPTFE
2022-11-20 17:27:36 +01:00
84d9eee61d
Resume hotend temperature if parked + MMU restarted
...
PFW-1355
2022-11-20 17:27:36 +01:00
01c1f4a8dd
Load test: Monitor unload as well
2022-11-20 17:27:36 +01:00
5c8ea4c90a
fixup
2022-11-20 17:27:36 +01:00
327f0edb17
VerifyFilamentEnteredPTFE must take into account the Extra Loading Distance
2022-11-20 17:27:36 +01:00
c9d9ba0b1a
Add a bracket around subtraction, just in case
2022-11-20 17:27:36 +01:00
ef51b5778d
Fix VerifyFilamentEnteredPTFE
...
Test should push filament first and then retract.
2022-11-20 17:27:36 +01:00
aaebaf163f
Cleanup MSG_MMU_POWER_FAILS
2022-11-20 17:27:36 +01:00
a17153f877
Make TMC mask more readable
2022-11-20 17:27:36 +01:00
f1ed2fc5c7
Fix issue where tool_change_extruder is not reset after retry
2022-11-20 17:27:36 +01:00
541cd3ae94
Remove debug messages of Interrupted state
2022-11-20 17:27:36 +01:00
46f4f2658d
PFW-1432 Reduce LOC
...
If verification test fails, increment load fail statistic
2022-11-20 17:27:36 +01:00
03235c8aab
PFW-1432 restore toolchange load testing
2022-11-20 17:27:36 +01:00
adb24cd410
Increment errors in ReportError
2022-11-20 17:27:36 +01:00
4eaabbf092
Revive MMU stats + LCD screens
2022-11-20 17:27:36 +01:00
fe11b7a247
Tune Interrupted state based on unit tests
...
Now finally the printer can restart ToolChange if MMU restarted.
2022-11-20 17:27:36 +01:00
ffbd95b482
Unify naming convention (index->slot)
...
in all top level MMU-related functions
2022-11-20 17:27:36 +01:00
e414413b2e
Refactor ToolChange+LoadToNozzle
...
Add basic infrastructure for handling of repeated commands until they finish correctly.
2022-11-20 17:27:36 +01:00
10a9e0f0a0
Recover from MMU restart while performing a command
...
PFW-1427
2022-11-20 17:27:36 +01:00
603faddd25
Fix bug where toolchange counter is not rendered
2022-11-20 15:42:29 +00:00
5dc539cda5
fixup
2022-11-20 13:12:01 +01:00
62810c5a7c
optimisation: lcdui_print_extruder
...
Simplify the rendering to cover more scenarios:
"[nr.]>?"
"?>?"
Both of these indicate there is a bug in the firmware.
Currently these are not handled and result in the status screen being corrupted.
This is because we are trying to write a 3 digit number
where there is not space on the LCD for it.
Change in memory:
Flash: -52 bytes
SRAM: 0 bytes
2022-11-20 13:12:01 +01:00
281a217549
Update Temp Model messages
...
Deepl translate cs,de,es,fr,it,nl,pl
2022-11-20 10:49:46 +01:00
f2f54da5b0
Unhack selftest hack during wizard
2022-11-20 10:48:49 +01:00
d592586d94
cleanup: remove dead code lcd_adjust_z()
...
It's only used when MESH_BED_LEVELING is not defined. According to
the configuration files, all printers supported use MESH_BED_LEVELING.
So I think we are safe in removing this dead code.
2022-11-19 22:19:48 +00:00
411d1da3c8
Merge pull request #3763 from gudnimg/optimisation-float-conversions
...
optimisation: TCodes accepts `uint8_t` not `float`
2022-11-18 19:52:22 +00:00
58775b8b55
Change unsigned long to uint32_t
2022-11-18 14:50:07 +01:00
bda134a01e
Save a bit of RAM from CS
...
Do not store EEPROM_VERSION in ram
flash: -6
RAM: -2
2022-11-18 14:50:07 +01:00
ef83fefce1
More optimization
2022-11-18 14:50:07 +01:00
8f4ac82273
eeprom_init_default also returns the read/default value
2022-11-18 14:50:07 +01:00
b317786110
More configuration store savings
...
flash: -94B
RAM: 0B
2022-11-18 14:50:07 +01:00
b551bdae76
Some more CS improvements
...
flash: -2B
RAM: 0B
2022-11-18 14:50:07 +01:00
5305dbd299
Sheet name initialization improvements
...
The code looks better, but it takes a bit more flash. I prefer it like this
flash: +20B
ram: 0B
2022-11-18 14:50:07 +01:00
bba5385a61
Move string to progmem
...
flash: -84B
RAM: -4B
2022-11-18 14:50:07 +01:00
6edc71d0ae
Remove deprecated configs
2022-11-18 14:50:07 +01:00
dcc48c0052
Remove eeprom _int8t functions
...
flash: -48B
RAM: -4B
2022-11-18 14:50:07 +01:00
af60cd7d79
Optimize EEPROM_writeData and EEPROM_readData
...
flash: -162B
RAM: -4B
2022-11-18 14:50:07 +01:00
771f833a44
Implement eeprom dword functions
2022-11-18 14:50:07 +01:00
ca943cceec
Split the increment function into increment and add
...
No size difference since the compiler did a good job optimizing the inc argument (always 1 before).
2022-11-18 14:50:07 +01:00
455c29e78b
Optimize EEPROM usage/functions
2022-11-18 14:50:07 +01:00
414d3f1c12
Display Welcome message after MMU progress report ends
...
Should make the status line look cleaner when the printer is not printing.
2022-11-18 14:09:48 +01:00
c86c961d4e
M600: Fix bug where fan is not turned off
...
The firmware saves the current fanspeed before parking,
and the fanspeed is restored after unparking. The problem is the fan
was never actually paused.
Fixes #3670
2022-11-18 11:18:29 +01:00
b147fcee77
XYZ calibration fixes
2022-11-18 00:18:42 +01:00
384a6d1989
Fix wizard serial messages
2022-11-17 23:03:03 +01:00
30ec4e8b53
Inital Temp Model cal wizard
2022-11-17 15:19:35 +01:00
2096accc5f
Remove unused gcode level check code
...
This code was introduced with v3.8.0 but was always disabled.
I propose the code be removed since it has not been enabled
for 3 years since its introduction.
2022-11-17 08:05:27 +01:00
6059398004
Introduce MMU Error: INSPECT_FINDA (FINDA_FLICKERS)
2022-11-17 07:58:11 +01:00
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
Yuri D'Elia
Alex Voinea
3d-gussner
Guðni Már Gilbert
Alex Voinea
Yuri D'Elia
Panayiotis-git
Jakub Dolezal
D.R.racer