bdd958fe5e
Merge pull request #4157 from leptun/menu_optimizations
...
Menu optimizations
2023-05-05 11:51:12 +02:00
649f08f69f
Merge pull request #4178 from gudnimg/m600-dead-code
...
M600: remove dead code
2023-05-05 11:50:01 +02:00
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
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
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
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
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
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
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
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
d7127c44f1
Merge branch 'prusa3d:MK3' into gudnimg-patch-1
2023-04-28 19:10:56 +00:00
e11555392e
Save some bytes.
...
Thanks to @leptun
2023-04-26 09:18:47 +02:00
686f92b243
Move nozzle to center during Thermal model cal.
2023-04-25 20:41:17 +02:00
228250f050
Cleanup: Remove next_feedrate from global scope
...
No change in memory
2023-04-24 21:33:07 +00:00
a354aad762
Merge pull request #4167 from leptun/lcd_encoder_improvements
...
Lcd encoder improvements
2023-04-24 15:58:54 +02:00
e662ef276e
Deduplicate temperature settings
...
Flash: -52B
SRAM: 0B
2023-04-24 11:56:53 +02:00
c83646743f
Deduplicate MMU settings
...
Flash: -58B
SRAM: 0B
2023-04-24 11:56:53 +02:00
4a2a89cb74
Remove stupid comments from older bad code
2023-04-24 11:56:53 +02:00
67f0fe0fce
Remove AUTOTEMP menu items
...
They are commented out and broken anyway
2023-04-24 11:56:53 +02:00
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
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
ea101f49d4
`lcd_buttons` is actually `lcd_click_trigger`
...
Flash: -4B
SRAM: 0B
2023-04-24 11:56:04 +02:00
dd16cf4525
Remove Binary.h include
2023-04-24 11:52:25 +02:00
78614f5670
M701/M702: Set default Z value to 0
...
Set default Z value to 0 to maintain backwards compatibility with older gcodes.
2023-04-24 09:09:43 +00:00
17e085040c
Add missing line to custom character
...
Shouldn't make a difference since the array is already defined as 8B long, but I just found it weird and surprising when I noticed only 7 lines were defined
2023-04-24 10:44:48 +02:00
548ed0eb31
Convert <binary.h> to native binary literals
2023-04-24 10:42:09 +02:00
5b7266fdf1
Don't render message when printer is idle
...
Guard the lcd_display_message_fullscreen_P call by blocks_queued(). If there are no planned moves, there is no need to render this message, it creates a weird LCD draw noticable by the user.
Change in memory:
Flash: +10 bytes
SRAM: 0 bytes
2023-04-23 12:25:10 +02:00
9de2cbfe8e
Fix an issue with crash_mode_switch toggling
...
Proposed changes
2023-04-23 12:25:10 +02:00
9272545deb
Dead code cleanup
2023-04-23 12:25:10 +02:00
02a0f6a35a
Correctly utilize the menu stack in the Mode select message
...
Flash: -34B
SRAM: 0B
2023-04-23 12:25:10 +02:00
6390b3b69b
Remove duplicate separator string
...
Flash: -14B
SRAM: 0B
2023-04-23 12:25:10 +02:00
62991c8e67
Fix issue where Tx gcode doesnt reset custom_message_type
...
We need to call BeginReport and EndReport
otherwise the SD filename is not shown when printing
This only affects single material MMU gcodes
Change in memory:
Flash: -4 bytes
SRAM: 0 bytes
2023-04-23 09:52:11 +00:00
5778e39687
Resync `lcd_encoder_diff` when clicking
...
Flash: +4B
SRAM: 0B
2023-04-23 10:07:52 +02:00
c037e6dfba
Use atomic block for accessing lcd_encoder_diff
...
There was still the possibility of lcd_encoder_diff being updated from the ISR while the new enc_diff was being computed.
Flash: +8B
SRAM: 0B
2023-04-23 09:58:56 +02:00
1f181a949a
Fix `lcd_encoder_diff` getting out of sync with the knob hard steps
...
Flash: +18B
SRAM: 0B
2023-04-23 09:48:09 +02:00
ee8b95b556
Merge pull request #4158 from gudnimg/remove-dead-code-gudni-e1e2
...
Cleanup: remove unused extruder macros
2023-04-23 09:26:26 +02:00
9662bb11d4
Merge pull request #4144 from gudnimg/double-feedback-bugs
...
Double feedback bugs
2023-04-23 09:14:01 +02:00
3509791943
Drop sound feedback in lcd_v2_calibration
...
Drop the sound feedback in lcd_v2_calibration
when switching to lcd_generic_preheat_menu
If a single filament setup (no MMU) has filament loaded, it will jump
immediately to lcd_generic_preheat_menu
this created double feedback.
Let's just drop the feedback since the transition
between menus is very fast.
Change in memory:
Flash: -8 bytes
2023-04-22 15:28:27 +00:00
b15beb25cc
Remove INVERT_E1_DIR and INVERT_E2_DIR from config
...
I think these should be removed from the configuration files
as these definitions don't do anything.
2023-04-22 15:15:21 +00:00
0cf0d40a2e
Remove checkAllHotends()
2023-04-22 15:15:21 +00:00
c7f0ee13be
Missed these macros disable_e1/2
2023-04-22 15:15:21 +00:00
25522d3d68
Remove unused Autofan extruder configs
2023-04-22 15:15:21 +00:00
c14332bfb2
Combine two ifdefs
2023-04-22 15:15:21 +00:00
327b5b230b
Remove soft_pwm_1 and soft_pwm_2
2023-04-22 15:15:21 +00:00
fcabcd2804
Remove TEMP_SENSOR_1 and TEMP_SENSOR_2
...
Hopefully I didn't miss anything
2023-04-22 15:15:21 +00:00
f539b40611
Remove more EXTRUDERS > 1 code
2023-04-22 15:15:21 +00:00
4935191335
Cleanup remove unused macros
...
enable_e1
enable_e2
disable_e1
disable_e2
The firmware doesn't support multiple extruders
No change in memory
2023-04-22 15:15:21 +00:00
7889d54cfd
Merge pull request #4160 from gudnimg/cleanup-tcode-description
...
Rewrite the Tcodes description
2023-04-22 14:43:33 +00:00
76a76de7ea
Rewrite the Tcodes description
...
The old description had typos and was a bit confusing for new users
The new text is a suggestion from David Buzek at Prusa Research
2023-04-22 14:27:01 +00:00
51da6065c8
Merge pull request #4159 from gudnimg/cleanup-gudni-comments
...
Remove random `//-//` comments
2023-04-22 13:53:13 +00:00
b8f8348e77
Fix double feedback in Z-offset menu
2023-04-22 15:53:06 +02:00
b6e228d5a5
Fix double feedback in First Layer Calibration
...
For MMU users: This happens when the user
selects a filament to load from 1 to 5
For non-MMU: this happens when clicking
the knob within 2 seconds.
Additionally fixed the code indendation
it was a mix of spaces and tabs
2023-04-22 15:53:06 +02:00
ccabf1fa31
Remove random //-// comments
2023-04-22 13:39:08 +00:00
e516d8a0c4
Merge pull request #4156 from leptun/lcd_status_screen_block
...
Fix `M0` click not consumed
2023-04-22 15:01:16 +02:00
4ce3fa53a1
Optimise M0/M1 code size
...
Replace two bool variables with one.
It's not obvious but (!hasP && !hasS) is equal to
!(hasP || hasS)
Note: expiration_time_set = hasP || hasS
Truth table:
|--------------------------------------------------|
| hasP| hasS| (!hasP && !hasS)| !(hasP || hasS) |
|------|-----|--------------------|-----------------|
| 0 | 0 | 1 | 1 |
| 0 | 1 | 0 | 0 |
| 1 | 0 | 0 | 0 |
| 1 | 1 | 0 | 0 |
|--------------------------------------------------|
Change in memory:
Flash: -36 bytes
SRAM: 0 bytes
2023-04-21 17:42:55 +00:00
360f234b98
Merge pull request #4146 from gudnimg/fan-check-opt
...
Reduce code size in fan check selftest
2023-04-21 14:24:04 +02:00
91b913e997
Fix `M0` click not consumed
...
Fix the need to click the knob twice to dismiss `M0`.
Flash: -54B
SRAM: -2B
2023-04-21 12:59:40 +02:00
2ad916a2c3
Fix manual fan check menu
...
lcd_encoder was not being updated
we need to call manage_inactivity
Tested on MK3S+
Change in memory:
Flash: +6 bytes
SRAM: 0 bytes
2023-04-19 15:41:36 +00:00
18c389543b
Fix lcd_update() FW crashes
...
Change in memory:
Flash: +10 bytes
SRAM: 0 bytes
2023-04-19 15:41:36 +00:00
20e73e3c4f
Merge pull request #4067 from scottmudge/MK3_3.12-meatpack-pr
...
Add support for g-code compression/packing over serial connection (MeatPack)
2023-04-19 09:20:07 +02:00
2dcaae80d5
Merge pull request #4027 from gudnimg/minor-optimisation-gudni
...
Many minor optimisations for 3.13/3.14
2023-04-17 21:27:48 +02:00
ea97ca7920
Use `EXTRUDERS` instead of hardcoded value in string
2023-04-17 21:12:59 +02:00
b67063f14a
Remove empty lines
2023-04-17 21:10:20 +02:00
43d41ddd2b
cleanup: static variables in Marlin_main.cpp
2023-04-16 23:23:31 +00:00
4b54cd1f30
Remove unused LoadingToNozzleRAII
...
The variable is not used anywhere.
Change in memory:
Flash: -14 bytes
SRAM: -1 byte
2023-04-16 17:23:28 +00:00
01df65882f
cleanup: remove commented code
2023-04-16 15:25:43 +00:00
f6135f2ed1
Enable Analog IR sensor again
2023-04-16 13:58:18 +00:00
f5b9d2ac2e
cleanup: Remove unused Developer define
2023-04-16 13:13:16 +00:00
2ed4a75894
cleanup: remove unused settings
2023-04-16 13:13:16 +00:00
559e1bb21a
Remove unused MMU configs
...
- MMU_IDLER_SENSOR_ATTEMPTS_NR
- MMU_REQUIRED_FW_BUILDNR
These are no longer used
2023-04-16 13:13:16 +00:00
9b6e1babcb
many more lcd_putc_at optimisations
...
Changes in
lcd_implementation_drawmenu_sdfile
and
lcd_implementation_drawmenu_sddirectory
seem to save the most.
Change in memory:
Flash: -72 bytes
SRAM: 0 bytes
2023-04-15 13:45:10 +00:00
dea7f2b26c
Resolve PR review
...
Initialise EEPROM_CHECK_MODE always
But if farm mode is detected, update the Check mode to Strict
Initialise EEPROM_NOZZLE_DIAMETER on farm mode.
When opening the menus this value is set automatically to
_Diameter_400 anyway so this should be fine.
No change in memory on Multilang build
2023-04-15 13:45:10 +00:00
9f66eceb29
optimisation: belt test new values
...
use lcd_print instead of lcd_printf_P
to print the number only
Tested on MK3S+
Change in memory:
Flash: -34 bytes
SRAM: 0 bytes
2023-04-15 13:45:10 +00:00
87e40f1cee
optimisation: lcd_putc_at in belt test
...
Change in memory:
Flash: -4 bytes
SRAM: 0 bytes
2023-04-15 13:45:10 +00:00
583c46a63f
Simplify two fan_check_error checks
...
There are only 3 possible values. No need to check for two of them
to rule of the last value. Instead simply check for the last value only.
Change in memory:
Flash: -16 bytes
SRAM: 0 bytes
2023-04-15 13:45:10 +00:00
b67c359129
Move fan_state to fancheck.cpp and make it static
...
No change in memory
2023-04-15 13:45:10 +00:00
ebdcfbec50
cleanup: tmc2130: make variables static where applicable
...
No change in memory
2023-04-15 13:45:10 +00:00
7c23d8b00c
cleanup: make cancel_heatup static in Marlin_main
2023-04-15 13:45:10 +00:00
d148c08991
Remove dead code from get_coordinates()
2023-04-15 13:45:10 +00:00
c7de1b1416
optimize get_coordinates() axis mask
2023-04-15 13:45:10 +00:00
ea7b395852
Remove useless parantheses
...
Found these a few months ago when I was trying some other optimization. Don't want to make a PR just for this, so I'll just slide it here in this existing PR.
2023-04-15 13:45:09 +00:00
d175dba669
optimisation: use expired_cont is specific places
...
!variable.running() || variable.expired()
is equal to
variable.expired_cont()
The latter required less flash memory
Change in memory:
Flash: -28 bytes
SRAM: 0 bytes
2023-04-15 13:45:09 +00:00
00ffab8f62
optimisation: combine if statements in Sensors menu
...
FINDA status is always 0 or 1
Change in memory:
Flash: -28 bytes
SRAM: 0 bytes
2023-04-15 13:45:09 +00:00
7ff514621c
cleanup: remove unused global variable
2023-04-15 13:45:09 +00:00
69b4696114
use lcd_puts_P instead of lcd_printf_P
...
Change in memory:
Flash: -8 bytes
SRAM: 0 bytes
2023-04-15 13:45:09 +00:00
66bb9bcfe4
optimisation: lcd_temp_cal_show_result
...
result is boolean so always update the EEPROM
Change in memory:
Flash: -20 bytes
SRAM: 0 bytes
2023-04-15 13:45:09 +00:00
bd796a2cb3
optimisation: more lcd_putc_at
...
Change in memory:
Flash: -18 bytes
SRAM: 0 bytes
2023-04-15 13:45:09 +00:00
70dadc4202
M115: Extruder count is always 1
...
Change in memory:
Flash: -8 bytes
SRAM: 0 bytes
2023-04-15 13:45:09 +00:00
62cbc829f6
optimisation: use new eeprom methods in check_printer_version()
...
Change in memory:
Flash: -48 bytes
SRAM: 0 bytes
2023-04-15 13:45:09 +00:00
cd8a22d6b3
optimisation: utils: don't initialise global variables
...
They will be set by fCheckModeInit() by reading from EEPROM
Change in memory:
Flash: -2 bytes
SRAM: -1 byte
2023-04-15 13:45:09 +00:00
7a8dfdae53
optimisation: use new EEPROM init method for fCheckModeInit
...
Change in memory:
Flash: -90 bytes
SRAM: 0 bytes
2023-04-15 13:45:09 +00:00
6aafbe69a8
cleanup: remove unused function declaration
2023-04-15 13:45:09 +00:00
6e02a082e2
cleanup: make heating_status_counter static
...
Change in memory:
Flash: 0 bytes
SRAM: 0 bytes
2023-04-15 13:45:09 +00:00
ab934f8ba5
optimisation: make clock_interval static and 1 byte
...
Change in memory:
Flash: -16 bytes
SRAM: -1 byte
2023-04-15 13:45:09 +00:00
66e629ba74
cleanup: remove unused variable FSensorStateMenu
2023-04-15 13:45:09 +00:00
3cd97a5e8f
optimsation: draw cursor and set position with one function
...
Change in memory:
Flash: -4 bytes
SRAM: 0 bytes
2023-04-15 13:45:08 +00:00
2120d17912
optimisation: simplify T-code response for single material
...
Extruder is always 0
Change in memory:
Flash: -12 bytes
SRAM: 0 bytes
2023-04-15 13:45:08 +00:00
420f745bed
optimisation: mmu: combine if statements
...
Change in memory:
Flash: -6 bytes
SRAM: 0 bytes
2023-04-15 13:45:08 +00:00
4d90ecbcc4
cleanup: remove ctype include
...
We don't use any function from this header
No change in code size
2023-04-15 13:45:08 +00:00
3dda8b5c00
optimise fan check selftest code
...
Tested on MK3S+
Change in memory:
Flash: -174 bytes
SRAM: 0 bytes
2023-04-15 11:11:16 +00:00
d6c81dab62
Fix manual fan check menu
...
lcd_encoder was not being updated
we need to call manage_inactivity
Tested on MK3S+
Change in memory:
Flash: +6 bytes
SRAM: 0 bytes
2023-04-15 10:59:58 +00:00
95acdba5fa
Fix lcd_update() FW crashes
...
Change in memory:
Flash: +10 bytes
SRAM: 0 bytes
2023-04-14 21:31:12 +00:00
f34c1ffeac
Fix an issue where visualisation is overwritten by SD file name
...
We should let EndReport set the custom message type state to Status
This will ensure the SD file name is shown correctly AFTER we've shown
the visualisation
Currently the visualisation is cut off in the middle by ReportProgressHook
Change in memory:
Flash: -6 bytes
SRAM: 0 bytes
2023-04-14 09:32:41 +02:00
4b3dc65598
Don't always set MSG_WELCOME at end of toolchange
...
This should only be set when NOT printing
Change in memory:
Flash: +8 bytes
SRAM: 0 bytes
2023-04-14 09:32:41 +02:00
41b8279805
Fix eeprom table addresses
2023-04-13 11:34:18 +02:00
af4a3f3328
Reorder eeprom reads
...
Saves 4B of flash
2023-04-13 11:15:17 +02:00
f333d36e47
Use a different location as a kill message pending flag
...
The old implementation would fail if the message was in progmem at address 0xffff or 0x0000 (both unlikely). It would also fail if the eeprom was initialized to some other random value, which could have been dangerous when displayed as a full screen message.
2023-04-13 10:57:00 +02:00
4b65d49512
Move kill check earlier during startup
2023-04-13 10:57:00 +02:00
2aca89d6dc
Update eeprom documentation
2023-04-13 10:57:00 +02:00
f388d8abb6
postponed kill() message with softReset
2023-04-13 10:57:00 +02:00
82343184e7
Merge pull request #4036 from gudnimg/optimise-mmu-silent-mode
...
optimisation: MMU silent mode toggling & init
2023-04-13 10:54:21 +02:00
193bce7f20
Merge pull request #4037 from gudnimg/optimisation-tmc2130-stuff
...
Optimisation: Disable M351 when using TMC2130 and code related to it
2023-04-13 10:54:08 +02:00
3cd125c566
MeatPack gcode compression support
2023-04-13 10:50:15 +02:00
3b9d1b8980
Merge pull request #4138 from gudnimg/menu-fixes-gudni
...
Fix broken editing menu
2023-04-13 10:16:19 +02:00
e4bedf0523
Merge pull request #4133 from gudnimg/xyzcal-opt
...
Reduce XYZ cal code size
2023-04-12 21:35:58 +02:00
6c6f98fb03
Merge pull request #4134 from gudnimg/tmc2130_home_exit-opt
...
tmc2130: simplify parsing axis mask
2023-04-12 21:35:46 +02:00
c16e7733e9
Merge pull request #4141 from gudnimg/double-feedback-xyz-cal-menu
...
menu: Fix an issue with feedback double triggering in XYZ cal menu on knob click
2023-04-12 21:29:24 +02:00
225999b79d
Remove redundant colon characters
...
The Edit menu already applies a colon to the label string
no need to render it twice.
Change in memory:
Flash: -4 bytes
SRAM: 0 bytes
2023-04-12 17:37:57 +00:00
b91941f354
Fix broken editing menu
...
- currentValue must be initialised when entering the menu
- Consume lcd_encoder value when editing an item
Change in memory:
Flash: +40 bytes
SRAM: 0 bytes
2023-04-12 17:37:56 +00:00
53e3193252
Fix bug with uint8_t not shown correctly on LCD
...
Change in memory:
Flash: +8 bytes
SRAM: 0 bytes
2023-04-12 17:37:23 +00:00
2fc810289a
Fix an issue with feedback double triggering in XYZ cal menu
...
The feedback is produced due to the user clicking the knob
the menu_goto call should therefore not trigger additional feedback when
switching between menus.
No change in memory
2023-04-12 16:46:33 +00:00
d688f6ec6f
Menu item code: optimize return
2023-04-10 15:29:58 +02:00
b735c3d040
optimisation: extract common code into SETTINGS_FANS_CHECK
...
Implement it as a function instead of preprocessor macro
this allows us to control inlining
Change in memory:
Flash: -34 bytes
SRAM: 0 bytes
2023-04-10 13:24:39 +02:00
9a1eb7b239
Prevent rendering of the remaining menu items if the menu is clicked
...
Also prevent clicking
2023-04-10 13:02:22 +02:00
d3d201730e
Do not return early if the menu item is clicked
...
Just let the menu draw till the end even if an item is clicked. The worst this can do is waste some clock cycles
flash: -1222B
ram: 0B
2023-04-10 13:02:22 +02:00
bfdef3af9f
Fix menu items optimizations when extracting to functions.
...
Properly increment menu_item when the menu item is clicked so that you don't get multiple menu items clicked if in view (when the menu code is deduplicated to functions)
2023-04-10 13:02:22 +02:00
339c080b19
tmc2130: optimize mask when iterating over axes
...
Change in memory:
Flash: -28 bytes
SRAM: 0 bytes
2023-04-09 17:49:28 +02:00
c4b4cbfc7b
Make the function static
2023-04-09 13:40:10 +00:00
afd4f1d5bc
Iterate over axis bits
2023-04-09 15:17:01 +02:00
4e31bb94ef
tmc2130: simplify parsing axis mask
...
There is no need to check if every axis bit with each for-loop
iteration. We just need to check if a given axit bit is set.
Change in memory:
Flash: -6 bytes
SRAM: 0 bytes
2023-04-09 13:12:22 +00:00
e70344dc94
Reduce XYZ cal code size
...
Change in memory:
Flash: -120 bytes
SRAM: 0 bytes
2023-04-09 12:23:42 +00:00
902780a929
Disable M351 when using TMC2130 and code related to it
...
Change in memory (MK3S+ multilang build)
Flash: -250 bytes
SRAM: 0 bytes
2023-04-07 21:07:26 +02:00
449e83c7ff
Fix filament autoloading
2023-04-07 10:36:44 +02:00
2a3e4cac75
Fix toggle menu items rendering
2023-04-07 09:35:31 +02:00
49096f14c3
SD menu do not consume click in _scrolling state
2023-04-07 09:11:49 +02:00
10ba758bf7
Fix menu encoder rotation
2023-04-06 21:35:30 +02:00
373fab883d
Fix fsensor runout conditions
...
And also reorder autoload and runout conditions
2023-04-06 10:37:29 +02:00
dfe6ea6470
Fixup after rebase
2023-04-06 07:44:16 +02:00
c16db4e607
Remove lcd_encoder clamp check
...
as proposed by @leptun
2023-04-06 07:44:16 +02:00
6d2a66c1e8
match menu_goto's encoder type to lcd_encoder type
...
Change in memory:
Flash: -20 bytes
SRAM: 0 bytes
2023-04-06 07:44:16 +02:00
4ca7f8ce2d
cleanup: drop lcd_encoder in _menu_edit_P
...
Taken from PR 3985 by adding currentValue infrastructure
Change in memory:
Flash: 0 bytes
SRAM: 0 bytes
2023-04-06 07:44:16 +02:00
062ea1cf25
optimisation: make lcd_encoder two bytes (int16_t)
...
lcd_encoder was int32_t (4 bytes) because of the menu code
when editing through the menus, the menus only accept
int16_t so it doesnt make sense to use int32_t.
Change in memory:
Flash: -892 bytes
SRAM: -2 bytes
2023-04-06 07:44:16 +02:00
c754c8dd5f
Remove menu code in favor of simplicity
...
This change needs to be approved of course due to it affecting UI
The affect UI is only one menu
lcd_settings_linearity_correction_menu
I doubt many users are using this menu except very advanced users.
I propose we delete the variant of menu_draw_P which was used for
uint8_t but renders them as floats.
Instead treat
uint8_t same as int16_t i.e. just render integers.
Keeping it simple :) Solve our fanSpeed problem.
Change in memory:
Flash: -140 bytes
SRAM: -2 bytes
2023-04-06 06:05:59 +02:00
876ea6c228
Change block buffer fan speed to one byte
...
It's only assigned to variables which are uint8_t
Change in memory:
Flash: -10 bytes
SRAM: -16 bytes
2023-04-06 06:05:59 +02:00
2ced00f21c
Convert fanSpeed and saved_fan_speed to uint8_t
...
These variables only range from 0 to 255
For the menus we currently need to convert fanSpeed to int16_t.
Change in memory:
Flash: -160 bytes
SRAM: -2 bytes
2023-04-06 06:05:59 +02:00
76a8c80ef0
Fix issue with size being wrong at runtime
...
Change in memory:
Flash: +40 bytes
SRAM: 0 bytes
2023-04-05 17:52:48 +02:00
7ad137e570
Add preheat_cmd into PROGMEM
...
Change in memory:
Flash: -30 bytes
SRAM: 0 bytes
2023-04-05 17:52:48 +02:00
5ef00fb78a
Reduce code size in first layer calibration
...
Pull out common enqueuing loop into one function
Change in memory:
Flash: -70 bytes
SRAM: 0 bytes
2023-04-05 17:52:48 +02:00
5b04812017
Eliminate subtraction in print time statistic
...
Change in memory:
Flash: -20 bytes
SRAM: 0 bytes
2023-04-05 11:16:54 +02:00
ee39cb4e90
remove one global variable
2023-04-05 11:16:54 +02:00
768319f1e7
optimisation: cleanup print statistics
...
Change in memory:
Flash: -104 bytes
SRAM: 0 bytes
2023-04-05 11:16:54 +02:00
b9717b03e7
Make bFilament variables static and move to top of file
2023-04-05 11:16:14 +02:00
68d902c4e1
Take FilamentAction as parameter
...
Change in memory:
Flash: -28 bytes
SRAM: 0 bytes
2023-04-05 11:16:14 +02:00
210bbe9764
Remove dead code
2023-04-05 11:16:14 +02:00
301b2e4384
Optimisation: Move filAutoLoad to ultralcd
...
We can reuse preheat_or_continue() function
Change in memory:
Flash: -22 bytes
SRAM: 0 bytes
2023-04-05 11:16:14 +02:00
1b9379b328
PSU_DELTA alternative
2023-04-05 11:12:17 +02:00
ffc34edf4c
Pull in changes from PR 4080
...
Additionally make lcd_encoder_bits static
since it's not used outside the ISR context
2023-04-05 10:30:59 +02:00
a7e9ccfb57
Major refactoring
...
Fixes all the issues I've found so far.
Roughly 60B of flash saved. Need to double check that later.
2023-04-05 10:30:59 +02:00
d89e6de040
Update lcd_encoder in lcd_update
...
This fixes the spurious feedback when rotating the knob
because lcd_update is called much often than the interval
at which the lcd rendering is updated
Change in memory
Flash: -88 bytes
SRAM: -9 bytes
2023-04-05 10:30:59 +02:00
67c206ea5c
Remove menu_back_if_clicked_fb
...
Since feedback is always produced on knob click
we can use menu_back_if_clicked instead
Change in memory:
Flash: -18 bytes
SRAM: 0 bytes
2023-04-05 10:30:59 +02:00
0cac7612db
optimisation: Always make sound when knob is clicked or rotated
...
This commit adds the ability for firmware to make sounds when the
knob is clicked or rotated, when LCD updates are disabled.
The improvement here is the sound is being made with one line of code
whether or not LCD updates are enabled or disabled.
Change in memory:
Flash: -24 bytes
SRAM: 0 bytes
2023-04-05 10:30:59 +02:00
7de725f840
G80: Change 'correction' data type to int8_t
...
Valid values range from -100 to 100. Storing this value as four bytes
(int32_t) is not efficient.
Instead we can store G80 user input temporarily as int32_t and check
if the value is within the allowed range. If it is, then we convert the
int32_t (4 bytes) to int8_t (1 byte).
Change in memory:
Flash: -78 bytes
SRAM: 0 bytes
2023-04-05 10:13:27 +02:00
956efde822
G80: Re-implement optimisation from user espr14
...
Original Pull Request:
https://github.com/prusa3d/Prusa-Firmware/pull/3061
Change in memory:
Flash: -292 bytes
SRAM: 0 bytes
2023-04-05 10:13:27 +02:00
7f921b4071
Limit some of the float formatting to fit 30 bytes buffer in enquecommandf_P
2023-04-05 09:10:39 +02:00
b9ce7637df
Rename enquecommandf() into enquecommandf_P()
2023-04-05 09:10:39 +02:00
7e119f733f
Implement variant of enquecommand which accepts format string
...
This eliminates many local buffers
Change in memory:
Flash: -450 bytes
SRAM: 0 bytes
2023-04-05 09:10:39 +02:00
687c14808a
optimisation: MMU silent mode toggling & init
...
Change in memory:
Flash: -16 bytes
SRAM: -2 bytes
2023-04-04 17:07:55 +00:00
4cf46893fc
Revert "Fix a few ambiguous overloaded calls"
...
This reverts commit b7c42e83cf
2023-04-04 16:12:41 +02:00
46852e9941
M862: determine decimal through math rather than checking for null byte/pointer.
...
This way doesn't add any more flash memory.
Calculating the string length or checking for a null byte
will end up increasing flash consumption overall.
2023-04-04 15:22:21 +02:00
478627b6bc
Simplify parsing M862
...
This gets rid of float conversion.
We just need to check the 6th character when M862 is detected. This
character gives us the digit after the dot.
Change in memory:
Flash: -20 bytes
SRAM: 0 bytes
2023-04-04 15:22:21 +02:00
b9fecab239
Reduce calls to __divsf3 when calculating feedrate
...
For non-time critical code it is more effcient to call a function
rather inlining each division operation.
Change in memory:
Flash: -122 bytes
SRAM: 0 bytes
2023-04-04 15:16:56 +02:00
65750b9a4c
accel is uint32_t, drop float in comparsion
...
Change in memory:
Flash: -24 bytes
SRAM: 0 bytes
2023-04-04 15:11:29 +02:00
c0e21563e7
planner: optimise acceleration limits
...
Rename acceleration_st to acceleration_steps_per_s2 to be same as Marlin 2
Store the accelerator in local variable accel
while we are performing the limit checks.
When limit checks are done we can assign
the block it's acceleration. Especially
block->acceleration_steps_per_s2 is now only written to once, instead of direcly in the limit checks.
Change in memory:
Flash: -118 bytes
SRAM: 0 bytes
2023-04-04 15:11:29 +02:00
a1234b3670
Merge pull request #4122 from leptun/mmu2_fix_ptfe_check_distance
...
Fix MMU2_CHECK_FILAMENT_PRESENCE_EXTRUSION_LENGTH for MMU2
2023-04-04 15:04:58 +02:00
b7c42e83cf
Fix a few ambiguous overloaded calls
...
Noticed this when exploring another optimisation
By specification exactly which overloaded function to use
we save some memory
Seems to have something to do with doing arithmetic in the function argument
Change in memory:
Flash: -156 bytes
SRAM: 0 bytes
2023-04-04 15:03:48 +02:00
3b049a1b91
Merge pull request #4111 from gudnimg/E-cool-gudni
...
Fix clicking noise during Toolchange when E-cool mode is enabled
2023-04-04 15:03:37 +02:00
eb3421f0f2
Merge pull request #4021 from gudnimg/cleanup_crashdet_detected
...
cleanup: remove unnecessary LCD update in `crashdet_detected()`
2023-04-04 14:58:30 +02:00
91ad87b5a7
Merge pull request #4096 from gudnimg/msg-btn-more-translation
...
Remove `MSG_BTN_MORE` from translation list
2023-04-04 14:57:30 +02:00
3e4592b7fd
Don't duplicate silent mode menu
...
Create a common function for the menu
This saves a lot of memory and 50 lines of code!
Change in memory:
Flash: -110 bytes
SRAM: 0 bytes
2023-04-04 14:47:45 +02:00
ebf8b16df5
Fix MMU2_CHECK_FILAMENT_PRESENCE_EXTRUSION_LENGTH for MMU2
2023-04-02 11:35:17 +02:00
5be4504fea
Re-use G28 W string in PROGMEM
...
Change in memory:
Flash: -12 bytes
SRAM: 0 bytes
2023-03-27 18:14:28 +00:00
138654e207
Add comment
...
Note we cannot use too long extrusions
2023-03-26 09:16:07 +00:00
4342217159
Add comment about planner_aborted = false
2023-03-26 09:00:34 +00:00
6bdc3c5cfb
Improve MMU toolchange when E-cool mode is enabled
...
Currently we are queuing many small 2 mm E-moves until the filament
sensor triggers. We do this because we never abort any queued moves,
so making small 2 mm moves ensures we do not move the E-motor more than
2 mm past the filament sensor.
Unfortunately, when E-cool mode is enabled, the E-motor will create
audible clicking sounds (similar one hears during jam or a loose grub
screw). A workaround for this is to queue one or more very long moves.
Where very long is something of the order of hundreds of millimeters. I
have it set to 350 mm but it's just a random constant really. Keep in
mind the firmware will block too large E-moves, if I recall correctly
it was anything above > 450 mm (see PREVENT_LENGTHY_EXTRUDE)
In order to use very long moves, we must somehow stop the E-motor from
moving once the filament sensor triggers. In other words, throw away
what's left of the current E-motor move. For this simple purpose we can
use planner_abort_hard() but we must set planner_aborted to false
afterwards because the code architecture does not allow the main loop()
to run until the Toolchange command is done processing.
Change in memory:
Flash: +18 bytes
SRAM: 0 bytes
2023-03-26 08:57:59 +00:00
6dbf35f6e6
Merge pull request #4062 from gudnimg/cleanup_move_planned
...
remove duplicate function in planner
2023-03-24 14:06:19 +01:00
34ec1ff190
Merge pull request #4098 from gudnimg/PFW-1515
...
PFW-1515 Fix an issue with Thermal Anomaly message
2023-03-24 14:04:21 +01:00
6959b372ec
Merge pull request #4063 from gudnimg/PFW-1503
...
PFW-1503 Improve live Z babystep menu handling
2023-03-24 14:01:15 +01:00
b9103a113c
Merge pull request #4102 from 3d-gussner/MK3_fix_Hbed_MMULoadingTest
...
Fix HBed on Load for MMU Loading test
2023-03-24 13:59:58 +01:00
4feacfe822
Merge pull request #4093 from gudnimg/Restore-default-M701-M702-Z-lift
...
Restore previous Z-lift in M701/M702 + other PROGMEM optimisations
2023-03-24 13:59:47 +01:00
7e0bf88431
Use `G28 W` only
2023-03-22 12:30:16 +01:00
5536873eca
Fix HBed on Load for MMU Loading test
2023-03-22 09:50:59 +01:00
c5fc1168ed
PFW-1515 Fix an issue with Thermal Anomaly message
...
Issue introduced with PFW-1504
Change in memory:
Flash: +40 bytes
SRAM: 0 bytes
2023-03-20 20:35:49 +00:00
178c1f4aa6
Header cleanup
2023-03-20 13:57:20 +00:00
e2b58d8724
Don't translate the more button
2023-03-19 16:50:42 +00:00
5643d16c01
cleanup: remove redundant lcd_update in cashdet_detected
...
There is no need to repeat:
lcd_update_enable(true);
lcd_update(2);
Also lcd_clear() is redundant because lcd_update(2) will clear the LCD
Change in memory:
Flash: -16 bytes
SRAM: 0 bytes
2023-03-18 19:52:08 +00:00
bc27b71729
Pull one common G1 gcode into PROGMEM
...
Change in memory:
Flash: -32 bytes
SRAM: 0 bytes
2023-03-18 17:37:27 +00:00
f296b3f826
G21 is not implemented, don't queue it
...
It's just a single 'break', will likely not be implemented
Change in memory:
Flash: -6 bytes
SRAM: 0 bytes
2023-03-18 17:23:01 +00:00
6edd8b0719
Add M220 into PROGMEM
...
Change in memory:
Flash: -10 bytes
SRAM: 0 bytes
2023-03-18 17:09:43 +00:00
00515a975d
Add M107 into PROGMEM
...
Change in memory:
Flash: -4 bytes
SRAM: 0 bytes
2023-03-18 17:05:35 +00:00
5ade1716bf
Add M500 into PROGMEM
...
Change in memory:
Flash: -6 bytes
SRAM: 0 bytes
2023-03-18 17:01:59 +00:00
733bc874fb
Move G28W0 to messages
...
No change in memory
2023-03-18 16:48:30 +00:00
466a6a8fc3
Add M600 into PROGMEM
...
Change in memory:
Flash: -10 bytes
SRAM: 0 bytes
2023-03-18 16:33:13 +00:00
129cc18cbf
Add M23 %s into PROGMEM
...
Change in memory:
Flash: -14 bytes
SRAM: 0 bytes
2023-03-18 16:18:05 +00:00
7c0ead7bc2
Add M24 into PROGMEM
...
Change in memory:
Flash: -8 bytes
SRAM: 0 bytes
2023-03-18 16:15:10 +00:00
5f8fc64a32
Restore previous Z-lift in M701/M702
...
Previously when the firmware called M701/M702 manually
there was no Z lift. But after we added support for the Z
parameter we set the default to 50mm.
Change strings "M701" to "M701 Z0" and "M702" to "M702 Z0"
to restore the previous behavior from before 3.13.
Also pulled the gcodes into PROGMEM in message.cpp
along with M83 and M84 to save memory.
Change in memory:
Flash: -34 bytes
SRAM: 0 bytes
2023-03-18 15:34:47 +00:00
942021cb2b
PFW-1503 Fix an issue where the menu is dismissed in First layer calibraiton
...
When the extruder lifts up after completing the Purge line,
the baby stepping is not allowed for a short time. This dismisses
the menu. We don't want this behavior, so only apply the Z-axis requirement
when printing.
Change in memory:
Flash: +8 bytes
SRAM: 0 bytes
2023-03-18 12:47:40 +00:00
e40d8ebbcc
Implement printJobOngoing()
...
This makes the if statments a little bit more readable
Change in memory:
Flash: -88 bytes
SRAM: 0 bytes
2023-03-18 12:18:43 +00:00
561d8599d2
PFW-1503 drop {} for consistency
2023-03-18 11:56:06 +00:00
59314a41c1
PFW-1503 only allow babystepping on the first couple of layers
...
Change in memory:
Flash: +28 bytes
SRAM: 0 bytes
2023-03-18 11:56:06 +00:00
09d918ce5d
PFW-1503 Change BABYSTEP_ALLOWED to babystep_allowed
...
I initially started with a preprocessor macro
called BABYSTEP_ALLOWED, but now it is a function.
It more common to use lower case for function names
2023-03-18 11:56:06 +00:00
bb614f669d
PFW-1503 Add additional check
...
Add lcd_commands_type == LcdCommands::Layer1Cal
just in case blocks_queued() is 0 for one instant between
lcd_command steps
Change in memory:
Flash: +8 bytes
SRAM: 0 bytes
2023-03-18 11:56:06 +00:00
bc2366cd8d
PFW-1503 Improve live Z babystep menu handling
...
Fixes an issue with running first layer calibration twice in a row.
Improvements:
Now the Z baby step menu closes automatically when first layer calibration is done.
No need to wait for a timeout or close the menu manually by setting a variable
If the baby stepping menu is open, and suddenly
the printer enters a state where baby stepping
is not allowed.
The printer will save the last value before closing the menu.
When LcdCommands != Idle, don't dismiss
the Z baby step menu. This saves 20B
Change in memory:
Flash: -130 bytes
SRAM: 0 bytes
2023-03-18 11:56:05 +00:00
5c010a3aaa
PFW-1509 Fix an issue with unload when nozzle is cold
...
Change in memory:
Flash: -2 bytes
SRAM: 0 bytes
2023-03-18 10:43:23 +00:00
c3235386a1
Bump up commit number
2023-03-15 07:52:01 +01:00
8b49d241d2
revert BTN_MORE non-translated
2023-03-15 07:03:41 +01:00
00309f42c3
Bump up fw version
...
6508 from t3.13.0-BETA1
+50 commits
+1 for this commit
+1 for merge
2023-03-14 15:18:13 +01:00
3fe2f25c9f
Disable reading MMU register 0x21
...
It has proven to be too unreliable and may confuse end users.
2023-03-14 15:12:50 +01:00
68b4a8a6cb
Last minute changes need a revert of the fw bump up
2023-03-14 11:22:43 +01:00
e87e1630e2
Bump up version
...
t3.13.0-BETA1 commit nr 6508
+46 commits between
+1 commit for this PR
+1 commit for the merge
=6556
2023-03-14 09:09:38 +01:00
e951a106d6
Messages fit to pages
2023-03-14 08:56:46 +01:00
8604c93ccc
Shorten messages as users will contact support anyway
2023-03-14 08:32:16 +01:00
616cf61583
Revert
2023-03-14 08:31:21 +01:00
22e70faa71
Remove `MMU2` and `MMU unit` messages
...
Saves 26byte of flash
Saves -368 byte in trasnlations
2023-03-14 08:30:15 +01:00
7676df88a4
Rename forgotten `MMU2` message to `MMU`
2023-03-14 08:30:03 +01:00
235c4ae943
Do not `MSG_BTN_MORE` translate
2023-03-14 08:26:39 +01:00
9721a87ef2
Raname `MMU2` message to `MMU` as everywhere
2023-03-14 08:24:50 +01:00
03778226ca
Remove `Select Extruder:` message
...
Post fix PR4064 for update.po*.py scripts
2023-03-14 08:24:12 +01:00
93598ef00d
Change some messages to be max three rows instead of two
...
Yes|No are now located at the 4th row and so messages can
use three rows. This should allow improvement in some translations.
2023-03-14 08:23:40 +01:00
ebf94c572f
PFW-1504 Minor optimisation
...
Change in memory:
Flash: -4 bytes
SRAM: 0 bytes
2023-03-13 06:47:08 +01:00
42878341af
PFW-1504 More correct solution to the pixel count issue
...
The fact that the relationship between
machine position and pixel index is not linear
means we cannot simply rely on comparing
the previous position to the next machine position. i.e derivative of E_AXIS
Because around the max amplitude of the triangle wave
the slope will suddenly change sign and will create a deadzone
which has width 2*mm_per_pixel.
For MMU2S this is ~10mm (or two pixels).
Instead we should split the moves.
And only plan the 2nd move once we're
at the top of the triangle wave. That way we don't really care about the position delta.
Now we just calculate the current y(x)
position relative to current position and divide by mm_per_pixel.
If there is a delta measured with unit 'pixel' then that means
its time to render the next pixel.
This solution seems to work well so far on my end.
Change in memory:
Flash: +2 bytes
SRAM: 0 bytes
2023-03-13 06:47:08 +01:00
b5e323e67c
PFW-1504 rename length_step_mm to mm_per_pixel
...
Its more descriptive
2023-03-13 06:47:08 +01:00
9865d4a38a
PFW-1504 Add precision error
...
This fixes an issue where sometimes
not all 20 pixels are rendered.
It is better to render 1 too many pixels (sometimes), rather than rendering too few.
Change in memory:
Flash: +18 bytes
SRAM: 0 bytes
2023-03-13 06:47:08 +01:00
f2157c6f1d
Fixup
...
We're always setting the cursor position when rendering now
Saves 8 bytes of flash
2023-03-13 06:47:08 +01:00
c518bfdb73
PFW-1504 Set cursor position each time to be safe
...
Change in memory:
Flash: +18 bytes
SRAM: 0 bytes
2023-03-13 06:47:08 +01:00
59e1ac0396
PFW-1504 implement stepper_get_machine_position_E_mm()
...
This function should be used when reading the current machine
position while a move is ongoing
No change in memory
2023-03-13 06:47:08 +01:00
690d83a94a
fixup
2023-03-13 06:47:08 +01:00
9145c8f59f
PFW-1504 too much?
...
I'm not happy with the current solution, I think we can improve it
by using the fact that this is a triangle wave. Need to think about it.
2023-03-13 06:47:08 +01:00
73c76579af
PFW-1504 Add init for progress bar
...
In case we are running a retry, the firmware
should clear the old rendering before
starting on a new one
Change in memory:
Flash: +6 bytes
SRAM: 0 bytes
2023-03-13 06:47:08 +01:00
51f1aa14a5
PFW-1504 Update last position as quickly as possible
...
0.1mm extrusion may happen while updating the LCD
No change in memory
2023-03-13 06:47:08 +01:00
bbfc4b9f78
PFW-1504 initial commit
...
Change in memory:
Flash: +162 bytes
SRAM: 0 bytes
2023-03-13 06:47:08 +01:00
04d440a9c8
Fix AutoLoad filament menu not shown when FSensor is [Off] ( #4072 )
...
Fix AutoLoad filament menu not shown when FSensor if [Off]
2023-03-10 14:23:56 +01:00
ba41b2bb0b
Fix M706 lcd message stuck
2023-03-09 07:00:40 +01:00
e787111922
Add MMU error code: MCU_UNDERVOLTAGE_VCC ( #4069 )
...
+ read bandgap voltage periodically
+ correct wording of ERR_ELECTRICAL_MCU_UNDERVOLTAGE_VCC (as requested in Prusa-Error-Codes PR#81)
2023-03-08 15:42:25 +01:00
a20a7232a8
Change "Extruder N" to "Filament N"
...
Change in memory:
Flash: -52 bytes
SRAM: 0 bytes
2023-03-06 10:26:12 +01:00
0b261ad4de
remove duplicate function in planner
...
moves_planned() should be used instead
No change in memory
2023-03-03 21:11:16 +00:00
03280c48d5
Merge pull request #4059 from gudnimg/planner-opt-subtraction
...
planner: calculate step difference once
2023-03-03 14:42:47 +01:00
474d489c39
Merge pull request #4033 from gudnimg/improve-preheat-target
...
preheat: improve target temperature threshold
2023-03-03 14:41:58 +01:00
bc818636b0
Increase MMU FW version to 2.1.8
...
in relation to MMU-218
2023-03-02 19:58:00 +01:00
d487254806
planner: calculate step difference once
...
Change in memory:
Flash:-158 bytes
SRAM: 0 bytes
2023-03-01 22:28:08 +00:00
13f7ba81ff
Cleanup, share more M914/5/FORCE code
2023-02-25 15:49:15 -05:00
3d-gussner
Guðni Már Gilbert
Alex Voinea
Scott Mudge
D.R.racer
DRracer
vintagepc