36c6b323c4
Set `Is filament loaded? Yes|No` default to `No` without a timeout.
2023-02-20 16:31:23 +01:00
791b9b4d39
Merge pull request #4028 from DRracer/pr3322-updated
...
Merge duplicate strings in cmdqueue.cpp
2023-02-20 13:51:09 +01:00
496b52b819
preheat: sync temperature threshold in M600 and Wizard
...
* M600 used 1°C threshold, which may increase the waiting time a bit
* Wizard used 3°C
Sync both to use TEMP_HYSTERESIS for consistancy
No change in memory footprint
2023-02-19 13:23:31 +00:00
6ad126ef0b
optimisation: preheat menu always uses integers for target temperature
...
Let's drop the float comparison since it not needed
Change in memory:
Flash : -16 bytes
SRAM: 0 bytes
2023-02-19 13:21:30 +00:00
319fec47f0
preheat: improve target temperature threshold
...
Use 5°C threshold to be consistant with other parts
of the firmware.
Relying on 95% of the target temperature creates
a dependency on the temperature:
PLA: Target = 215°C, threshold = 10.75°C
PETG: Target = 230°C, threshold = 11.5°C
ABS: Target = 255°C, threshold = 12.75°C
ASA: Target =260°C, threshold = 13.0°C
PC: Target = 275°C, threshold = 13.75°C
My proposal is we instead use a constant
TEMP_HYSTERESIS = 5, which is consistent with
M109, and behavior when restoring print from RAM
and some of the MMU code (like unload function)
Change in memory:
Flash: +2 bytes
SRAM: 0 bytes
2023-02-19 12:59:58 +00:00
db878c9996
backlight: always allow backlight to dim/wake
...
This commit adds the ability for the firmware to dim and wake the
backlight when LCD updates are disabled. Such as in the MMU error screen
or when rendering full screen messages which typically
disable the LCD updates to prevent the status screen from rendering.
Fixes #2777
Change in memory:
Flash: -26 bytes
SRAM: +1 byte
2023-02-18 17:08:35 +00:00
5cd60636f9
Add missing translations + shorten to 16 chars
2023-02-18 17:39:30 +01:00
98e7c15928
Change Eject filament -> Eject from MMU
...
PFW-1497
2023-02-18 17:39:30 +01:00
05662a5c0a
optimsation: reduce code size in LCD rendering
...
Change in memory (MK3S+ Multilang):
Flash: -62 bytes
SRAM: -6 bytes
2023-02-18 16:32:08 +01:00
074057c110
Fix an issue where LCD freezes during loading test
...
It may be useful to view the Sensors menu
while the toolchange loading test is taking
place. For example to see if the reading is flickering
The firmware needs to call lcd_update(0) to update the screen rendering.
Change in memory:
Flash: -2 bytes
SRAM: 0 bytes
2023-02-18 13:16:40 +01:00
555e766296
optimisation: only update mm when i > 0
...
Change in memory:
Flash: -24 bytes
SRAM: 0 bytes
2023-02-18 12:39:44 +01:00
e41b6d106d
optimisation: use more string from PROGMEM
...
Change in memory:
Flash: -10 bytes
SRAM: 0 bytes
2023-02-18 12:39:44 +01:00
9f4a7adb9a
optimisation: extract common M861 code
...
Change in memory:
Flash: -128 bytes
SRAM: 0 bytes
2023-02-18 12:39:44 +01:00
ee23d6c62a
Merge duplicate strings in cmdqueue.cpp
...
Original idea from @GilesBathgate, PR #3322 . This is just a rework on top of current MK3 branch.
2023-02-18 11:37:48 +01:00
3381bf2f7e
Merge pull request #2201 from vintagepc/2091_2153_sheet_Mcode
...
Add M850 code for setting sheet label and offsets
2023-02-17 15:12:22 +01:00
1b3fa8bfe9
TM: Move headers to support the legacy build system
2023-02-17 15:01:59 +01:00
a8f219259a
TM: Split default model parameters into a separate header
...
Preparation to support multiple default model parameter sets
2023-02-17 15:01:59 +01:00
d1ff728e4f
TM: future-proofing for incompatible model upgrades
...
Introduce a model version. This is initialized at "1" and doesn't
require any upgrade/downgrade checks since it's currently
retro-compatible.
2023-02-17 15:01:59 +01:00
9bd03cedb9
TM: Fix UV identity
2023-02-17 15:01:59 +01:00
ddf5147f9f
TM: Optimize temp_model_set_lag
...
Save about 20 bytes by rewriting the sample count check
2023-02-17 15:01:59 +01:00
b676d395e3
TM: Handle L/TEMP_MODEL_LAG
2023-02-17 15:01:59 +01:00
0bf6a5bc4b
TM: Handle UV (PTC loss)
...
Model UV as power-invariant, so that scaling P doesn't change the
intercept location (that is, the zero point remains at the same
temperature even for more powerful heaters).
NOTE: It's not clear to me whether this is generally true (couldn't
find a datasheet from the same heater in diffent power variants
showing the efficiency loss)
2023-02-17 15:01:59 +01:00
ba96c8d457
TM: Handle D/TEMP_MODEL_fS
2023-02-17 15:01:59 +01:00
eb88b720ac
TM: Handle UVDL set/load/report/upgrade
...
- Expose TEMP_MODEL_fS and TEMP_MODEL_LAG as D and L respectively,
initializing the default values based on the previous hard-coded
values.
- Always round L to the effective sample lag to future-proof model
upgrades or changes (the stored value _is_ the effective value).
- Introduce UV as a new linear term for PTC heaters, defaulting
to an identity for model backward-compatibility.
2023-02-17 15:01:59 +01:00
38b1e64687
TM: Allocate new eeprom parameters for PTC handling
2023-02-17 15:01:59 +01:00
235ce62cd3
Update Marlin_main.cpp
...
Remove more stale code
2023-02-17 08:58:17 -05:00
032d5ebe5b
Update Marlin_main.cpp
...
Fix use of removed function
2023-02-17 08:31:27 -05:00
d0e0b51497
Optimisation: lcd_commands "M702 C" should be "M702"
...
Change in memory:
Flash: -2 bytes
SRAM: 0 bytes
2023-02-17 14:30:20 +01:00
952b1af60b
Consistent use of noinline attribute
2023-02-17 14:30:20 +01:00
754b2d03c3
Remove extraneous line added during merge conflict resolution
2023-02-17 14:30:20 +01:00
25f9728e09
Add noinline attribute to count_e
2023-02-17 14:30:20 +01:00
620b19bbab
Roll up lay1cal_square loops
2023-02-17 14:30:20 +01:00
f92d2279d5
Re-use duplicated strings
2023-02-17 14:30:20 +01:00
8129a14f19
Move layer calibration finish commands into first_layer_cal.cpp
2023-02-17 14:30:20 +01:00
39160bc4ae
Free up some progmem
2023-02-17 14:30:20 +01:00
568eec5ee0
Implement first layer cal with calculated extrusion widths
2023-02-17 14:30:20 +01:00
20eef890a6
Merge branch 'MK3' into 2091_2153_sheet_Mcode
2023-02-17 08:24:49 -05:00
9b64d122dc
Disable MMU2S by default
...
On printers without the MMU no error screen should occur and no attempts of communication with the MMU should be performed -> EEPROM_MMU_ENABLED should default to 0.
PFW-1418
2023-02-17 12:53:07 +01:00
6745b2c766
Shorten Reset MMU button to fit LCD
...
Button strings are limited to 8 characters
2023-02-13 07:08:54 +01:00
b63f5433df
Don't show Pause/Stop menus while processing T-codes
...
PFW-1449
Change in memory:
Flash: +18 bytes
SRAM: +1 bytes
2023-02-12 15:58:07 +01:00
504099bd6c
optimisation: reduce code size in rendering cursor
...
Change in memory:
Flash: -62 bytes
SRAM: 0 bytes
2023-02-11 19:06:14 +01:00
c51aa10087
optimisation: spooljoin: use new eeprom init method
...
Change in memory:
Flash: -40 bytes
SRAM: -1 byte
2023-02-11 15:58:07 +01:00
982b1bb4bd
optimisation: backlight: use new eeprom_init function
...
Change in memory:
Flash: -56 bytes
SRAM: 0 bytes
2023-02-11 15:56:46 +01:00
c2a952cee5
optimisation: sound: use new eeprom_init function
...
Change in memory:
Flash: -18 bytes
SRAM: 0 bytes
2023-02-11 15:56:46 +01:00
8794ab2f71
respect Once sound mode
...
Change in memory:
Flash: +4 bytes
SRAM: 0 bytes
2023-02-11 15:54:33 +01:00
96fc90c80b
Revert a change in the MMU error screen logic
...
We can pull this code into a common function in a separate PR
2023-02-11 15:54:33 +01:00
5b4bc8bcdb
Tune louder beeps to match previous M600 behavior
2023-02-11 15:54:33 +01:00
b4f9f6d0b5
fixup: make sure to start the timer
...
Change in memory:
Flash: +10 bytes
SRAM: 0 bytes
2023-02-11 15:54:33 +01:00
8db2fbc97f
Improve sound handling for MMU error screen
...
Change in memory:
Flash: -174 bytes
SRAM: +4 bytes
2023-02-11 15:54:33 +01:00
e34faee389
optimisation: don't inline Sound_MakeCustom
...
Change in memory:
Flash: -32 bytes
SRAM: 0 bytes
2023-02-11 12:42:47 +01:00
7799853a05
optimisation: remove duplicate code
...
Sound_MakeCustom should play the sound
if critical = true OR the sound is not Silent
Change in memory:
Flash: -16 bytes
SRAM: 0 bytes
2023-02-11 12:42:47 +01:00
c826ae989f
Remove Done button on FINDA-related MMU error screens
...
Follows the requirements from Prusa-Error-Codes yaml definition.
Saves a fwe bytes as well as the button switch() statement got simplified.
PFW-1494
2023-02-10 14:38:18 +01:00
8b1b632164
Fix copy/paste typo thanks to @gudnimg
2023-02-10 14:35:36 +01:00
4f8dbb19fd
Fix `M862.x` LCD messages
...
As the new menue adds a Yes/No option the messages
need to be limited to c=20 r=3
Updated/shortened all translations
2023-02-10 14:35:36 +01:00
b02e8d9961
Fix First layer cal being stored without confirming with knob
2023-02-10 14:34:16 +01:00
c3cfc86094
Fix #3977
2023-02-10 14:27:04 +01:00
d403d58b19
TM: Do not emit an "error:" on the serial for recoverable errors
...
Use "echo:" for thermal model error reporting to avoid octoprint
automatically sending a M112 kill.
Keep using "error:" instead for other thermal errors (MAXTEMP/etc).
This should allow resuming a thermal mode pause with the default
octoprint settings.
2023-02-10 14:24:50 +01:00
ea7e717204
Cleanup: Remove various dead code
2023-02-10 08:17:36 +01:00
ca978080c4
Change to Thermal model
...
Add prusa.io/tm-cal link
and update all TM related translations
2023-02-08 15:36:59 +01:00
26126906ef
Hardcode expected MMU FW version into the error message v2
...
This is an 80% solution to PFW-1488 which should be somewhat compatible with the existing languages/translations infrastructure.
I don't see a point in extending the infrastructure a great deal to support some compile-time replacement in order to patch just MSG_DESC_FW_UPDATE_NEEDED.
Related PR: https://github.com/prusa3d/Prusa-Firmware/pull/3993
2023-02-08 10:50:33 +01:00
99761bdff7
optimisation: re-use adjust_bed_reset()
...
Move the code into eeprom.cpp since we're only working with EEPROM
Change in memory:
Flash: -42 bytes
SRAM: 0 bytes
2023-02-08 08:01:55 +01:00
3ddc2cf86d
Add ResetMMU and DisableMMU buttons to specific error screens
...
- MMU not responding/Communication error: add DisableMMU
- MMU FW update needed: add ResetMMU
Flash: +8B
RAM: +0B
2023-02-08 06:48:11 +01:00
296b0414af
Optimize execute_extruder_sequence
...
Save 64B by refactoring of execute_extruder_sequence.
2023-02-08 06:47:50 +01:00
e34ed479ef
PFW-831 Add single buzzer beep when an MMU error screen is shown for the first time
...
If the user has the sound settings set to 'Silent' then this beep should be silent
Change in memory:
Flash: +4 bytes
SRAM: 0 bytes
2023-02-06 08:35:08 +01:00
b28aa6f42a
PFW-1471 Rename 'Toolchange count' to 'Material changes'
...
Added the string to our message so it can be translated
Change in memory:
Flash: -10 bytes
SRAM: 0 bytes
2023-02-06 08:33:40 +01:00
ba34661b62
Fixup after rebase onto MK3
2023-02-01 08:28:23 +01:00
d66e2b66c2
Cleanup: use setTargetHotend consistently for one extruder
...
Main changes:
* setAllTargetHotends() is removed
* setTargetHotendSafe() is removed
* Extruder parameter on setTargetHotend() is dropped
Change in memory:
Flash: -192 bytes
SRAM: 0 bytes
2023-02-01 08:28:23 +01:00
ed80defc2c
Shorten the Try-Load-Unload sequence
...
... and allow easier future tweking in case of need
Also, save ~30B of code by returning the previous E-motor position.
2023-02-01 06:38:19 +01:00
e597be2cb5
PFW-1381 Optimise initialisation
...
Change in memory:
Flash: -2 bytes
SRAM: -1 byte
2023-01-31 10:02:15 +01:00
a35e7d543f
Fix bug with button choice on MMU error screen isn't reset
...
PFW-1381
2023-01-31 10:02:15 +01:00
d2f3835b2c
Fixup after review
2023-01-31 09:35:22 +01:00
8720602b0e
Fix an issue with corrupt serial messages
2023-01-31 09:35:22 +01:00
43ae2c78e5
Fix cmake build
2023-01-31 09:35:22 +01:00
528abcb8d8
clang-format
2023-01-31 09:35:22 +01:00
0555376502
Refactor mmu2.cpp and related interfaces
...
The general idea is to keep platform specific implementation away from the MMU state machines as much as we can.
That would enable unit testing the top level MMU state machine and integration into other project as well (if needed).
2023-01-31 09:35:22 +01:00
e39f2d132e
TM: Check for PC parameters more carefully
2023-01-27 14:57:59 +01:00
216b935488
Minor typo
2023-01-26 12:20:43 +01:00
05cd50e2ef
Update M214 description with link to RepRap wiki
2023-01-26 12:20:43 +01:00
da63d73585
optimisation: don't print floats with lcd_print()
...
Change in memory:
Flash: -442 bytes
SRAM: 0 bytes
2023-01-25 18:21:22 +00:00
a5f7f1d735
optimisation: change index from uint32_t to uint8_t
...
Change in memory:
Flash: -152 bytes
SRAM: 0 bytes
2023-01-25 18:21:22 +00:00
8c4cd11ae0
Cleanup: remove code_value_float()
...
The function adds a bit of overhead compared to code_value()
I suspect this function is a relic of the past.
Change in memory:
Flash: -82 bytes
SRAM: 0 bytes
2023-01-25 16:51:10 +00:00
17e6f1b75e
optimisation: remove conv2str.cpp
...
Change in memory:
Flash: -288 bytes
SRAM: -8 bytes
2023-01-25 06:28:00 +00:00
79a10868fe
cleanup: FILWIDTH_PIN doesn't exist
...
raw_filwidth_value variable is never used
2023-01-24 19:41:45 +00:00
7b163cf464
Merge pull request #3936 from wavexx/tm_cal_htemp
...
TM: Do not restrict autotune temperature
2023-01-24 14:20:55 +01:00
fab4165f4a
Merge pull request #3920 from wavexx/selftest_ok_alert
...
wizard: Do no set "Self test OK" as an alert message
2023-01-24 14:16:44 +01:00
1f54dfd0b2
Merge pull request #3941 from wavexx/tm_wizard_nowarn
...
wizard: Disable TM warnings during calibration
2023-01-24 14:15:04 +01:00
53fb4c3e3f
Move altfan eeprom initialization to extruder_altfan_detect()
...
flash: -16B
RAM: 0B
2023-01-23 19:47:03 +00:00
7245c76094
Fix an issue where Altfan Override setting in EEPROM is not respected at boot-up
2023-01-23 19:47:03 +00:00
c9f3a4cfce
wizard: Disable TM warnings during calibration
...
During calibration model warnings are possible/normal. This is
apparently leading some into thinking the hotend might be faulty
and abort the calibration with a hard reset.
Disable warnings/beeps during calibration.
Rely on the error threshold only.
2023-01-23 16:52:27 +01:00
679208b29e
TM: Do not restrict autotune temperature
...
Fix a wrong type that prevents running TM autotune at temps >127
2023-01-20 19:18:19 +01:00
39f9979655
optimisation: Combine if statement in M600
...
Change in memory:
Flash: -52 bytes
SRAM: 0 bytes
2023-01-18 09:44:27 +01:00
6298722f9a
Disable E-motor before the MMU starts doing something
...
It may seem counterintuitive to disable the E-motor, but it gets enabled in the planner whenever the E-motor is to move.
The idea behind disbling the E-motor when it won't be needed for some time is to save power and lower the heat of the motor.
Therefore it is especially important to disable the motor before the printer pauses a print due to some MMU error screen.
2023-01-18 09:42:57 +01:00
0c352ac2d1
Disable M47 if TMC2130 drivers are used
...
flash: -126B
RAM: 0B
2023-01-17 20:37:27 +01:00
d83c0f6c40
Fix an issue with indexing PROGMEM pointer
...
Using array index 'pointer[index]' doesn't work properly.
Instead using "pointer + index" works fine.
No change in memory footprint
2023-01-16 12:36:57 +01:00
9416310f7e
optimisation: move row_offsets into PROGMEM
...
Change in memory:
Flash: -42 bytes
SRAM: -4 bytes
2023-01-16 12:36:57 +01:00
eeb5f3d50c
optimisation: refactor menu_draw_P()
...
Add a way to only change the LCD column
Change in memory:
Flash: -90 bytes
SRAM: 0 bytes
2023-01-16 12:36:57 +01:00
730bb3708e
Fix an issue with menu_draw_item_puts_P
...
Change in memory:
Flash: +16 bytes
SRAM: 0 bytes
2023-01-16 12:36:57 +01:00
4f4153175c
Refactor menu_draw_toggle_puts_P
...
The refactoring drops the local buffer lineStr
Change in memory:
Flash: -106 bytes
SRAM: 0 bytes
2023-01-16 12:36:57 +01:00
cc08b938b7
Optimisations: implement lcd_print_pad_P()
...
Used lcd_print_pad_P is some obvious places. We can probably use
this function in more places to further save flash memory
Change in memory:
Flash: -268 bytes
SRAM: 0 bytes
2023-01-16 12:36:57 +01:00
16a89b9215
wizard: Return to status after calibration
2023-01-16 11:38:56 +01:00
3d-gussner
Guðni Már Gilbert
D.R.racer
Yuri D'Elia
vintagepc
Giles Bathgate
RoboMagus
Alex Voinea