31a6270f69
Abuse \n in lcd printing instead of constantly calling other functions
...
"other functions" being lcd_set_cursor and lcd_print(char). Saves 100B of flash
2021-01-22 20:12:11 +02:00
4d3f056b81
Fix factory reset menu rendering
2021-01-22 20:07:27 +02:00
37c431abd9
another lcd_puts_at_P
2021-01-22 19:44:46 +02:00
3ccd1b2b2b
Refactor lcd_set_cursor + lcd_puts_P -> lcd_puts_at_P
...
saves considerable amount of flash
2021-01-22 18:34:47 +01:00
da21916473
Change printf_P without format arguments and NL to puts_P only
2021-01-22 18:56:05 +02:00
9b34789398
Cleanup reset_menu()
2021-01-22 17:54:44 +01:00
c710253cca
Code cleanup and size reduction and RAM optimization
...
Replase single character strings with single characters when calling
lcd_print
2021-01-22 17:11:51 +01:00
9b847715ac
Rename F0 to FRM on the status screen
2021-01-19 13:11:25 +02:00
3f5cfc4e61
Move the change filament button to the main menu when farm printing
...
PFW-945
2021-01-19 13:06:23 +02:00
a9d8ddc89c
Farmers' requests 1
...
- remove the UI and related stuff to setting a farm number (the
communication protocol must remain intact)
- remove confirmation after print finished ("Print OK")
Both requests are highly welcome, since they allow for lowering the code
size by >1KB
PFW-963, PFW-927
2021-01-19 09:58:02 +01:00
4728bf2182
Merge pull request #2875 from wavexx/raise_while_preheating
...
Raise Z while preheating when auto/[un]loading the filament
2021-01-11 07:45:54 +01:00
ef51652e39
Merge pull request #1758 from wavexx/disable_filament_checks_in_extr_menu
...
Disable filament checks inside the Move -> Extruder menu
2021-01-11 07:42:25 +01:00
8a083c9970
Add PVB preheat and 0.8mm nozzle presets
...
minor features reflecting the latest announcement
Needs some 300B of CPU flash though, after 3.9.3 we need to optimize code
size again.
2021-01-08 13:52:39 +01:00
5c3513a6cc
Merge pull request #2397 from odaki/flashair_display_ip
...
Show the FlashAir IP address
2021-01-08 12:20:12 +01:00
0ed6b537a8
Merge branch 'MK3' into MK3_3.9.3
2021-01-07 13:27:51 +01:00
76eb743139
Set default SuperPINDA toggle on MK2.5/S to NO
2020-12-23 20:59:33 +01:00
4b510fef0a
Add PINDA_TEMP_COMP variable to enable SuperPINDA toggle menu/function
2020-12-23 20:59:08 +01:00
732b6e0cad
Cleanup
2020-12-23 20:58:20 +01:00
62c36f718b
Add SuperPINDA support for MK2.5/S
...
- Changed DETECT_SUPERPINDA to SUPERPINDA_SUPPORT as on miniRAMo the thermistor readings below 30°C
aren't accurate egnough to determine if SUPERPINDA is connected or not
- Add LCD toggle menu Settings -> HW Setup -> SuperPINDA [Yes/No] to overwrite SuperPINDA detection
- If EEPROM_PINDA_TEMP_COMPENSTATION is empty = 0xff then detect SuperPINDA by checking thermistor
- If EEPROM_PINDA_TEMP_COMPENSTAION is 0 then forec enable for temperature compensation menues and functions
- If EEPROM_PINDA_TEMP_COMPENSATION is 1 then force disable for temperature compensation menues and functions
2020-12-23 20:56:50 +01:00
f3953d7c83
Merge branch 'MK3' into MK3_random_patches
2020-11-16 09:11:12 +02:00
c0070506fb
Merge branch 'MK3' into flashair_display_ip
2020-11-13 22:28:22 +09:00
807eddafb0
Remove debugging code
2020-11-13 12:12:18 +02:00
43ace00a24
Fill the progress bar at the end and code optimizations
2020-11-12 18:43:48 +02:00
5ad125cbed
Merge branch 'MK3' into MK3_filecheck_progress_bar
2020-11-12 15:53:33 +02:00
4abf1f436a
Gracefully dump the queue + fixes to fancheck
2020-11-09 21:49:56 +02:00
5f23474c95
Raise Z while preheating when auto/[un]loading the filament
...
Preheating already raised Z to avoid scorching the PEI sheet, as does
filament loading/unloading to allow for excess material to be removed.
However, when loading/autoloading/unloading via the LCD with a cold
nozzle the preheating menu is performed before the carriage is raised,
leaving the carriage close to the sheet while heating the nozzle.
Pre-raise the carriage already while waiting, so that the subsequent
move is automagically skipped.
Set bFilamentWaitingFlag only once to perform both the LCD
initialization and raising to the appropriate height.
Should fix #2761
2020-10-28 20:49:28 +01:00
a84d7ef8d6
corectino of declaration
2020-10-13 16:56:57 +02:00
c8c7563e8a
LCD status changed
...
When the lcd status changed it will be printed "LCD status changed" to serial line.
2020-10-07 17:44:17 +02:00
ebc987bd23
Merge branch 'MK3' into flashair_display_ip
2020-09-28 21:19:44 +09:00
ef0840f587
Merge pull request #2786 from leptun/MK3_M115_Capabilities_report
...
Printer Capabilities framework + Macros + Code cleanup
2020-09-23 08:37:03 +02:00
e24466f22e
Merge pull request #2837 from prusa3d/MK3_3.9.1
...
Merge MK3_3.9.1 into MK3
2020-09-22 10:43:59 +02:00
4c7100985e
Merge branch 'MK3_3.9.1' into flashair_display_ip
2020-09-22 11:59:05 +09:00
bd7bb5acb3
Update new messages and their translations ( #2835 )
...
* Add missing translations
* Add missing CZ and IT translations
* Update CZ, FR, IT, ES translations
CZ thanks to @DRracer
FR thanks to Carlin Dcustom
ES tried myself
IT thanks to @wavexx
Only missing is PL
* Improve wording +change keys
* Add missing PL translations
* Fix copy paste error in Italian
fix double translations
* Make PL translation shorter
* Fix some length issues and capital letters
* Fixed again translations length issues
updated po files
* Update FR translation - thanks @awenelo
* Fix execution of lang-check.py
- Make lang-check.py executable
- Execute directly instead of specifying the python interpreter manually
("python" is no longer available on Debian, and would default to
version 2 prior to that despite being written for python 3)
* Fix permissions of translation files
Co-authored-by: D.R.racer <drracer@drracer.eu>
Co-authored-by: Yuri D'Elia <wavexx@thregr.org>
2020-09-18 16:50:25 +02:00
2f5083daa7
quickfix to mistake made in the experimental menu visibility code
...
Fix indentation
2020-09-15 18:56:39 +03:00
6bc59197ad
Merge branch 'MK3' into MK3_NEW_SD_COMPILATION
2020-09-12 08:28:13 +03:00
c3abd4ffe6
Remove io_atmega2560.h and some more macros
2020-09-11 17:43:38 +03:00
a2db9e8f6b
Merge pull request #2585 from leptun/MK3_FEEDRATE
...
🐛 ♻️ Update the feedrate percentage before drawing the screen
2020-09-09 08:56:46 +02:00
772844678f
Merge pull request #2809 from leptun/PFW-1134-ALTFAN_KILLSWITCH
...
Pfw 1134
2020-08-20 15:42:03 +02:00
96435ad084
Move experimental menu to HW setup
2020-08-12 08:48:12 +03:00
d0eca4d5c4
Merge pull request #2794 from leptun/PFW-1134-ALTFAN_KILLSWITCH
...
Minor documentation fixes to altfan PR
2020-08-06 12:53:34 +02:00
f1a8657093
Minor documentation fixes
...
Add even more comments
a
2020-08-06 12:20:38 +03:00
22a8c18551
Merge pull request #2784 from leptun/PFW-1134-ALTFAN_KILLSWITCH
...
altfan killswitch
2020-08-06 08:15:42 +02:00
654a3a0d79
Other requested changes
2020-08-04 10:43:30 +03:00
a8ce9358e5
Avoid redundant temperature error strings
...
Factor-out MIN/MAXTEMP [BED/AMB] out of the error message, which is now
built at runtime instead.
Introduce two missing ultralcd functions lcd_setalertstatus and
lcd_updatestatus to handle regular strings.
246272 -> 246084 = 188 bytes saved
2020-08-01 17:47:42 +02:00
773c6997ef
Add comments
2020-07-29 17:36:03 +03:00
ec6a20971e
Add experimental menu to HW_setup
2020-07-29 11:23:24 +03:00
a95feb56d9
ALTFAN override
2020-07-20 19:35:25 +03:00
d53c55ce64
Disable filament checks inside the Move -> Extruder menu
2020-06-24 16:10:32 +02:00
45e182911d
Merge pull request #2748 from mkbel/detect_superpinda
...
Detect superPINDA PFW-1107
2020-06-16 14:07:12 +02:00
23cc22bc22
Move has_temperature_compensation() into temperature.cpp.
...
No change in FLASH usage.
2020-06-16 00:41:21 +02:00
bdf53387b1
Disable temperature compensation and temperature calibration menu if superPINDA is detected.
...
Even though functionality was added, 20B of flash memory has been saved.
2020-06-16 00:19:06 +02:00
bbe9e3b4ea
Remove temp_cal_active variable.
...
This saves 18B of FLASH and 1B of RAM memory. This variable was duplicate to EEPROM variable of the same name.
2020-06-11 20:00:55 +02:00
fca4015667
Remove st_current_init() call from lcd_temp_calibration_set().
...
There is no known purpose of this call.
lcd_temp_calibration_set() is switching on/off pinda temperature compensation from LCD settings menu (this is called "Temp. cal." on LCD).
st_current_init() does nothing on Einsy board, it enables and sets motor current selecting outputs on Rambo board (it used to be called digipot in history)
2020-06-11 19:38:40 +02:00
f6df3f2394
Unused function warning fix.
...
(cherry picked from commit 54e2b6a829
2020-06-08 15:04:26 +02:00
183b102b6c
Document the RPM condition
2020-06-05 16:37:21 +02:00
1bf5635459
Trigger fan error during selftest for altfan
2020-06-05 17:17:33 +03:00
7e41524101
PC-blend preheat temperatures #define typo
...
A typo slipped through in PR#2711, not even the compiler caught it
(obviously, it is #define to be stringized):
PCB_PREHEAT... -> PC_PREHEAT
2020-06-03 18:05:37 +02:00
fe72ba7a9d
Add PC-blend preheat preset
2020-06-03 17:45:55 +02:00
d1865fc59a
MK3s IR sensor improvement ( #2698 )
...
* Update EEPROM_FSENSOR_PCB documentation
* Update IR sensor check
* Rename IR messags and add UNKNOWN state
* Update code to use new messages
* To be continued
* Move fsensor related things from ultralcd.h to fsensor.h
* Use defined Thresholds
* IR sensor auto detection "0.3 or older" and "0.4 or newer" when trigger status changes.
Typo fixes
Doxygen documentation
* Cleanup spaces
* Revert PF-build.sh changes
* re-add space in messages
* revert doxygen snytax
* Remove double _Undef
* Fix indentation and doxygen syntax
* Fix indentation
* Better message handling
* Fix indentation
* Fix indentation
* More indentation fixwa
* Extract common code into manage_inactivity_IR_ANALOG_Check
Saves ~60B of code
* Revert indentation changes on fsensor.cpp
* Keep the selftest IR sensor part disabled
Everything shall happen at runtime
* Fix indentation fsensor_update
* Fix another misleading indentation in fsensor_update
Co-authored-by: Alex Voinea <voinea.dragos.alexandru@gmail.com>
Co-authored-by: D.R.racer <drracer@drracer.eu>
2020-06-03 16:14:56 +02:00
751f810dd7
ALTFAN implementation ( #2692 )
...
* ALTFAN implementation
* Use CRITICAL_SECTION macros
* Use uint16_t instead of unsigned int
* Add forgotten CRITICAL_SECTION
* Documentation
2020-06-01 17:58:15 +02:00
eb44ee0f57
Code size optimization: 2KB down ( #2687 )
...
* Combine repeated calls into functions with much less parameters -> 2KB
down.
* Save some bytes by removing unnecessary 1-character strings: "x" -> 'x'
used in SERIAL_xxx printing macros.
This is also saves some CPU cycles
* Fix compilation for MK25S and MK3
* Copy surrounding indentation
* Fix compilation for a rare HW setup
* rename mesh_planXX_buffer_line back to mesh_plan_buffer_line
* Remove active_extruder from remaining plan_buffer_line_destinationXYZE
calls and one more fix of indentation
2020-06-01 17:51:28 +02:00
3d979a88a5
Merge remote-tracking branch 'upstream/MK3' into flashair_display_ip
2020-05-20 12:37:07 +09:00
b1a83c8add
Merge branch 'MK3' into MK3_NEW_SD_COMPILATION
2020-05-19 16:37:47 +03:00
deff8dcfde
MK3 3 9 0 missing translations ( #2646 )
...
* Add and update missing translations
- updated in Firmware/ files the missing `c=xx` column and `r=yy` rows.
- added missing translations to lang/lang_en*.txt
Everyone is developing and adding messages to serial and especially to LCD PLEASE add `//// c=xx` or `//// c=xx r=yy` comments.
Preparing translations files without that information is a pain in the ... and takes way more time for somebody else
to review to code as it would take you.
* No need to have `MSG_abcde` again in comments `////` in `messages.c`
* German translation
* Missed a space
* Use the same format as somewhere else
* French translation.
I am not a native French speaking person, so please excuse my mistakes I may have done.
* Spanish translation.
I am not a native Spanish speaking person, so please excuse my mistakes I may have done.
* CZ translation
* Fix typos
* Another fix
It is
Dimmwert and not Dim Wert
* Fix issues reported by `lang-check.py`
* Add "difficult" messages containing `%`
* Updated MSG and German translation
* removed a translation as it breaks the language selection
* No need to wait until any-key is pressed
* No need to wait any-key is pressed
* Fixed two LF issues
* Updated PO files
ready to be send to translators
* Add missing italian translations
* Improve some existing italian translations
* More italian fixes
* More italian fixes
* Add exceptions in editorconfig for po files to avoid recoding
* Fix typo
Thanks @DRracer for pointing out
* Italian translation by @wavexx
* Update po/new/*.po files
* Update after merging MK3 branch
* Update French translation and some c=xx comments
Big thanks to @awenelo @carlin57 for helping with the french translations and their comments.
* Update po files after French translation
* Fixed most `lang-check.py` reported translation errors for Czech and German.
Two Czech have to be reviewed as these are too long.
One German is correct as it is shown in c=20 r=2 but is 1 char longer than this to split the message.
One German translation seams to be to long but have to review the actual max length
* Fix `lang-check.py` Spanish translation errors
There have been quite lot TOO long messages,
Can't imagine that nobody every complained about that.
* Fix `lang-check.py` Italian translations errors
* Update not_tran and not_used files after fixing several translations
* Some more error fixes and update of `po` files
* Polish translation
* Czech updated
* Fix typo
* no need to translate `\x00` if it is the same
* Polish: Runouts->Koniec
* Polish: Runouts->Konce f ... hopefully the last change
* Added MK2.5/s auto power mode to eeprom doxygen
* Final updates.
- Compiled all versions with multi-languages
- Compiled all versions with EN_ONLY
- updated all /lang/po/Firmware*.* files
* Add crlf attributes for po files
As done for editorconfig, this similarly forces git to handle
po files consistently in DOS format.
* Further improvent of IT translations
* Updated translation
Added cleanup to PF-build.sh
* remove lang/not_tran* and lang/not_used mistakenly added into the PR
Co-authored-by: DRracer <drracer@seznam.cz>
Co-authored-by: Yuri D'Elia <wavexx@thregr.org>
Co-authored-by: D.R.racer <drracer@drracer.eu>
2020-05-12 22:23:40 +02:00
127a1790bc
Set unknown IR sensor after factory reset as 0.3 or older
2020-05-12 20:15:02 +02:00
dfd60a843d
Merge remote-tracking branch 'upstream/MK3' into flashair_display_ip
2020-05-10 10:25:13 +09:00
7079606df3
Merge pull request #2639 from wavexx/la15_adj_threshold
...
Adjustable Linear Advance limits and thresholds
2020-05-06 15:37:30 +02:00
5082f2a36e
Move reset LA state from G80 to M84
...
Move la10c_reset into finishAndDisableStepper, which is called in both
via lcd_print_stop() and indirectly via M84, saving some space.
M84 is checked-for to determine a complete file, so it's a superior
candidate to G80 (which some people avoid due to MBL issues).
2020-04-29 22:51:23 +02:00
a1254b3a3c
Merge branch 'MK3_3.9.0' into flashair_display_ip
2020-04-29 10:19:51 +09:00
b9ce572559
Reset LA10/15 state also when stopping a print
...
Based on f22fb2770b
2020-04-28 17:35:28 +02:00
67e9b4c096
IR fsensor fixes ( #2632 )
...
* MK3S IR sensor detection and safe operational range fix
* debug, change of fsensor_IR_check behavior
* more doc + disable debug print voltage
* fix displaying MSG_04_OR_NEWER and MSG_03.... kudos to @ovariludovit
* better handling of fsensor not responding scenario
2020-04-28 10:20:21 +02:00
c34c622b3c
Merge branch 'MK3_3.9.0' into flashair_display_ip
2020-04-28 00:14:47 +09:00
baaa372a56
Rephrase texts for fsensor detection and cleanup ( #2630 )
...
* Rephrase texts for fsensor detection and cleanup
* fsensor msgs only for MK3S
2020-04-24 19:46:54 +02:00
8ef87d76ef
MK2.x: move away from endstops after lcd_selfcheck_pulleys() ( #2617 )
...
* Removed duplicate #defines
cleaned up display routine
* Change to raise_z_above()
* Better display handling
* Ditch charswitch, show ... for measuring
* Pull in changes from #5
* Fix printf()s
* revert feedrates
* typo
* MK2.x: move away from endstops after lcd_selfcheck_pulleys()
amend
* Use absolute coordinates
Co-authored-by: vintagepc <53943260+vintagepc@users.noreply.github.com>
2020-04-20 09:55:14 +02:00
32fa7b5496
Merge pull request #2473 from vintagepc/#2472-#2356-belt-test-stealth-mode
...
#2472 #2356 #2484 belt test improvements
2020-04-20 09:36:39 +02:00
0e25eaee8f
Merge branch 'MK3' into MK3_NEW_SD_COMPILATION
2020-04-19 16:02:11 +03:00
dce453fd4a
typo
2020-04-16 07:31:54 -04:00
85a4c44d83
revert feedrates
2020-04-16 07:29:59 -04:00
207f0f27a6
🐛 Flip lcd_detect_IRsensor logic
2020-04-09 16:35:38 +03:00
4c4b4c489c
🐛 ♻️ Update the feedrate percentage before drawing the screen
2020-04-07 17:10:27 +03:00
dbd07c1d1c
Limited LCD output of several uint16 values to 999
2020-04-02 15:11:46 +02:00
fd1d05ab48
♻️ Code optimization
2020-04-02 14:44:44 +03:00
f8843b25b0
✨ Progress bar for check_file()
2020-04-02 13:21:53 +03:00
b8896ad9c0
First attempt for Z probe checking during selftest on the MK3/S
2020-04-01 12:28:39 +03:00
b449e248a1
Fix printf()s
2020-03-31 17:48:56 -04:00
0c383e20b3
Pull in changes from #5
2020-03-31 17:33:08 -04:00
f1cba64e56
Merge remote-tracking branch 'upstream/MK3' into #2472-#2356-belt-test-stealth-mode
2020-03-31 17:03:10 -04:00
5106831ba2
Merge pull request #2526 from leptun/MK3_decouple_XYZE_relative_mode
...
Mk3 decouple XYZE relative modes
2020-03-26 18:58:20 +01:00
587b051b1f
Merge pull request #2492 from vintagepc/belt-test-fixes-no-reorg
...
Belt test improvements (No display alteration)
2020-03-26 18:53:40 +01:00
b95d7365c8
Merge branch 'MK3' into remove-unnecessary-delay
2020-03-26 18:45:34 +01:00
c085ecaa11
Merge pull request #2264 from leptun/MK3_fix_selftest_Z_crash2
...
PFW-1048: fix selftest Z crash. Use stallGuard when testing Z
2020-03-26 18:22:35 +01:00
d0c51b9e73
int -> bool
2020-03-26 19:06:35 +02:00
65228a046e
Merge pull request #2520 from MRprusa3d/PFW-x001bPR
...
FS PCB auto-detect
2020-03-26 17:36:18 +01:00
818efb4fa2
updated messages + slight refactoring to save some bytes
2020-03-26 15:07:48 +01:00
34ac2917ae
fix. warning "Macro expansion producing 'defined' has undefined
...
behavior"
update screen layout comments
2020-03-26 14:40:47 +01:00
ff479afd88
version for testing / final review
2020-03-10 15:51:48 +01:00
5fcf18718f
Decouple XYZ relative from E relative.
2020-03-05 11:22:35 +02:00
355b003b7f
menu_data_reset()
2020-03-04 22:20:53 +02:00
22432b1053
Reset menu state after lcd_sd_refresh
2020-03-04 21:07:51 +02:00
5edc1ef297
Fix updir and dir again
2020-03-04 21:03:57 +02:00
57c149e7b5
Comment cleanup
2020-03-04 21:01:08 +02:00
7b19715c99
Cache sdSort
2020-03-04 20:41:17 +02:00
f35e553373
Code cleanup
2020-03-04 20:33:43 +02:00
8e47cb35a3
Possible fix to longpress in sdcard menu
2020-03-03 15:29:10 +02:00
d1968f6ff0
Option to refresh/resort SDcard files when flashAir type is selected
2020-03-03 15:17:50 +02:00
f69a68b966
Fix subdir enter and exit
2020-03-03 14:55:08 +02:00
53e130fc6d
Merge branch 'MK3' into MK3_NEW_SD_COMPILATION
2020-03-03 14:14:43 +02:00
0eaa4edfee
configuration update
2020-03-02 21:18:11 +01:00
2a9504b20a
!!! for testing only !!!
...
filament sensor auto-detection
2020-03-02 19:07:23 +01:00
ec5e54de25
state fixing
2020-03-02 17:52:25 +01:00
e06beb61c3
Ditch charswitch, show ... for measuring
2020-02-21 18:14:13 -05:00
1aaefffdb0
Change to raise_z_above()
2020-02-13 07:37:27 -05:00
5abee3d3e5
Better display handling
2020-02-11 19:44:26 -05:00
278bb032d7
Change to raise_z_above()
2020-02-11 18:37:26 -05:00
a4458fb57b
Removed duplicate #defines
...
cleaned up display routine
2020-02-11 18:33:40 -05:00
e4b1a1e9c4
Remove delay for belttest, similar to #2439
...
There's a separate PR to remove the first delay in the selftest. (#2439 ). Mirroring that to the belt test function, which I suspect also inherited it.
2020-02-09 21:39:48 -05:00
721b27fcb6
Reorg/cleanup
...
Removed unused progress variable
reorganized flow to avoid early returns (ensures forced high power mode is disabled regardless of outcome)
2020-02-08 12:33:23 -05:00
1384e783bf
Force high power mode when running belt test
2020-02-07 16:14:33 -05:00
6fbd632c84
Isolate all PAT9125-specific code, fix build on !MK3 variants
...
- Hide all prototypes related to PAT9125 to force all callers
to check for the proper sensor, since the handling differences
are substantial
- Remove unneeded lenght accounting from the stepper isr as as
consequence.
- Keep detailed soft failure counts for the MK3 on the "last print
failures" status screen, but fix build on variants without a PAT9125
by fixing the lcd stats function.
2020-02-05 16:20:12 +01:00
8fb8ff4bf4
Include fsensor recovery stats in the last print stats
2020-02-05 16:20:12 +01:00
3ae5fa70ca
Fix comments
2020-02-03 19:20:43 +02:00
1f482adf55
Improved lcd_menu_statistics() implementation
2020-02-03 18:40:46 +02:00
d6522a643c
Update ultralcd.cpp
...
indent
2020-01-31 16:57:18 +01:00
fd42361236
Update ultralcd.cpp
...
do delay(2000) everytime, even if IR_SENSOR_ANALOG
2020-01-31 16:55:40 +01:00
10d468cceb
Merge branch 'MK3' into remove-unnecessary-delay
2020-01-31 16:51:27 +01:00
3e70b73a1f
Remove unnecessary delay in lcd_selftest, which occured there as a result of merge.
2020-01-27 19:02:15 +01:00
2e50954710
Merge branch 'MK3' into MK3_fix_selftest_Z_crash2
2020-01-22 14:56:54 +02:00
73527d6069
selfTest workflow optimalization
2020-01-22 04:45:13 +01:00
24b748c4ac
Merge remote-tracking branch 'upstream/MK3' into flashair_display_ip
2020-01-16 21:25:55 +09:00
7230b99448
Merge pull request #2393 from wavexx/sync_before_resume
...
Sync before resume
2020-01-15 12:49:56 +01:00
1a8420f3f9
Merge pull request #2383 from wavexx/fix_usb_resume_check
...
Fix fan_check_error check in usb print resume
2020-01-15 12:48:48 +01:00
43870c4028
Merge pull request #2368 from wavexx/unretract_after_lcd_pause
...
Unretract when resuming a paused print
2020-01-15 12:47:24 +01:00
32c9cd2307
Merge branch 'MK3' into fix_lcd_stop
2020-01-09 14:17:56 +02:00
b088500eaf
Merge pull request #1909 from wavexx/MK3_LA15
...
Linear Advance 1.5 Returns
2020-01-09 11:22:06 +01:00
e295c83d09
Folder sorting shellSort
2020-01-08 21:16:08 +02:00
7028583e9b
Merge branch 'MK3_ShellSort' into MK3_NEW_SD_COMPILATION
2020-01-08 16:27:31 +02:00
37dc5fed45
Merge branch 'MK3_revised_filename_scrolling' into MK3_NEW_SD_COMPILATION
2020-01-08 16:26:51 +02:00
df300a2488
Merge pull request #2403 from leptun/MK3_unknown_Z_mark
...
Show ? near Z value if the position is unknown
2020-01-08 14:55:37 +01:00
e15d5e21f5
Merge pull request #2402 from leptun/MK3_sheet_on_status_screen
...
Do not show sheet on status screen if less than 2 are initialized
2020-01-08 14:42:29 +01:00
2f2e415eae
Merge pull request #2382 from wavexx/fix_lcd_stop
...
Fix lcd "Stop" when used within a pause
2020-01-08 14:40:54 +01:00
8b0f0695a8
Merge branch 'MK3_fix_shorter_sheet_name_on_status_screen' into MK3_sheet_on_status_screen
2020-01-08 15:31:33 +02:00
9abdf4e535
Show ? near Z value if the position is unknown
2020-01-08 13:46:51 +02:00
c5324291ad
Do not show sheet on status screen if less than 2 are initialized
2020-01-08 12:48:41 +02:00
d9e5283526
Fix pause->stop->PrintFromSD scenario
2020-01-07 21:02:13 +02:00
1996fc7940
Remove commented-out code
2020-01-07 20:43:56 +02:00
4422fc29f8
Set XYZ to absolute and E to relative
2020-01-07 20:42:21 +02:00
f8a0d5d773
Fix lcd_print_stop function
2020-01-07 19:54:06 +02:00
df0d781c20
Merge branch 'MK3' into fix_lcd_stop
2020-01-07 19:53:55 +02:00
1ba89b9689
Merge branch 'MK3' into MK3_ShellSort
2020-01-07 14:18:31 +02:00
f923427dc1
Show the FlashAir IP address
...
Displays the FlashAir IP address in the "Support" menu if the card is available.
If no IP address has been assigned yet, "0.0.0.0" will be displayed.
2020-01-04 12:51:20 +09:00
57be14fca6
Complete all pending moves before restoring a saved print
2019-12-30 13:30:06 +01:00
a31319888c
Fix fan_check_error check in usb print resume
...
Also check for fan_check_error == EFCE_OK in addition to EFCE_FIXED.
Reorganize the check in order to fix both #if[n]def FANCHECK cases,
as similarly done in the SDSUPPORT case a few lines below.
2019-12-23 19:12:46 +01:00
8d60e4d6db
Merge remote-tracking branch 'upstream/MK3' into MK3_LA15
2019-12-18 18:28:41 +01:00
f071aec747
Fix sheet minimum width on the status screen
2019-12-18 08:52:25 +03:00
f0f7db57ea
Fist attempt at "saved position SD menu"
2019-12-17 00:45:25 +02:00
3ad611ca16
Merge branch 'MK3' into MK3_revised_filename_scrolling
2019-12-16 21:39:27 +02:00
8d490f941a
Make use of the CRITICAL_SECTION macros in lcd_print_stop
2019-12-16 16:39:20 +01:00
0cc68228f8
Unretract when resuming a paused print
2019-12-16 16:33:11 +01:00
955c88cf68
Merge pull request #2370 from wavexx/no_resume_while_resuming
...
Do not allow to resume a print twice while waiting for the hotend
2019-12-16 16:26:02 +01:00
faa76df2fe
Fix the "Stop print" behavior from the LCD
...
Correctly cleanup the printer state when stopping the current print:
- Disable interrupts while aborting the planner/queue to ensure
new serial commands are not inserted while aborting
- _Always_ call planner_abort_hard() to interrupt any pending move!
- Clear the saved_target, which might be set when calling stop
from within a paused state. Create a new function to clear the
paused state for future use.
- Do not disable/reset the MBL: doing so will destroy the ability to
restart correctly using M999.
2019-12-16 15:52:37 +01:00
348bbbffb0
Do not allow to resume a print twice while waiting for the hotend
...
Clear isPrintPaused just prior to restore_print_from_ram_and_continue.
2019-12-15 22:22:44 +01:00
c122399020
Merge pull request #2270 from leptun/MK3-PFW-1024
...
PFW-1024
2019-12-15 10:25:37 +01:00
d68d9c7fef
Merge pull request #2058 from leptun/MK3_fix_warnings
...
Fix "LANG_MODE 0" warnings
2019-12-15 09:29:27 +01:00
770fcd7c42
Merge branch 'MK3' into MK3-PFW-1024
2019-12-14 10:08:52 +02:00
30cee7afca
Merge pull request #2353 from wavexx/lcd_pause_fixes
...
Fix the LCD pause (regression)
2019-12-13 13:53:29 +01:00
a1bc4cc5dc
Merge pull request #2332 from leptun/MK3_Octoprint_fIxes
...
Do not check for fanError if it is not enabled on resume
2019-12-13 13:47:56 +01:00
0b9123ce24
Fix Live K, allow "Advance K" to be translated
2019-12-05 15:18:24 +01:00
5122f79a39
Merge remote-tracking branch 'upstream/MK3' into MK3_LA15
2019-12-04 17:27:23 +01:00
063d0421ac
Call long_pause from the main loop (again)
...
After calling stop_and_save_print_to_ram, perform the parking moves
within the main loop as done before PR#1899 to avoid planning within
an interrupted move (which would clear the abort flag too soon).
2019-12-03 20:37:13 +01:00
63655a906a
Merge branch 'MK3' into MK3_revised_filename_scrolling
2019-11-30 01:31:48 +02:00
103e29d38a
Merge branch 'MK3' into MK3_ShellSort
2019-11-29 16:52:20 +02:00
a413cfbb9a
Merge branch 'MK3' into MK3-PFW-1024
2019-11-29 13:07:45 +02:00
dbe2ed4150
Fix pause/resume when using M25/M601
...
Remove the conflicting and mostly useless card.paused flag (the printing
is either paused, or not) and switch to isPrintPaused only which
accounts for both cases (SD/USB) correctly.
Fix M27/getStatus to show the current real status of the SD print.
Synchronize the queue on M601, as required to precisely pause the print
at the correct instruction.
Alias M25 to M601, which when combined with PR #1899 fixes issue #1614 .
Guard against incorrect usage in M601, M602 and M603.
2019-11-28 17:37:58 +01:00
960f4a88ed
Status bar, lcd optimization, compile warning fix
2019-11-26 13:36:28 +02:00
d40656e3ca
Small changes to rendering
2019-11-24 19:16:22 +02:00
273d834b19
Fix card removal
2019-11-22 20:27:24 +02:00
2fd192a95d
Set scroll delay to 300ms
2019-11-22 20:14:55 +02:00
fdab70fa3a
Dir fixes
2019-11-22 14:39:21 +02:00
8a806bceea
SDDIR
2019-11-21 21:32:52 +02:00
6538262e75
First build that actually works
2019-11-21 19:04:45 +02:00
8f901d2613
Temporary fix
2019-11-21 14:58:13 +02:00
b3a587f5a4
SD first attempt. Broken
2019-11-20 20:25:51 +02:00
45b89c5728
Fix typo
2019-11-19 13:55:37 +02:00
e66574ac5f
Updated branch to use TOGGLE
2019-11-19 13:51:10 +02:00
6e2793566c
Merge branch 'MK3' into PFW-943
2019-11-18 14:43:46 +01:00
b077303156
Fix compile error
2019-11-17 11:10:13 +02:00
14104e7bf9
Clear error flag when fanError is disabled
2019-11-17 10:44:11 +02:00
2e0034d915
Update Toggles and Translations
2019-11-17 09:53:14 +02:00
359c447127
Do not check for fanError if it is not enabled on resume
...
Fix typos
2019-11-16 22:44:34 +02:00
07b6173aaa
Merge branch 'MK3' into MK3-PFW-1024
2019-11-16 11:28:29 +02:00
e2e32b455a
Merge pull request #2247 from mkbel/reset_live_Z+offset
...
Show current Z offset in reset dialog before first layer calibration
2019-11-15 17:52:29 +01:00
460f6c3b5e
update message
2019-11-15 17:47:39 +01:00
715794d854
Merge pull request #2092 from leptun/MK3_Translations
...
PFW-1062: Mk3 Toggle and Translations
2019-11-15 16:53:17 +01:00
3a41405f52
Merge pull request #2146 from vintagepc/MK3-2093-sheet-display
...
PFW-1061: #2093 - Relocate sheet menu, show sheet on info screen
2019-11-15 16:07:51 +01:00
f6c35c5d5f
Removed separate fix for #2089
...
Per PR fix request
2019-11-15 08:58:58 -05:00
8fae50ec79
Merge pull request #2315 from mkbel/finda
...
PFW-1047: Show FINDA state as N/A if last received response is older than 1s.
2019-11-15 12:53:01 +01:00
56251c4f99
Merge pull request #1937 from arons/MK3
...
added new function belt test under calibration menu
2019-11-15 09:39:42 +01:00
9e780f0b2b
remove ESC sequence
2019-11-15 09:26:56 +01:00
11428388c6
MBL toggle and cleanup
2019-11-09 20:58:56 +02:00
20a59f5f40
Temp cal.
2019-11-08 19:44:48 +02:00
c82fa07299
Merge pull request #2195 from leptun/MK3-fix-LFN
...
Fix short filenames scrolling in sdprint menu and status screen
2019-11-08 16:52:53 +01:00
ce5efb107a
Merge pull request #2155 from leptun/MK3_SD_scroll_workaround
...
SD Scroll workaround
2019-11-08 16:48:38 +01:00
b33c79e6c7
Merge pull request #1899 from wavexx/fix_lcd_pause_function
...
Fix the LCD pause function
2019-11-08 14:55:13 +01:00
42d70f3dea
Merge pull request #1768 from wavexx/unknown_z_improvements
...
"Unknown z" improvements
2019-11-08 14:52:56 +01:00
1de353dd09
Merge branch 'MK3' into MK3_Translations
2019-11-07 17:02:45 +02:00
3c26f7855b
Merge pull request #1704 from leptun/MK3_Enable_fan_waiting_cooldown
...
Enable print fan while waiting for cooldown
2019-11-04 16:52:26 +01:00
cd5ff783cf
General fixes and improvements to code
2019-10-31 19:07:20 +02:00
76c39ce689
Show FINDA state as N/A if last received response is older than 1s.
2019-10-31 17:45:22 +01:00
1e09f8c003
Wake on certain events
...
EEPROM DIM and BRIGHT values swapped!!!
2019-10-30 21:11:19 +02:00
50231b76da
Improved handling of unknown Z position
...
- Introduce raise_z_above to move Z carefully when the current position
is potentially unknown, using stallguard
- Use raise_z_above for:
* filament loading/unloading clearance
* extruder spacing when preheating (to avoid buildplate marks on PEI)
* before homing to avoid damaging the build plate and to avoid
repeated Z moves as well
Since raise_z_above is conditional, it will only raise when needed.
Calling raise_z_above when the extruder position is unknown and already
at maximum travel is safe and will prevent further vertical moves.
2019-10-22 15:49:10 +02:00
d32fd1d893
Better EN for new messages
2019-10-22 09:11:47 +02:00
d7b12faa95
Add "Brightness" to Tune menu
2019-10-19 18:45:04 +03:00
0ed4a23ae7
And another compile fix...
2019-10-18 12:42:55 +03:00
9fc42526e7
Backlight always on during calibration
2019-10-18 12:18:43 +03:00
91e94aa0e8
Adjustable timeout
2019-10-18 10:32:41 +03:00
812eafd09c
Fix compile for miniRambo
2019-10-17 13:14:32 +03:00
25e0d23efe
Backlight overhaul and UI changes
2019-10-17 13:11:32 +03:00
04bfe674df
tiny lang fixes, part 1
2019-10-16 16:32:49 +02:00
3b005ae38f
Backlight detection
2019-10-16 14:40:45 +03:00
5a662413e6
Fix compile for printer without backlight support
2019-10-13 14:34:04 +03:00
75f389a71d
Auto-Dimming initial
2019-10-13 14:31:43 +03:00
4703853a3d
Small fixes
2019-10-12 13:19:17 +03:00
350e27810a
fix selftest Z crash. Use stallGuard when testing Z
2019-10-11 21:00:51 +03:00
b2a1dc6786
Compile fix for firmware without LCD_BL_PIN
2019-10-11 19:23:38 +03:00
68491c9d4d
First implementation
2019-10-11 19:06:37 +03:00
05e23d1468
Merge branch 'MK3' into MM_lay1_cal
2019-10-01 23:08:11 +02:00
ff7260dc6e
Merge pull request #2246 from mkbel/reset_live_Z
...
Reset live z
2019-10-01 23:02:40 +02:00
74a1c9341b
Revert "Use content supplied strings for lcd_first_layer_calibration_reset(), as we have translations prepared for release. It will be reverted later to show current Z offset."
...
This reverts commit ca9ef3aba1
2019-10-01 22:57:59 +02:00
ca9ef3aba1
Use content supplied strings for lcd_first_layer_calibration_reset(), as we have translations prepared for release. It will be reverted later to show current Z offset.
2019-10-01 22:57:15 +02:00
210d7f6bf1
Merge pull request #2245 from DRracer/knob-long-press
...
Knob long press fixes
2019-10-01 22:33:26 +02:00
087d3cb250
Continue to lcd_v2_calibration() after selection is made in lcd_first_layer_calibration_reset(). Do not ask for selection if sheet is not calibrated, it is calibrated to zero offset or no first layer calibration was ever made.
2019-10-01 21:04:00 +02:00
aabf7655dc
Do all text formatting in first layer calibration reset dialog in one line.
2019-10-01 19:20:36 +02:00
7c3f397a62
Print sheet name and Z offset in first layer calibration reset dialog.
2019-10-01 18:22:12 +02:00
b39f09b68e
Merge branch 'MK3' into MM_lay1_cal
2019-10-01 19:20:50 +03:00
d044d3b7b5
Merge pull request #2244 from MRprusa3d/PFW-1008
...
EEPROM_BABYSTEP_Z using removal
2019-10-01 18:04:09 +02:00
f3c3526aa5
fix the knob long-press causing hang in modal dialogs
2019-10-01 17:13:36 +02:00
ed13788e0c
EEPROM_BABYSTEP_Z using removal
2019-10-01 16:57:37 +02:00
9ae75612b5
Fixes after first feature tests
2019-10-01 15:31:01 +02:00
06187f52f3
Merge pull request #2230 from leptun/MK3_Octoprint_fIxes
...
Mk3 Fan error fix
2019-10-01 11:34:55 +02:00
72aed3c544
Allow knob-long-press only in listed menus
2019-10-01 10:51:02 +02:00
543ad6eb41
Ask to reset Z offset before first layer calibration.
2019-09-30 19:58:09 +02:00
9d57f9c365
Fix fan_error_selftest() mistake
2019-09-30 20:30:09 +03:00
61c7479579
Code cleanup: Move texts to messages.c/h
2019-09-30 20:16:01 +03:00
30f325c81d
Extract fan_error_selftest to function for readability
2019-09-30 20:01:31 +03:00
aba9d1c360
Merge branch 'MK3' into MM_lay1_cal
2019-09-30 18:13:57 +02:00
dfd3f34351
Check for minimum fan speed. Should be achievable by both fans in 1s.
2019-09-25 22:35:35 +03:00
532d1fc4ae
Fix "Resume Print" missing when doing a normal pause
2019-09-25 18:32:35 +03:00
c3b7b5ebb5
Check fans before resuming
2019-09-25 15:58:07 +03:00
3c17f7e145
No need to check the fan in the menu
2019-09-22 14:04:58 +03:00
2363f19a62
Minor tweaks for usb printing
2019-09-20 21:07:20 +03:00
139c37c744
allow only one string translation constraint defintion per line
2019-09-20 13:01:07 +02:00
fd01942db8
FAN Error fix - Initial
2019-09-19 20:48:59 +03:00
2afeb65811
return failStatsFmt that fell out in merge
2019-09-19 18:39:25 +02:00
f50cef8361
Merge remote-tracking branch 'upstream/MK3' into translations-doc
...
and resolve ultralcd.cpp conflicts
2019-09-19 18:10:20 +02:00
68359687f8
Merge pull request #2202 from DRracer/lang-381-fixes
...
dialogs' layouts fixes + FR polished
2019-09-19 16:33:26 +02:00
17cca89993
Merge remote-tracking branch 'upstream/MK3' into translations-doc
2019-09-18 15:17:28 +02:00
e7273ea505
Fix [French translation] Wrong display during mesh bed calibration #2218
...
minor code/doc improvements
2019-09-18 12:49:44 +02:00
c1bf4a6288
Merge pull request #2216 from michalrudolf/MK3-miniopravy
...
Mk3 miniopravy
2019-09-18 11:34:17 +02:00
027b6238fd
Mark code unused when PINDA_THERMISTOR is defined by macro. Saves 1B of RAM and 4B of FLASH memory.
2019-09-17 20:26:03 +02:00
966d9baf2b
Document.
2019-09-17 19:00:03 +02:00
b660cb3908
ultralcd.cpp
2019-09-17 11:46:29 +02:00
77c4720c8b
Merge remote-tracking branch 'upstream/MK3' into translations-doc
2019-09-17 11:32:27 +02:00
b4e0c2f455
Update ultralcd.cpp
...
Menu Support -> XYZ calibration details -> 3. obrazovka "point offset"
X value is no longer moved to the left if there’s no negative sign
2019-09-17 10:51:43 +02:00
c66b4bd876
Do not ask for preheat temperature twice if calibrating first layer from wizard without filament.
2019-09-16 21:14:17 +02:00
e1cfd6dc4f
Remove option to heat nozzle only from mFilamentItem() when activated from wizard, as it has no use after filament unload was removed from wizard.
2019-09-16 18:48:52 +02:00
ff4450489b
Document.
2019-09-16 18:38:44 +02:00
002a7d31a4
Make lcd_wizard() more debug friendly.
2019-09-16 18:31:12 +02:00
b99038736c
Use eeprom_update_byte instead of eeprom_write_byte
2019-09-16 18:22:34 +02:00
d491a9801d
Update ultralcd.cpp
2019-09-16 16:04:45 +02:00
0e1d559f03
Merge branch 'MK3' into PFW-943
2019-09-16 15:29:28 +02:00
011468598e
IR sensor gen. II
...
disconnected PCB detection
2019-09-16 00:43:37 +02:00
015b34de05
Alert user in wizard about more sheets presets.
2019-09-13 17:09:11 +02:00
4423106fad
dialogs' layouts fixes (support menu dlgs, statistics etc.)
...
French translation polished
2019-09-13 16:55:05 +02:00
e754780717
Fix condition for returning to wizard. eFilamentAction == FilamentAction::Preheat was never true as eFilamentAction is set to eFilamentAction::None in lcd_return_to_status().
2019-09-13 00:19:37 +02:00
f1d190d2d5
Do not ask same filament related question twice if starting first layer calibration from wizard.
2019-09-12 23:41:42 +02:00
ebf405d589
Preselect "yes" for filament question in first layer calibration wizard.
2019-09-12 23:20:03 +02:00
d256c18635
Fix first layer calibration wizard. Do not jump to WizState::LoadFil if calibration is supposed to be performed.
2019-09-12 23:17:19 +02:00
73642632f5
Do not force PLA filament in first layer calibration from wizard. Remove duplicate variable wizard_active. Saves 410 B of FLASH and 1 B of RAM.
2019-09-12 22:37:28 +02:00
07a0f527d8
Reset lcd_encoder_diff in lcd_show_fullscreen_message_yes_no_and_wait_P() also when it times out.
2019-09-12 20:30:27 +02:00
6630591f9e
Consume lcd_encoder_diff in lcd_show_fullscreen_message_yes_no_and_wait_P().
...
This fixes problem encountered in lcd_v2_calibration(). Selected menu item skips to another if returning to menu after this message is used.
2019-09-12 20:20:33 +02:00
d48197656c
Fix lcd_v2_calibration menu not redrawn after full screen message or question.
2019-09-12 20:05:16 +02:00
770e470fd5
Extract common code to function preheat_or_continue(). Saves 138B of FLASH memory.
2019-09-12 18:53:24 +02:00
d80b8280a0
Remove commented out and unused functions prototypes.
2019-09-12 18:41:17 +02:00
3a541488b2
Rename extr_unload_() to mmu_unload_filament() and move it to ultralcd.cpp as it is menu.
2019-09-12 18:40:02 +02:00
0cdfa7a5e8
Remove dead code.
2019-09-12 18:33:02 +02:00
e83b2ebe1f
Rename mFilamentMenu to lcd_generic_preheat_menu to match naming convention for global function and be more descriptive.
2019-09-12 18:15:15 +02:00
c26d7e50f7
Remove redundant lcd_update_enable(true) call.
2019-09-12 18:07:46 +02:00
6674cbf0d7
Select material / temperature before first layer calibration.
2019-09-12 17:54:05 +02:00
ae839aee31
Merge branch 'MK3' into MK3_Translations
2019-09-12 16:28:36 +03:00
6661d3aa45
Merge remote-tracking branch 'prusa3d/MK3' into MM_lay1_cal
2019-09-12 14:28:52 +02:00
521c5eb8ef
Merge pull request #2141 from mkbel/preheat_menu
...
Unify preheat menu, add ASA material
2019-09-12 14:25:38 +02:00
43705aae2e
Rename lay1cal_preheat() to lay1cal_wait_preheat().
2019-09-12 00:19:20 +02:00
ae3e6530e6
Do not ask for PLA filament in the beginning of first layer calibration. Do not ask if filament is present if it can be detected by IR sensor.
2019-09-12 00:14:24 +02:00
bf9f668574
Fix short filenames scrolling in sdprint menu and status screen
2019-09-11 22:04:48 +03:00
60de313b8a
Merge pull request #1759 from wavexx/enhanced_longpress
...
Default to "Live Adjust Z" when longpressing during a print (closes #1604 )
2019-09-10 14:13:00 +02:00
d51b3d6207
Added doxygen todos for missing LCD layout and positioning
2019-09-01 09:51:51 +02:00
339771a5fb
Fixed info screen when selected_sheet hasn't been initialized.
2019-08-31 21:27:08 -04:00
10cdcb3ae3
SD Scroll workaround
2019-08-31 17:00:39 +03:00
795b1d1cf7
Toggle Sound
2019-08-31 16:56:14 +03:00
2345288d40
Fix the LCD pause function
...
Do not call long_pause recursively!
long_pause() is called before resetting the lcd_command_type. As
long_pause uses st_synchronize() internally, there could be time to
schedule another call to long_pause().
2019-08-31 15:28:31 +02:00
3c4fffef60
Merge branch 'MK3' into MK3_Translations
2019-08-31 15:30:51 +03:00
a5a5f5cf0b
Toggle RPi port
...
Probably works, needs to be tested.
2019-08-31 15:25:00 +03:00
f69035323a
Toggle SD Settings
...
This includes FlashAir support and SD Sorting type
2019-08-31 14:55:51 +03:00
a821002f02
Toggle MMU Mode
2019-08-31 07:38:40 +03:00
d347a36509
Merge branch 'MK3' of https://github.com/prusa3d/Prusa-Firmware into MK3-2093-sheet-display
2019-08-30 19:17:27 -04:00
871e29621f
Fix "stuck" rename cursor
2019-08-30 19:14:22 -04:00
a789a8995f
Merge pull request #2145 from mkbel/fix_sheet_reset
...
Fix sheet reset
2019-08-30 16:49:34 +02:00
6a8330a43b
Toggle "HW Setup"*
...
All toggles from "HW Setup" were changed.
This includes:
-"Nozzle d."
-all "Checks"
Also added an option to provide a string from sram (not from progmem) as the toggle argument. This can be useful when toggling numbers or even when toggling sheets in the future.
2019-08-30 17:36:21 +03:00
3d292350d4
Do not activate selected_sheet in lcd_v2_calibration() as this leads to calibrating random sheet if activated from calibration menu.
...
selected_sheet is initialized to 0 and contains index of last Sheet menu visited.
2019-08-30 14:45:25 +02:00
26423f98bc
Switch to next sheet if currently selected sheet is not initialized. Move next_initialized_sheet() and change_sheet_from_menu() to eeprom.cpp, rename it to eeprom_next_initialized_sheet() and eeprom_switch_to_next_sheet(). Rename default_sheet_name() to eeprom_default_sheet_name().
2019-08-30 12:24:13 +02:00
b86a92a7d6
Toggle Mode (stepper power)
2019-08-30 07:59:58 +03:00
8df6691819
Relocate sheet menu, show sheet on info screen
...
-Sheet is shown instead of percentage done either if idle, or during
print preheat.
-Relocated sheet menu to below SD menu for additional visibility to
current sheet.
2019-08-29 18:07:24 -04:00
db6e2e0525
Toggle Crash det.
2019-08-29 22:31:30 +03:00
8c8619be05
Convert reset sheet sub menu to function.
2019-08-29 20:52:53 +02:00
abf84e36f5
Fix sheet menu back caption to Steel sheets to match parent menu caption.
2019-08-29 20:23:02 +02:00
d647cdc02c
Convert sheet switcher from sub menu to function. Handle null characters in sheet name.
2019-08-29 20:13:10 +02:00
32f435d1a0
Increase number of configurable steel sheets to 8. Move sheets into sub menu of HW setup.
2019-08-29 17:21:08 +02:00
7f51e0bad8
Move SpoolJoin and Cutter to MSGs
2019-08-29 17:35:26 +03:00
3413d5d486
Merge pull request #2139 from DRracer/assist-mode-fixes
...
Fix sound mode [assist]: encoder clicking indefinitely when MMU wants to
2019-08-29 15:55:49 +02:00
0b21acec46
Minor fix to Toggle Cutter
2019-08-29 15:49:26 +03:00
d0f9f10ed6
Toggle Cutter
2019-08-29 15:43:41 +03:00
1937cf2074
Toggle SpoolJoin
2019-08-29 15:40:04 +03:00
5eea8d26fe
Merge branch 'MK3' into MK3_Translations
2019-08-29 12:08:48 +03:00
f3bb72be64
Reset calibration status if there is no calibrated sheet after reset.
2019-08-29 03:33:33 +02:00
f64252b59b
Hide sheet switcher from main menu, if there are less than 2 sheets calibrated.
2019-08-28 19:08:53 +02:00
9692f94683
Move sheet menu up to be after Print from SD.
2019-08-28 19:01:48 +02:00
3903dc819a
Extract function next_initialized_sheet from change_sheet_from_menu(). Make it more general to depend on sizeof(Sheets::s) instead of hard coded value of 2.
2019-08-28 18:59:48 +02:00
49bc11037c
Remove statements with no effect.
2019-08-28 18:14:10 +02:00
1d23cc52e9
endstop sound alert fixes
2019-08-28 09:39:28 +02:00
29c8cb2927
Fix bad merge.
2019-08-27 22:22:36 +02:00
3f04c4db87
Merge branch 'MK3' into preheat_menu
2019-08-27 22:20:23 +02:00
07169ad84a
Make file local variable static.
2019-08-27 20:48:53 +02:00
e57fcc04a7
Fix compiler warnings.
2019-08-27 20:23:48 +02:00
d927d5b05d
Port wizard_active to mFilamentItem().
2019-08-27 20:19:03 +02:00
cef7f31b9f
Set FilamentAction to None if mFilamentMenu left by cooldown or menu back action.
2019-08-27 20:13:55 +02:00
ffc5a64154
Remove commented out code.
2019-08-27 20:06:48 +02:00
269aef1696
Remove unused code guarded by WATCH_TEMP_PERIOD macro as most of the functionality is duplicate to what is implemented in temp_runaway_check(). This will release us from porting setWatch() to unified preheat menu and maintaining it.
2019-08-27 20:05:10 +02:00
1a1be5c518
Fix sound mode [assist]: encoder clicking indefinitely when MMU wants to
...
select filament
2019-08-27 17:10:29 +02:00
bf2097342d
Add ASA preheat into mFilamentMenu();
2019-08-27 17:01:41 +02:00
3da43ae8c2
Do not port print fan preheat speed preset, as it was never used. And it was broken until recently fixed when adding ASA profile.
2019-08-26 21:14:07 +02:00
4792559536
Add farm preheat items. Add setWatch() call.
2019-08-26 21:00:30 +02:00
aa13f9e809
Fix formatting.
2019-08-26 20:19:34 +02:00
668e89e5a9
Preheat menu: Add ASA, hide menu item back when in wizard.
2019-08-26 20:18:34 +02:00
52ae62bbba
Fix formatting.
2019-08-26 20:14:00 +02:00
3628d893ee
Remove duplicate preheat menu.
...
Known limitations: farm_mode missing, wizard_active missing, cooldown missing, ASA missing, print fan missing.
2019-08-26 20:11:52 +02:00
b9b0d6049e
Fix formatting.
2019-08-26 19:48:39 +02:00
c6df3fe012
Merge pull request #2127 from DRracer/code-size-reduction-1
...
Code size reduced by almost 5KB
2019-08-22 14:25:23 +02:00
d3123a74b0
Updated LCD menu documentation to new form/syntax
2019-08-22 04:58:16 +02:00
514b062107
Added `lcd_menu` format description
...
Added some documentation how the LCD menus look like and added max character values for translations.
There are more things needed and also the placement in the code is an open task. Depending on the decision if we use `messages.c/h`
2019-08-21 10:28:28 +02:00
a7c2aec04c
Code size reduced by almost 5KB
2019-08-21 09:59:51 +02:00
f204cdea81
Refactor
...
Remove variable CrashDetectMenu. Read this state from EEPROM_CRASH_DET instead in bool lcd_crash_detect_enabled().
Rename crashdet_enable() to lcd_crash_detect_enable() and move it to ultralcd.cpp.
Rename crashdet_disable() to lcd_crash_detect_disable() and move it to ultralcd.cpp.
Rename lcd_crash_mode_set() to crash_mode_switch().
Remove forward function declarations from *.cpp file.
Saves 34B of FLASH and 2B of RAM.
2019-08-20 17:22:27 +02:00
0d22f8039e
Toggle FSENSOR and FSENSOR_AUTOLOAD
2019-08-19 11:58:16 +03:00
5a3f14b752
"N/A" toggle support and format update
2019-08-19 10:20:17 +03:00
170c1ea866
Split first layer calibration load filament and intro line into separate steps. If load fails, pause print apparently flushes command buffer and intro line is not printed after issue is resolved.
2019-08-16 20:47:55 +02:00
1036c4f755
Do not precede first layer calibration without filament if print is paused due to MMU load failed.
2019-08-16 19:00:45 +02:00
b10bd8340a
Make local functions static.
2019-08-15 17:57:30 +02:00
0b798767af
Fix preheat ASA.
2019-08-15 17:54:23 +02:00
a6f955b62d
Use unused macros *_PREHEAT_FAN_SPEED.
2019-08-15 17:47:34 +02:00
eb68bb9b43
Add ASA preheat.
2019-08-15 17:46:29 +02:00
36a69281ee
Remove unused functions forward declarations.
2019-08-15 17:36:05 +02:00
596ffe1dc2
Actual fix to the missing first two characters
2019-08-10 21:03:45 +03:00
7ce2fedac7
Fix missing first two characters in multi-lang mode
2019-08-10 09:16:23 +03:00
29dcb1cad3
Toggle FANS_CHECK
2019-08-10 08:43:07 +03:00
d9dec38815
Workaround for the "viper" situation bug.
2019-08-07 17:23:19 +02:00
33037d369c
Prevent LCD long-press re-entry ( fixes #1196 )
2019-08-05 19:00:29 +02:00
f1a947af2c
Whole hw settings hidden in farm mode
2019-08-05 10:40:21 +02:00
18b8dc89e5
Merge remote-tracking branch 'upstream/MK3' into MK3_LA15
2019-08-04 17:06:34 +02:00
5f14e9c2e5
Removed sheet setting when in farm mode
2019-08-03 17:35:39 +02:00
bca0fd81eb
Fix loading filament 255 instead of 0 in first layer calibration wizard.
2019-07-30 19:15:33 +02:00
5fdaead663
Fix language related warnings in LANG_MODE 0
2019-07-29 15:55:42 +03:00
3ddb853bbd
Fix shifted languages. Use \n and \x0a
2019-07-26 18:53:08 +03:00
5021fadd5d
multiple sheets - menu switching bug
2019-07-24 11:20:27 +02:00
851aaac053
Merge branch 'MK3' of https://github.com/NotaRobotexe/Prusa-Firmware into MK3
2019-07-23 19:29:36 +02:00
fb35009628
multiple sheets,fix of bug in switching sheets from menu
2019-07-23 19:25:59 +02:00
c4d5e332c8
Merge branch 'MK3' into MK3
2019-07-23 11:34:42 +02:00
b9f622f8a6
variables to PROGMEM, text formating
2019-07-23 11:31:20 +02:00
b5129ff2ec
Revert "force push"
...
This reverts commit 19e7838c20
2019-07-23 11:12:53 +02:00
19e7838c20
add default names to PROGMEM, text formating edit
2019-07-22 20:35:10 +02:00
ab2eafe175
sheet menu, add hw setting, sheet change in menu, sheet name initialization in eeprom
2019-07-22 18:43:43 +02:00
6f79ef4c9c
resolve hidden conflicts in commented code
2019-07-22 17:29:43 +02:00
65087b89ee
Merge remote-tracking branch 'upstream/MK3' into code_size_optimization
...
and resolve conflicts (ultralcd.cpp)
2019-07-22 17:26:14 +02:00
b96c9700ce
fix prusa_statistics code size optimization according to unit test
...
results
2019-07-22 17:10:04 +02:00
9c95f8c015
sheet menu
2019-07-19 18:34:46 +02:00
756ce51b5e
Merge branch 'MK3' into octoprint_fix
2019-07-17 20:06:06 +02:00
b8fec59f21
octoprint fan error fix
2019-07-17 19:59:31 +02:00
2bae208133
Merge pull request #2011 from MRprusa3d/PFW-873
...
GUI updates
2019-07-17 14:49:07 +02:00
255db28684
merge unit test and upstream changes
2019-07-17 10:30:49 +02:00
3a87ff56f6
Default to "Move Z" above a certain height even when printing
...
This speeds-up the ability to manually get the carriage out of the way
just after a print has finished
2019-07-16 22:04:32 +02:00
034cbff10a
GUI updates
2019-07-16 20:10:49 +02:00
1dab0f7a04
Merge pull request #2008 from leptun/MK3_LCD_improvements
...
Lcd optimization - 1K of flash saved
2019-07-16 19:15:57 +02:00
0422713b29
Merge pull request #2005 from prusa3d/MK3_3.7.2
...
Mk3 3.7.2
2019-07-16 08:50:38 +02:00
8b1c687629
Lcd optimization - 1K of flash saved
2019-07-15 20:32:58 +03:00
8fb30f886a
octoprint stop fix
2019-07-15 14:30:21 +02:00
a3fde091ab
More than 7.5KB saved by slight refactoring of printing to serial line
2019-07-12 10:10:56 +02:00
b8b167d1ca
Merge branch 'MK3' into MK3_Enable_fan_waiting_cooldown
2019-07-10 19:26:43 +03:00
d3dd0ad271
Merge pull request #1952 from NotaRobotexe/sound
...
new sound
2019-07-10 18:06:32 +02:00
98bae7af9f
Merge branch 'MK3' into PFW-873
2019-07-10 16:50:14 +02:00
3333d937ed
some improvements
2019-07-10 16:29:40 +02:00
4d535f1217
... incl. SupportMenu ;-P
2019-07-09 12:31:20 +02:00
8229a45187
pre-production version ;-)
2019-07-09 12:16:51 +02:00
61566f7fb1
Move translated string MSG_V2_CALIBRATION from untranslated section to PROGMEM_I1, add missing ISTR macro. Revert _T(MSG_SELECT) and _T(MSG_RENAME) to _i("Select") and _i("Rename") as it is preferred macro for internationalized strings. Use MSG_V2_CALIBRATION in both occurrences.
2019-07-08 21:18:55 +02:00
a1a8945bee
more code editing
2019-07-04 15:31:44 +02:00
e77898d5dc
code edit
2019-07-04 13:21:27 +02:00
81b3b71cca
check eeprom inicialization
2019-07-03 19:37:11 +02:00
a3a7f3106e
print parameters checking
2019-07-03 17:21:11 +02:00
d344e514c4
Rename functions and macro to match with naming convention - remove 'P' where there is no pointer to progmem.
2019-06-26 15:51:58 +02:00
d879794922
Remove first parameter of macro menu_format_sheet_P_E, of function menu_format_sheet_P_E and menu_item_submenu_P as it was always called with the same parameter. Saves 66B of FLASH.
2019-06-26 15:47:06 +02:00
53dbcdd852
Display sheet name when adjusting Z. Costs 130B of flash.
2019-06-26 15:33:54 +02:00
4a16fe6902
Save z_offset, bed_temp and pinda_temp with sheet calibration.
2019-06-26 14:10:12 +02:00
20dd1110f6
Remove unused parameters of function _lcd_babystep(int axis, chonst char *msg).
...
Saves 24B of flash memory.
2019-06-25 19:43:10 +02:00
ebdeb99134
Add menu to show sheet live adjust Z value.
2019-06-25 18:55:25 +02:00
3e9dc91cef
ifdef for mk2
2019-06-24 18:01:49 +02:00
b5168bd6c2
fan error fix
2019-06-24 17:30:56 +02:00
b67ec501b4
Add rename sheet menu.
2019-06-24 17:11:13 +02:00
e6fbac08ed
Move sheet selector to submenu.
2019-06-21 15:44:56 +02:00
0a48082609
Add steel sheet profile selector.
2019-06-20 16:40:53 +02:00
9a904362e5
code only for TMC2130
2019-06-20 10:17:48 +02:00
e54497d802
added new function belt test under calibration menu
2019-06-20 00:09:55 +02:00
524121141a
Remove commented out code. This code is of unknown genesis and purpose. It was added in commit "3.0.10 sync" two years ago and it was already commented out in that moment.
2019-06-19 15:54:24 +02:00
24cec4091b
Merge branch 'MK3' into sound
2019-06-17 17:28:19 +02:00
aff020a6d4
Merge pull request #1897 from NotaRobotexe/farm_mode
...
PFW-571 send PRN:4 instead PRN:1, PFW-874 new firmware version alert with 30s timeout
2019-06-14 20:05:30 +02:00
367a28a5a8
Default to "Live Adjust Z" when longpressing during a print ( closes #1604 )
...
- Disable longpress action when homing or calibrating
- Default to Live Adjust during a print
- Retain "Move Z" otherwise
2019-06-14 11:44:06 +02:00
d81970dd3d
Merge branch 'MK3' into MK3_Enable_fan_waiting_cooldown
2019-06-14 11:07:08 +03:00
6717590631
Merge branch 'MK3' into MK3_LA15
2019-06-13 15:39:50 +02:00
72f5e87c61
Merge branch 'MK3' into use_enum_class_2
2019-06-12 19:17:35 +02:00
1390d4e5b9
Use first letter capital camel case for enum class members. Change underlying type to uint_least8_t.
2019-06-12 19:11:41 +02:00
5fcf760954
Use first letter capital camel case for enum class members. Rename CustomMsgTypes to CustomMsg. Remove unnecessary maping to numbers. Change underlying type to uint_least8_t.
2019-06-12 18:54:43 +02:00
51df6cdfdc
Remove LcdCommands::Unknown3. Remove LcdCommands mapping to numbers, as it is not needed.
2019-06-12 18:54:37 +02:00
cbb92860d0
Use first letter capital camel case for enum class members.
2019-06-12 18:54:32 +02:00
0401490cc1
Use first letter capital camel case for enum class members.
2019-06-12 18:54:25 +02:00
9ceba00426
Use first letter capital camel case for enum class members. Remove dependency of FanCheck values on TestError values as it is not used.
2019-06-12 18:53:09 +02:00
b7d3766ae2
Merge branch 'MK3' into PFW-790
2019-06-12 17:32:13 +02:00
6dd085bcc5
Use first letter capital camel case for enum class members.
2019-06-12 16:44:07 +02:00
cc80bfa020
Merge branch 'MK3' into use_enum_class
2019-06-12 16:04:26 +02:00
c7e1e73880
another almost 200B down by proper usage of smaller data types and enum
...
classes
2019-06-12 15:41:55 +02:00
94a5175980
Code size reduction - saved almost 2KB
2019-06-12 15:41:34 +02:00
49f172a7b9
Convert uint8_t cycle control varibles changed in previous commit to uint_least8_t to be potentially more portable.
2019-06-12 15:01:57 +02:00
b15bbaf177
for cycles' variables: int -> uint8_t where appropriate, part1
2019-06-12 14:58:15 +02:00
4f8ed7f123
for cycles' variables: int -> uint8_t where appropriate, part1
2019-06-12 10:31:09 +02:00
baa36ce740
another almost 200B down by proper usage of smaller data types and enum
...
classes
2019-06-12 09:58:42 +02:00
d528a53526
Refactor. Move lcd_commands_func1() to first_lay_cal.cpp and rename it to lay1cal_square(). Remove its constant parameters. Move remaining G1 code to lay1cal_meander(). Saves 6B of FLASH memory.
2019-06-12 01:36:48 +02:00
60cc3d58ec
Use sprintf_P in first layer calibration. Save 30B of FLASH memory.
2019-06-11 20:00:49 +02:00
47a183e96e
Use loop to enquecommand_P() in first layer calibration. Save 126B of FLASH memory.
2019-06-11 19:49:56 +02:00
21f4669600
Make count_e() constexpr.
2019-06-11 19:22:08 +02:00
4effff9e99
Use loop to enquecommand_P() in first layer calibration. Save 10B FLASH memory.
2019-06-11 18:56:29 +02:00
d21f256cd0
Remove duplicate calls of lcd_timeoutToStatus.start(), move !blocks_queued() && cmd_buffer_empty() condition to outer if, rewrite using switch statement. Save 487B of FLASH memory.
2019-06-11 18:26:59 +02:00
97a5d6b5f4
Make constants const.
2019-06-11 17:30:37 +02:00
9b1e3213ae
Variable lcd_commands_step doesn't need to be global.
2019-06-11 17:30:19 +02:00
58948cffcd
Code size reduction - saved almost 2KB
2019-06-11 17:23:01 +02:00
0c9121e99e
Use loop to enquecommand_P() in first layer calibration.
2019-06-11 17:08:56 +02:00
Voinea Dragos
D.R.racer
DRracer
3d-gussner
odaki
Yuri D'Elia
MartinPoupa
Marek Běl
Marek Bel
vintagepc
MRprusa3d
MRprusa3d
michalrudolf
vintagepc
Marek Kühn
NotaRobotexe
Renzo Dani
Renzo