e817a2d321
Don't block OnMMUProgressMsg while waiting for fsensor to trigger
2022-09-16 10:22:37 +02:00
0aa3a5855e
Add TODO to prompt user if extruder is extruding correct color
2022-09-16 10:22:37 +02:00
1c25041134
Add the load to nozzle sequence once the MK3S takes control and MMU has disengaged idler.
...
Also removed ProgressCode::FeedingToNozzle from switch-case since it is not used for this purpose at the moment.
2022-09-16 10:22:37 +02:00
3e77f9f3a1
Reduce grinding when loading to the fsensor
...
- We need to take into account additional 35mm move by the MMU.
- While the fsensor is not triggered, reduce the extruder movement each step from 20mm to 5mm. This should help reduce the variance in the filaments position before we run the final load to nozzle sequence.
2022-09-16 10:22:37 +02:00
450ce0fc64
Improve load to nozzle sequence
...
- Fixed a bug where the feed rate was 60x higher than intended
- Adjusted the sequence via trial and error. The sequence where the filament has not exited the nozzle is 35mm shorter than the previous implementation
- I reduced the feed rate slightly (by 1mm/s) on the fast load sequence
2022-09-16 10:22:37 +02:00
50cd6e77cc
Initial commit for loading filament to the nozzle
2022-09-16 10:22:37 +02:00
87ed42ba9b
Fix FW update needed button order
2022-09-16 10:22:37 +02:00
108f439bb7
Make sure the MMU error title never overflows on the LCD
2022-09-16 10:22:37 +02:00
68b007c759
Fix compile-time conversion MMU2 ErrorCode -> Prusa-Error-Code
...
and hide some of the implementation details into mmu2_error_converter.cpp
which makes the code in mmu_reporting.cpp much easier to read.
2022-09-16 10:22:37 +02:00
138a0d21c7
Change default selection parameter from bool to uint8_t
...
This allows us make any of the three button choices the default selection
2022-09-16 10:22:37 +02:00
89e2bc4d6b
Change name of variable 'yes' to be more descriptive
2022-09-16 10:22:37 +02:00
c1ec80817c
Update the error menu after merging new changes
...
Will test this tomorrow
2022-09-16 10:22:37 +02:00
c28354bf92
Update error codes + constexpr FindErrorIndex
...
Beware - requires avr-gcc 7.3!
2022-09-16 10:22:37 +02:00
6e1cf7e98c
Fixup
2022-09-16 10:22:37 +02:00
031c588802
Make all choice menus return consistent values
...
Such that left = 0, middle = 1, and right = 2
2022-09-16 10:22:37 +02:00
37bfd8ecd1
Checkpoint
...
- combined lcd_show_three_choices_prompt_P and lcd_show_two_choices_prompt_P into one function called lcd_show_choices_prompt_P
- Removed third_col parameter
- Added an enum to make the button selection result more readable
2022-09-16 10:22:37 +02:00
8dbb883971
Add helper macros to parse nibbles
...
Also made the button operations and nibbles constant since they should not be modified.
2022-09-16 10:22:37 +02:00
e6a3fa5e40
Remove unused includes after I moved the MMU error screen
2022-09-16 10:22:37 +02:00
83fefe10c1
Checkpoint:
...
- Rename lcd_show_multiscreen_message_two_choices_and_wait_P to lcd_show_multiscreen_message_with_choices_and_wait_P
- Move MMU error screen from ReportError() to ReportErrorHook()
- Fix the menu selection to work for menus with either two choices or three choices
- The buttons shown on the MMU error menu are now determined by the definition of btnOperation[]
2022-09-16 10:22:37 +02:00
96ff291f59
Implement PFW-1312 in MMU code
2022-09-16 10:22:37 +02:00
734e176445
Don't disable LCD updates in menu_item_function_P
2022-09-16 10:22:37 +02:00
ffe8c7c31a
Update lcd_show_multiscreen_message_two_choices_and_wait_P
...
to support 3 choices
2022-09-16 10:22:37 +02:00
39df6440ce
Allow LCD to be updated in manage_response loop
...
Also removed one TODO which David mentioned is not needed anymore
2022-09-16 10:22:37 +02:00
74ea9a7e43
Remove class LcdUpdateDisabler
...
Calling lcd_update_enable directly gives us more control
This also save a bit of flash memory
2022-09-16 10:22:37 +02:00
1ba314d95b
Print the MMU progress into status screen
2022-09-16 10:22:37 +02:00
15fbb93a8c
add that downwards facing >> character
2022-09-16 10:22:37 +02:00
b59c9da9ee
Move extruder when loading filament to fsensor
...
When the fsensor see filament, stop the extruder
2022-09-16 10:22:37 +02:00
96540d6e2d
Fix return value of WhereIsFilament()
...
getFilamentPresent returns the state of the IO pin of the sensor.
So we should use AT_FSENSOR instead of IN_NOZZLE
since the fsensor does not know if the filament is actually in the nozzle.
2022-09-16 10:22:37 +02:00
11290c1123
Add a read function for mmu_print_saved
...
and remove the old extern value which is not used anymore
I had to remove "MMU2::" from mmu2_protocol_logic.cpp, otherwise the build failed.
2022-09-16 10:22:37 +02:00
dcebad21c8
Add missing spaces to ErrorCode messages
...
Such that:
MMU2:E=32766ErrorTitleTextDescription
Becomes:
MMU2:E=32766 ErrorTitle TextDescription
Also simplified the process of combining ErrorTitle and TextDescription
into the msg buffer by using snprintf. This is saver since we only
use dstSize in one place instead of two.
2022-09-16 10:21:53 +02:00
6fab95f145
Fix PROGMEM read in ErrorCode message
...
This could cause the printer to crash. The Serial Stream would show
a garbled string.
Also included in this commit:
* The buffer size is increased from 64 bytes to 192 bytes. We need to
take into account the length of the ErrorTitle and ErrorDescription.
* Fix overwrite in ErrorCode message buffer.
2022-09-16 10:21:53 +02:00
52f7fb8c51
Add missing space in ProgressCode message
...
Such that:
MMU2:P=123EngageIdler
Becomes:
MMU2:P=123 EngageIdler
2022-09-16 10:21:53 +02:00
2142cb0849
Fix overwrite in ProgressCode message buffer
...
When snprintf() if called we need to read the return value to see how
many bytes were written. Then when we call strncpy_P() through
TranslateProgress(), we need to tell the code to start writing
at byte 'len', or &msg[len]. Also we need to update the byte size
which strncpy_P() is allowed to write (64 - len).
2022-09-16 10:21:53 +02:00
4b71466526
Fix PROGMEM read in ProgressCode message
...
This could cause the printer to crash. The Serial Stream would show
a garbled string and the same corruption would appear on the Status
Screen's status line.
2022-09-16 10:21:53 +02:00
d6044387d9
Fix crash in manage_response
...
The watchdog needs to be kicked in the for(;;) loop.
This is usually done by calling manage_heater before
manage_inactivity.
2022-09-16 10:21:53 +02:00
c0a6d1343a
Increase RX buffer size
2022-09-16 10:21:53 +02:00
c201a5791a
Implement MMU hw reset
2022-09-16 10:21:53 +02:00
cc177ec5ad
Remove old mmu.cpp
2022-09-16 10:21:53 +02:00
b27f690556
Add ProgressCodes -> text converter
2022-09-16 10:21:53 +02:00
9140ebba55
Add MMU FW version variables
...
hardcoded for now, but API ready
2022-09-16 10:21:53 +02:00
22287fec5d
Add original M600 MMU handling
...
seems to be almost unrelated to MMU function at all,
so returning it almost intact.
2022-09-16 10:21:53 +02:00
87d9f9aba7
Introduce MMU errors + their texts
2022-09-16 10:21:53 +02:00
74fad4f8f6
Implement fsensor raii event suppression
2022-09-16 10:21:53 +02:00
1211ad9360
Report state of fsensor into the MMU code
2022-09-16 10:21:53 +02:00
825eed97d4
Fix build after rebase
2022-09-16 10:21:53 +02:00
4fa4b3b2fc
Refactor Tx/Tc/T? commands
2022-09-16 10:21:53 +02:00
4732859a98
Avoid exposing internal variables of fsensor
...
makes the code a bit shorter as well, because the compiler can be sure
that the variables are not accessed from the outside of the
fsensor.cpp compilation unit.
2022-09-16 10:21:53 +02:00
db0374896f
Implement mmu2 serial interface
2022-09-16 10:21:53 +02:00
208e620660
Return ir_sensor_detected + related functionality
2022-09-16 10:21:53 +02:00
5870bbc524
Prune most of TODO from mmu2.cpp
...
+ refactor sound.h for better readability
2022-09-16 10:21:53 +02:00
2e293e90a0
MMU2 interface overhaul
...
First port of the new MMU2-printer interface into 8bit FW.
2022-09-16 10:21:53 +02:00
c27e4623c5
Fix build (??)
2022-09-16 10:20:32 +02:00
329745368e
Improve PAT9125 UI implementation
2022-09-16 10:20:32 +02:00
340bc87110
Checkpoint: jam detection
2022-09-16 10:20:32 +02:00
65b2881b06
PAT9125 first prototype
2022-09-16 10:17:33 +02:00
c5c4c21124
Update Sensor info menu documentation
2022-09-16 10:17:04 +02:00
bdfd3305cb
Cleanup pat9125.h
2022-09-16 10:17:04 +02:00
c46b97ec2d
Add base code for PAT9125_sensor
2022-09-16 10:17:04 +02:00
90b78616b7
Fix reinit on error
2022-09-16 10:17:04 +02:00
fba6d44f33
fsensor event blanking
2022-09-16 10:17:04 +02:00
52b44ad178
fsensor add deinit
2022-09-16 10:17:04 +02:00
ea23e6d924
Fix MK2 build?
2022-09-16 10:17:04 +02:00
bbe1b1145e
Correct ifdefs for all IR sensor types
2022-09-16 10:17:04 +02:00
a256370c39
Remove original marlin fsensor code
2022-09-16 10:17:04 +02:00
f9ff929bbe
Enable fsensor when preparing for shipping
2022-09-16 10:17:04 +02:00
d2bfe422f1
Separate runout and enabled settings
2022-09-16 10:17:04 +02:00
b741707c0e
Fsensor error state
2022-09-16 10:17:04 +02:00
cfe8444fe3
Revert menu hack
2022-09-16 10:17:04 +02:00
5484882758
Checkpoint after a lot of removal
2022-09-16 10:17:04 +02:00
8fae5e708e
Remove unused fsensor variables
2022-09-16 10:09:20 +02:00
fc49ba115a
Move more IR sensor analog stuff to Filament_sensor.h
2022-09-16 10:09:20 +02:00
b52022f6c6
More dead code removal
2022-09-16 10:08:39 +02:00
241c4cc86c
Remove dead code
2022-09-16 10:08:39 +02:00
6663f719f6
Remove old fsensor_init()
2022-09-16 10:08:39 +02:00
43db24e4fe
IR_sensor_analog voltage readings
2022-09-16 10:08:39 +02:00
7224b5c2b6
Remove OQ and add fancy autoload interaction
2022-09-16 10:08:39 +02:00
d84e6bda63
Remove old fsensor init
2022-09-16 10:07:49 +02:00
338f1f7615
IR volt debugging
2022-09-16 10:07:49 +02:00
f03922f7cf
Fix repeated autoload menu
2022-09-16 10:07:49 +02:00
45e43137a5
Filament sensor refactoring initial
2022-09-16 10:07:49 +02:00
ce0d8f2f12
Correct sensor orientation for old pat9125 init
2022-09-16 10:06:26 +02:00
4f08caaa2b
Shorter TWI timeout
2022-09-16 10:06:26 +02:00
47e610a2c6
Add disable() to swi2c as well
2022-09-16 10:06:26 +02:00
abbf2a3927
twi safe init
2022-09-16 10:06:26 +02:00
28c527fece
Use _check instead of register read for probe()
2022-09-16 10:06:26 +02:00
54b98c4e63
swi2c safe init
2022-09-16 10:06:26 +02:00
8b9bb23652
Unflip the hardcoded flip of the Y axis
2022-09-16 10:06:26 +02:00
f4dbf424e4
Use PAT9125 new init sequence
2022-09-16 10:06:26 +02:00
d706ebb556
Update forgotten MSG_ c=
2022-09-14 11:33:24 +02:00
6e3be50389
Clean up
2022-09-14 11:33:24 +02:00
f65e8ae5dd
Add MSG_ALWAYS
2022-09-14 11:33:24 +02:00
129b646c58
Fix MSG_ c=
...
Add MSG_ to messages.c/h
2022-09-14 11:33:24 +02:00
ee6821eb0e
Add missing MSG_ c= r=
2022-09-14 11:33:24 +02:00
270a1086ab
No translation needed
2022-09-14 11:33:24 +02:00
0a68de0bbe
Update MSG c=xx
...
Mark unused strings as `_n`
2022-09-14 11:33:24 +02:00
fd2d62dcd4
Set reserved space back after cherry-pick
2022-09-14 11:33:24 +02:00
83315d0494
Update config.h translation documentation and move language to group2
...
Update fw-build.sh
- Output used space of each translation (easier to troubleshoot)
- Read config.h max size per translation
- output variant .map files (easier to troubleshoot and finding missing/unused messages)
2022-09-14 11:33:24 +02:00
35c3e3ce68
Remove MSG_M117_V2_CALIBRATION
...
This message is never actually shown on the LCD (it's immediately
overwritten by other content). It also include g-code in a translatable
string, which is not a good idea. It's also otherwise identical to
MSG_V2_CALIBRATION, which we should have used.
Just remove it and save some space in the process.
2022-09-14 11:33:24 +02:00
c7354bdfe8
lang: Fix usage of new non-translated strings
...
Fix cherry-pick
2022-09-14 11:33:24 +02:00
7a80252556
lang: Add support for raw catalog references with _R
...
_R marks a raw catalog entry as Referenced (= used) for cases where the
catalog pointers are handled at a lower level.
2022-09-14 11:33:24 +02:00
Guðni Már Gilbert
D.R.racer
Alex Voinea
3d-gussner
Yuri D'Elia