Guðni Már Gilbert
02676fc888
Limit scope of is_mmu_error_monitor_active
...
Move the variable to mmu2_reporting
Change in memory:
Flash: -6 bytes
SRAM: 0 bytes
2023-05-22 08:04:22 +02:00
Guðni Már Gilbert
1f9fc4ef3f
MMU: add UnloadInner and CutFilamentInner
...
Sync with the 32-bit side.
The ReportingRAII does not handle recursion.
Fixes an issue with the multiple calls to
BeginReport() and EndReport()
Change in memory:
Flash: +14 bytes
SRAM: 0 bytes
2023-05-22 08:00:42 +02:00
Guðni Már Gilbert
9d5453a41e
PFW-1520 Rename Load Filament menu to Preload to MMU
...
Change in memory:
Flash: +18 bytes
SRAM: 0 bytes
2023-05-22 07:53:26 +02:00
Guðni Már Gilbert
2391698419
errorCode should reflect the state of the MMU
...
If the protocol reports and error and give errorCode
a value. When the error is resolved, errorCode is not reset to OK.
If the MMU is not in an error state I would expect errorCode to reflect that.
This fixes MMUCurrentErrorCode()
Change in memory:
Flash: +12 bytes
SRAM: 0 bytes
2023-05-22 07:53:12 +02:00
3d-gussner
d20dc8256a
Merge pull request #4204 from gudnimg/ReportingRAII-opt
...
optimisation: always inline `ReportingRAII`
2023-05-19 19:44:41 +02:00
3d-gussner
d8ec526e67
Merge pull request #4200 from leptun/fix_stepper_inactivity_timeout
...
Fix stepper inactivity timeout
2023-05-15 10:34:39 +02:00
Guðni Már Gilbert
90322a7181
optimisation: always inline ReportingRAII
...
Tested on MK3S+ using the LCD.
Change in memory:
Flash: -80 bytes
SRAM: 0 bytes
2023-05-13 18:07:13 +00:00
Alex Voinea
0612a38885
Fix stepper inactivity timeout
2023-05-13 08:18:39 +02:00
3d-gussner
162f8b4cc8
Merge pull request #4180 from gudnimg/menu_draw_P-fix
...
Fix regression in `menu_draw_P`
2023-05-10 07:30:02 +02:00
3d-gussner
0c453b53cd
Merge pull request #4193 from gudnimg/unload-sequence-improvements
...
Fix unload sequence for users without MMU
2023-05-10 07:29:16 +02:00
Guðni Már Gilbert
3c79e77220
Create define for two hardcoded values
2023-05-08 19:50:51 +00:00
Guðni Már Gilbert
e24c2200f1
Set FILAMENTCHANGE_FINALRETRACT instead of hardcoded 0
2023-05-08 19:33:42 +00:00
3d-gussner
8d1abf772d
Merge pull request #4192 from gudnimg/PFW-1506
...
PFW-1506 Load to nozzle: Fix too short purge distance
2023-05-08 13:14:47 +02:00
3d-gussner
719d1704c2
Merge pull request #4188 from leptun/fix_missing_live_adjust_z_settings
...
Always allow Live Adjust Z in Settings
2023-05-08 12:57:08 +02:00
Guðni Már Gilbert
d781dae35b
Combine two moves since they have the same feedrate
...
Change in memory:
Flash: -60 bytes
SRAM: 0 bytes
2023-05-06 15:24:54 +00:00
Guðni Már Gilbert
71180ac284
Cleanup M600 init
...
Instead of removing FILAMENTCHANGE_FINALRETRACT
just set it to 0
No change in memory
2023-05-06 15:24:54 +00:00
Guðni Már Gilbert
8556336185
Fix unload sequence for users without MMU
...
Restores 3.12 sequence which was working well before.
M600 "L" parameter now works like M702 "U" parameter.
Removed a lot of the unused parameters which were copied
from Marlin 2.
Change in memory:
Flash: +96 bytes
2023-05-06 15:24:54 +00:00
Guðni Már Gilbert
dd9df36375
Load to nozzle: Fix too short purge distance
...
PFW-1506
Change in memory:
Flash: +8 bytes
SRAM: 0 bytes
2023-05-06 13:19:57 +00:00
Guðni Már Gilbert
462535ef7f
Restore 3.12 live Z-adjust menu behavior
...
Code size increases a bit but keep in mind the PR
that broke the behavior "saved" 182 bytes:
https://github.com/prusa3d/Prusa-Firmware/pull/4063
So I think this code size increase is OK
Change in memory:
Flash: +84 bytes
SRAM: 0 bytes
2023-05-06 12:08:06 +00:00
Alex Voinea
1d87789641
Always allow Live Adjust Z in Settings
2023-05-05 19:19:11 +00:00
Guðni Már Gilbert
570b360413
Fix menu_draw_P for negative values
...
The new code did not take into account the minus sign.
The template for menu_draw_P is removed since there is no benefit in
uint8_t version of this function since the value
is converted to two bytes anyway by lcd_printf_P.
Change in memory:
Flash: -92 bytes
SRAM: 0 bytes
2023-05-05 17:24:14 +00:00
3d-gussner
bf6c0919e1
Merge pull request #4166 from gudnimg/gudnimg-patch-1
...
M701/M702: Set default Z value to 0
2023-05-05 12:38:37 +02:00
3d-gussner
12d9070c03
Merge pull request #4181 from gudnimg/status-screen-feedrate
...
optimisation: only check feedrate if knob is rotated
2023-05-05 12:37:46 +02:00
3d-gussner
fd2184801f
Merge pull request #4168 from gudnimg/next_feedrate_remove
...
Cleanup: Remove `next_feedrate` from global scope
2023-05-05 12:36:04 +02:00
3d-gussner
427e88a406
Merge pull request #4175 from gudnimg/remove-LoadFilament
...
cleanup: Remove unused `LcdCommands` state `LoadFilament`
2023-05-05 12:34:49 +02:00
3d-gussner
bdd958fe5e
Merge pull request #4157 from leptun/menu_optimizations
...
Menu optimizations
2023-05-05 11:51:12 +02:00
3d-gussner
649f08f69f
Merge pull request #4178 from gudnimg/m600-dead-code
...
M600: remove dead code
2023-05-05 11:50:01 +02:00
3d-gussner
e3a57c9947
Merge pull request #4169 from 3d-gussner/MK3_TMcal_mid
...
Move nozzle to center during Thermal model cal.
2023-05-05 11:48:41 +02:00
3d-gussner
39c3e8a530
Merge pull request #4184 from gudnimg/feedrate-fix-3_13
...
Fix regression where time remaining can overflow on status screen
2023-05-05 11:45:58 +02:00
Guðni Már Gilbert
fc15f5a6ef
Select correct MMU slot in lcd_wizard_load
...
Change in memory:
Flash: +8 bytes
SRAM: 0 bytes
2023-05-02 22:38:54 +00:00
Guðni Már Gilbert
9cf1f7871e
Minor fix to M701 when MMU slot is out of range
...
If MMU slot is outside of range, then we rather the printer
not do anything. Currently it would accidentally assume
the MMU is disabled. This may have undesireable results.
No change in memory
2023-05-02 22:32:18 +00:00
Guðni Már Gilbert
5b75886a55
Fix regression where feedrate can overflow on status screen
...
If the remaining print time is more than 10.9 hours at 100%
then increasing the feedrate multiplier
to 101% or more will yield an unrealistic time due to overflow occuring.
Change in memory:
Flash +2 bytes
SRAM: 0 bytes
2023-05-01 12:48:21 +00:00
Guðni Már Gilbert
b3f52f95c7
optimisation: only check feedrate if knob is rotated
...
Guard the feedmultiply code with
lcd_encoder.
if lcd_encoder = 0, then there is no need to check if
feedmultiply should be updated.
Also set lcd_encoder to zero in one line to consume the rotation event.
Change in memory:
Flash: -40 bytes
SRAM: 0 bytes
2023-04-30 23:31:16 +00:00
Guðni Már Gilbert
92e5747469
M600: remove dead code
...
The if statement doesn't do anything useful
so I propose it be removed before 3.13 release
Change in memory:
Flash: -30 bytes
SRAM: 0 bytes
2023-04-29 23:43:27 +00:00
Guðni Már Gilbert
26369ac540
Restore old M701/M702 behavior
...
If the new Z parameter is not given,
assume that the old Z-lift behavior is desired.
Change in memory:
Flash: -28 bytes
SRAM: 0 bytes
2023-04-29 16:22:28 +00:00
Guðni Már Gilbert
0b34c6a695
cleanup: Remove unused LcdCommands state
...
This may help the compiler generate smaller code
Change in memory:
Flash: -2 bytes
SRAM: 0 bytes
2023-04-29 10:24:04 +00:00
Guðni Már Gilbert
d7127c44f1
Merge branch 'prusa3d:MK3' into gudnimg-patch-1
2023-04-28 19:10:56 +00:00
3d-gussner
e11555392e
Save some bytes.
...
Thanks to @leptun
2023-04-26 09:18:47 +02:00
3d-gussner
686f92b243
Move nozzle to center during Thermal model cal.
2023-04-25 20:41:17 +02:00
Guðni Már Gilbert
228250f050
Cleanup: Remove next_feedrate from global scope
...
No change in memory
2023-04-24 21:33:07 +00:00
Alex Voinea
a354aad762
Merge pull request #4167 from leptun/lcd_encoder_improvements
...
Lcd encoder improvements
2023-04-24 15:58:54 +02:00
3d-gussner
3692a24e44
Merge pull request #4165 from leptun/binary.h
...
Remove last <binary.h> dependencies
2023-04-24 14:51:36 +02:00
Alex Voinea
e662ef276e
Deduplicate temperature settings
...
Flash: -52B
SRAM: 0B
2023-04-24 11:56:53 +02:00
Alex Voinea
c83646743f
Deduplicate MMU settings
...
Flash: -58B
SRAM: 0B
2023-04-24 11:56:53 +02:00
Alex Voinea
4a2a89cb74
Remove stupid comments from older bad code
2023-04-24 11:56:53 +02:00
Alex Voinea
67f0fe0fce
Remove AUTOTEMP menu items
...
They are commented out and broken anyway
2023-04-24 11:56:53 +02:00
Alex Voinea
c339711025
Make the encrot table balanced
...
It won't change much. It is not possible to determine in which direction the encoder spun when two steps are made, so just use + or - 2.
2023-04-24 11:56:25 +02:00
Alex Voinea
32e68c33b4
lcd encoder: use lookup table
...
Also handle the scenario where the encoder moves two steps in a single lcd_buttons_update cycle.
Flash: -46B
SRAM: 0B
2023-04-24 11:56:13 +02:00
Alex Voinea
ea101f49d4
`lcd_buttons` is actually `lcd_click_trigger`
...
Flash: -4B
SRAM: 0B
2023-04-24 11:56:04 +02:00
Alex Voinea
dd16cf4525
Remove Binary.h include
2023-04-24 11:52:25 +02:00