Marek Bel
b67ec501b4
Add rename sheet menu.
2019-06-24 17:11:13 +02:00
Marek Bel
e6fbac08ed
Move sheet selector to submenu.
2019-06-21 15:44:56 +02:00
Marek Bel
19a474eaa5
Fix compiler warnings.
2019-06-20 18:00:29 +02:00
Marek Bel
0a48082609
Add steel sheet profile selector.
2019-06-20 16:40:53 +02:00
Renzo Dani
9a904362e5
code only for TMC2130
2019-06-20 10:17:48 +02:00
Renzo
e54497d802
added new function belt test under calibration menu
2019-06-20 00:09:55 +02:00
Marek Bel
89b578c899
Merge branch 'MK3' into multiple_sheets
2019-06-19 18:40:09 +02:00
Marek Bel
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
Marek Bel
6a272d83b1
Add compile time check for EEPROM stored varibles size.
2019-06-19 15:09:07 +02:00
Yuri D'Elia
2e073527fb
Also avoid E direction inversions while coasting
2019-06-19 14:28:04 +02:00
Marek Bel
64903e0ae8
Remove unused defines.
2019-06-19 14:27:02 +02:00
Yuri D'Elia
4b3af0d2df
Respect minimum direction change delay
2019-06-19 13:22:44 +02:00
Marek Bel
8b6629ad58
Fix comment grammar.
2019-06-18 20:00:02 +02:00
Marek Bel
ae9ae95187
MMU: Filter IR sensor signal when detecting whether filament tip passes to heat break. Increase number of tries when loading filament to 3.
2019-06-18 19:15:16 +02:00
KDanielK
6cb85a455f
Update mmu.cpp
2019-06-18 15:08:47 +02:00
Marek Bel
24cec4091b
Merge branch 'MK3' into sound
2019-06-17 17:28:19 +02:00
Marek Běl
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
Marek Bel
b1df1fb1f1
Fix formatting. We are never using 2 space indentation. 4 spaces are preferred, tabulator is acceptable if surrounding code uses tabs.
2019-06-14 18:18:27 +02:00
Yuri D'Elia
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
Voinea
d81970dd3d
Merge branch 'MK3' into MK3_Enable_fan_waiting_cooldown
2019-06-14 11:07:08 +03:00
DRracer
c5d130e763
Merge pull request #1914 from prusa3d/MK3_3.7.2
...
Increase version.
2019-06-14 09:39:41 +02:00
Marek Bel
fee67d9451
Increase version.
2019-06-13 16:37:51 +02:00
Marek Bel
6717590631
Merge branch 'MK3' into MK3_LA15
2019-06-13 15:39:50 +02:00
DRracer
55dc78546b
Merge pull request #1913 from mkbel/fix_spelling
...
Fix spelling.
2019-06-13 15:12:30 +02:00
Marek Bel
25f0eb9a39
Fix spelling.
2019-06-13 15:01:54 +02:00
Marek Bel
72f5e87c61
Merge branch 'MK3' into use_enum_class_2
2019-06-12 19:17:35 +02:00
Marek Bel
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
Marek Bel
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
Marek Bel
51df6cdfdc
Remove LcdCommands::Unknown3. Remove LcdCommands mapping to numbers, as it is not needed.
2019-06-12 18:54:37 +02:00
Marek Bel
cbb92860d0
Use first letter capital camel case for enum class members.
2019-06-12 18:54:32 +02:00
Marek Bel
0401490cc1
Use first letter capital camel case for enum class members.
2019-06-12 18:54:25 +02:00
Marek Bel
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
MRprusa3d
b7d3766ae2
Merge branch 'MK3' into PFW-790
2019-06-12 17:32:13 +02:00
Marek Bel
6dd085bcc5
Use first letter capital camel case for enum class members.
2019-06-12 16:44:07 +02:00
Marek Bel
e393d91b12
Use first letter capital camel case for enum class members.
2019-06-12 16:20:21 +02:00
Marek Bel
cc80bfa020
Merge branch 'MK3' into use_enum_class
2019-06-12 16:04:26 +02:00
DRracer
c7e1e73880
another almost 200B down by proper usage of smaller data types and enum
...
classes
2019-06-12 15:41:55 +02:00
DRracer
94a5175980
Code size reduction - saved almost 2KB
2019-06-12 15:41:34 +02:00
DRracer
8d388fa03a
Merge pull request #1911 from mkbel/layer1_cal_flash
...
Layer1 cal flash
2019-06-12 15:40:59 +02:00
Marek Bel
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
DRracer
b15bbaf177
for cycles' variables: int -> uint8_t where appropriate, part1
2019-06-12 14:58:15 +02:00
Marek Bel
7ac098a135
Refactor. Put constants needed in functions inside fuctions to limit its scope.
2019-06-12 14:20:20 +02:00
Marek Bel
2755a3733d
Document.
2019-06-12 14:15:58 +02:00
Marek Bel
342954b88c
Refactor. Make constants producing first layer calibration square more clear. Note layer height discrepancy.
2019-06-12 13:31:17 +02:00
DRracer
4f8ed7f123
for cycles' variables: int -> uint8_t where appropriate, part1
2019-06-12 10:31:09 +02:00
DRracer
baa36ce740
another almost 200B down by proper usage of smaller data types and enum
...
classes
2019-06-12 09:58:42 +02:00
Marek Bel
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
Marek Bel
60cc3d58ec
Use sprintf_P in first layer calibration. Save 30B of FLASH memory.
2019-06-11 20:00:49 +02:00
Marek Bel
47a183e96e
Use loop to enquecommand_P() in first layer calibration. Save 126B of FLASH memory.
2019-06-11 19:49:56 +02:00
Marek Bel
21f4669600
Make count_e() constexpr.
2019-06-11 19:22:08 +02:00
Marek Bel
4effff9e99
Use loop to enquecommand_P() in first layer calibration. Save 10B FLASH memory.
2019-06-11 18:56:29 +02:00
Marek Bel
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
Marek Bel
97a5d6b5f4
Make constants const.
2019-06-11 17:30:37 +02:00
Marek Bel
9b1e3213ae
Variable lcd_commands_step doesn't need to be global.
2019-06-11 17:30:19 +02:00
DRracer
58948cffcd
Code size reduction - saved almost 2KB
2019-06-11 17:23:01 +02:00
Marek Bel
0c9121e99e
Use loop to enquecommand_P() in first layer calibration.
2019-06-11 17:08:56 +02:00
DRracer
f20125a3e2
Code size reduction - saved almost 2KB
2019-06-11 16:24:40 +02:00
Marek Běl
cb6a3e7e12
Merge pull request #1907 from DRracer/fan_check_error_fix
...
Do not allow resume printing if fans are still not ok
2019-06-11 15:12:48 +02:00
DRracer
13c3ab14fa
test fan check error only when enabled by #ifdef
2019-06-11 15:05:40 +02:00
DRracer
3e37150552
Do not allow resume printing if fans are still not ok
2019-06-11 14:53:10 +02:00
Marek Bel
27145204ed
Use internationalized M117, but anyway the text is not shown.
2019-06-10 21:40:12 +02:00
Marek Bel
4be8fa701e
Use loop to enquecommand_P() in first layer calibration.
2019-06-10 20:41:18 +02:00
Yuri D'Elia
c40e3b550d
Remove stubs and live K by default
2019-06-10 19:34:00 +02:00
NotaRobotexe
bb980e2fca
sound edit, delete mute mode, add blind mode
2019-06-10 15:03:52 +02:00
Marek Běl
28e7772421
Merge pull request #1886 from leptun/MK3_fix_load_filament_5
...
Fix Load Filament 5 for MMU2
2019-06-10 14:45:55 +02:00
Marek Běl
327e6cd39b
Merge pull request #1889 from DRracer/fan_check_error_fix
...
Fan check error fix
2019-06-06 15:52:44 +02:00
DRracer
0cf6bc0677
Merge pull request #1903 from mkbel/filament_runout_mk3_2
...
Filament runout mk3 2
2019-06-06 15:51:35 +02:00
DRracer
83578c3389
documentation + minor code cleanup based on code review
2019-06-06 15:50:13 +02:00
Yuri D'Elia
0239f4bce1
Update/compute advance steps inside calculate_trapezoid_for_block
...
Do not store the block e_D ratio, store directly the computed
compression factor so that we can recompute the advance steps
quickly and update them in sync with the acceleration rates.
2019-06-05 20:25:26 +02:00
Yuri D'Elia
048628083a
Remove clear_current_adv_vars()
...
The pressure state is already reset implicitly at the end of each block,
meaning an extruder switch will never have to reset the internal state
anyway.
We clear the internal backpressure in the following conditions:
- when switching to a non-LA block
- when quickStop is called
- when the scheduler is idling (losing pressure)
2019-06-05 20:25:19 +02:00
Yuri D'Elia
7d33089d9a
Remove use_advance_lead
...
The per-step state is kept implicitly using nextAdvanceISR,
while the current pressure is decoupled anyway.
2019-06-05 20:25:12 +02:00
Yuri D'Elia
dc436b71fe
Fix position_float after a quickStop condition
2019-06-05 20:25:05 +02:00
Yuri D'Elia
fa454f61e4
Drop unused "speed_lookup_table.h" from planner.cpp
2019-06-05 20:24:58 +02:00
MRprusa3d
1d8c24e8a9
"disable_z()" for Delta PSU IV
...
correction for (motor) mode switching
2019-06-05 19:22:04 +02:00
Marek Bel
19351df8a7
Extracted computation of z_shift for M600 into a separate function to
...
improve readability. Surprisingly, also the code got shorter.
2019-06-05 18:34:26 +02:00
Marek Bel
9c3bb14bae
remove function forward decl: fsensor_restore_print_and_continue_IR
...
revert LCD_BL_PIN change
2019-06-05 18:34:10 +02:00
DRracer
aeed49a80e
Fix filament runout on optical filament sensors
...
Reworked the IR variant accordingly
Some code-size optimization in related functions
2019-06-05 18:33:41 +02:00
DRracer
10247a28a3
Merge pull request #1896 from NotaRobotexe/power_panic
...
documentation for power panic
2019-06-05 16:10:04 +02:00
NotaRobotexe
0cab2284ea
PFW-874 new firmware alert timeout
2019-06-05 15:48:10 +02:00
NotaRobotexe
14270ac1f6
power panic documentation
2019-06-05 15:10:51 +02:00
NotaRobotexe
d263728c37
documentation
2019-06-05 14:55:59 +02:00
DRracer
33b2aa5e58
Merge pull request #1894 from NotaRobotexe/power_panic
...
Power panic Z axis fix
2019-06-05 13:34:21 +02:00
NotaRobotexe
2c4e98dc27
power panic improvement
2019-06-05 13:12:08 +02:00
Yuri D'Elia
cda9ed4a1d
Reset LA state more carefully during stop conditions
2019-06-04 16:22:40 +02:00
Yuri D'Elia
1bed8cfa94
Don't call fsensor_st_next_block repeatedly during the last step
...
Rely on st_block_begin to perform a single call instead of calling
block_chunk for each advance tick in the last step
2019-06-04 16:22:33 +02:00
Yuri D'Elia
8ce1c04740
Remove useless "extruder under pressure" flag
...
That's exactly what LA does
2019-06-04 16:22:27 +02:00
Yuri D'Elia
bca5618145
Save/restore K during a power panic
2019-06-03 17:33:19 +02:00
Yuri D'Elia
84009e1e8e
Do a full fsensor_update() when initializing the sensor
...
This correctly populates the "extruder info" details even when
the menu is entered for the first time after starting a print.
2019-06-03 17:32:57 +02:00
Yuri D'Elia
fa7c0fb2c9
Avoid triggering LA during a Z-priming move
...
When recovering from a pause, the nozzle is often primed while
being lowered. If LA is triggered under such a move, the pressure
advance will be wasted.
2019-06-03 17:32:51 +02:00
Yuri D'Elia
d2432056bd
Elide fsensor_st_block_begin, saving some cycles/bytes
2019-06-03 17:32:43 +02:00
DRracer
5985c0608e
Revert changes to pins_Einsy_1_0.h not related to the fan check error
...
fix
2019-06-03 09:02:27 +02:00
Yuri D'Elia
5cd0177389
Cleanup fsensor_st_block_begin
2019-06-02 18:17:59 +02:00
Yuri D'Elia
b4bf79297f
Remove unneeded includes from fsensor
2019-06-02 01:08:03 +02:00
Yuri D'Elia
c50b1c0351
Rework the filament counter logic
...
- Move direction checks out of fsensor: fsensor_counter is now
always in the same direction as e_steps
- Check the filament chunk after e_steps have been physically done,
using the real e_step count so far
2019-06-01 22:08:00 +02:00
DRracer
09fee4e64d
remove fan error simulation automaton
2019-05-31 11:30:30 +02:00
DRracer
6755791778
Fix repeated fan error checking
2019-05-31 11:29:11 +02:00
DRracer
adb5baa12b
Merge remote-tracking branch 'upstream/MK3' into MK3
2019-05-31 11:05:24 +02:00
DRracer
ebfad55617
Merge pull request #1888 from mkbel/always_cut_independent
...
Always cut independent
2019-05-31 07:00:37 +02:00
Marek Bel
00da4640e2
Document.
2019-05-30 23:29:33 +02:00
Marek Bel
e79c203c96
Do not always cut if it is not enabled from menu.
2019-05-30 23:04:06 +02:00
Marek Bel
ccb649b1f6
Add always cut experimental / for testing feature.
2019-05-30 23:03:59 +02:00
Marek Bel
18122049a6
Fix cut filament menu item labels.
2019-05-30 19:36:10 +02:00
Voinea
878e866401
Fix Load Filament 5 for MMU2
2019-05-30 17:28:02 +03:00
NotaRobotexe
e9c870e7a0
fix of fixof power panic
2019-05-29 20:33:22 +02:00
NotaRobotexe
3b2cbc68d8
PFW-571 send PRN:4 instead PRN:1 while changing filament
2019-05-28 18:22:34 +02:00
DRracer
1c619133a3
Merge pull request #1880 from NotaRobotexe/power_panic
...
PFW-828 add uvlo tiny z positio back
2019-05-28 14:29:13 +02:00
NotaRobotexe
bcb6129c29
delete comment
2019-05-28 14:11:38 +02:00
NotaRobotexe
8842d16832
add back uvlo tiny z positio
2019-05-28 13:50:21 +02:00
DRracer
326c061d8c
testing pin 5
2019-05-27 18:27:24 +02:00
DRracer
2f96badef4
Merge pull request #1870 from NotaRobotexe/power_panic
...
PFW-828 after power panic printer start print in the air
2019-05-27 17:13:08 +02:00
Marek Běl
9c3b93f900
Merge pull request #1869 from DRracer/fix_mintemp_and_fsensor
...
Fix MINTEMP errors and fsensor runout
2019-05-27 16:32:22 +02:00
DRracer
253087a4c5
Code cleanup
2019-05-27 16:18:21 +02:00
DRracer
4d020d99f6
Code cleanup
2019-05-27 14:57:02 +02:00
Yuri D'Elia
51d6904dad
Multiply the step rate when grouping advance steps
2019-05-27 14:44:09 +02:00
NotaRobotexe
f070a10904
edit
2019-05-27 10:10:24 +02:00
Yuri D'Elia
a742afcebd
Remove version check
2019-05-26 22:43:06 +02:00
Yuri D'Elia
4772532524
Allow Live-K to be used on stock 3.7.1 using a stub
2019-05-26 22:14:31 +02:00
Yuri D'Elia
47d2562510
Typos
2019-05-26 21:06:29 +02:00
Yuri D'Elia
823f7b069c
Fix filament sensor direction again
2019-05-26 21:06:22 +02:00
Yuri D'Elia
9d834925c0
Recalculate LA_phase correctly
2019-05-26 17:06:21 +02:00
Yuri D'Elia
3abb2188df
Fixup initial error by defect
2019-05-26 16:59:45 +02:00
Yuri D'Elia
ab478ec281
Save another 144b by avoiding a calc_timer copy
2019-05-26 16:42:03 +02:00
Yuri D'Elia
20694aeabc
Save 316 bytes by avoiding advance_spread copies
2019-05-26 16:41:56 +02:00
Yuri D'Elia
a28fb65bb2
Optimize advance_spread further
2019-05-26 16:41:50 +02:00
Yuri D'Elia
daa8007de5
Allow to exclude Live K from the build
2019-05-26 16:41:45 +02:00
Yuri D'Elia
6f6cef65b5
Revert "Correctly handle direction for the filament sensor"
...
This reverts commit aae03ad83e
.
2019-05-26 16:41:37 +02:00
Yuri D'Elia
bddc3e84ab
Use WRITE_NC directly in the isr
2019-05-25 21:52:06 +02:00
Yuri D'Elia
aae03ad83e
Correctly handle direction for the filament sensor
2019-05-25 21:51:59 +02:00
Yuri D'Elia
935a798236
Speedup advance_spread for common divisors
2019-05-25 21:51:52 +02:00
Yuri D'Elia
fa7ecfc38e
Check for serial roughtly in the middle of the stepper isr
2019-05-25 18:41:28 +02:00
Yuri D'Elia
0a26de1e7f
Allow to live-tune K during a print
2019-05-25 18:41:21 +02:00
NotaRobotexe
55a2d588f1
PFW-828 printing in the air after power panic
2019-05-24 18:30:58 +02:00
NotaRobotexe
69455bfc75
PFW-828 fix printing in the air after power panic
2019-05-24 18:28:16 +02:00
Yuri D'Elia
282b502393
Improve the distribution of the advance steps
2019-05-24 17:08:32 +02:00
Yuri D'Elia
294bf4068d
Improve debug messages
2019-05-24 17:08:32 +02:00
Yuri D'Elia
53b77bab36
Do not operate on the prev block when already in use
2019-05-24 17:08:32 +02:00
Yuri D'Elia
aae5cce28f
Use the nominal frequency to merge ticks
2019-05-24 17:08:32 +02:00
Yuri D'Elia
c6dbcc494f
Typo
2019-05-24 17:08:32 +02:00
Yuri D'Elia
942c38c18b
Minor reformatting
2019-05-24 17:08:32 +02:00
Yuri D'Elia
9586d71adb
Mention LA_DEBUG_LOGIC
2019-05-24 17:08:32 +02:00
Yuri D'Elia
a1be8b6784
Initialize current_adv_steps correctly
...
Initialize at 0 both on startup and on reset on regular (non-LA)
segments to avoid cumulating errors.
2019-05-24 17:08:32 +02:00
Yuri D'Elia
707849e6c4
Use a define instead of hard-coding a divider
2019-05-24 17:08:32 +02:00
Yuri D'Elia
a2fa8e5313
Rewrite the advance_isr scheduler
2019-05-24 17:08:32 +02:00
Yuri D'Elia
2d3fe3197c
Move calc_timer into speed_lookup_table for planner reuse
2019-05-24 17:08:32 +02:00
Yuri D'Elia
9425b6b07a
Planner: do not recalculate max_adv_steps, since it doesn't change
2019-05-24 17:08:32 +02:00
Yuri D'Elia
2c8e04bd5f
Planner: use the correct block when updating LA factors
2019-05-24 17:08:32 +02:00
Yuri D'Elia
3b528196dd
Fixup prefix echomagic for the LA config report
2019-05-24 17:08:32 +02:00
Yuri D'Elia
520cb491b2
Move speed lookup defs into a separate source
2019-05-24 17:08:32 +02:00
Yuri D'Elia
ebdc5e35e7
Remove two more OCR1A direct manipulations
...
Use _NEXT_ISR and st_reset_timer to correctly reinitialize and
re-schedule the advance ticks.
2019-05-24 17:08:32 +02:00
Yuri D'Elia
cbf1a85ec3
Switch original LA implementation with LA1.5
...
This discards several Prusa optimizations for LA1.0.
We'll re-implement those later if needed.
Debugging is turned on.
2019-05-24 17:08:32 +02:00
Yuri D'Elia
bf0c60dd45
Factor-out some repetition into fsensor_step
2019-05-24 17:08:32 +02:00
Yuri D'Elia
124540a06f
Adapt LA changes to ConfigurationStore
2019-05-24 17:08:32 +02:00
Yuri D'Elia
45563bfdd3
Formatting sanity
2019-05-24 17:08:32 +02:00
Yuri D'Elia
eeea2725cb
Partial LA15 support
2019-05-24 17:08:32 +02:00
DRracer
098c0979ba
Merge pull request #1848 from MRprusa3d/PFW-853
...
recovery from "Stop()"
2019-05-24 09:54:07 +02:00
DRracer
9cb0bc7bcf
Fix MINTEMP errors and fsensor runout
2019-05-24 08:46:44 +02:00
NotaRobotexe
1399d7dcc8
support only for MK3/MK3S
2019-05-23 15:22:31 +02:00
Marek Běl
df02030fe0
Merge pull request #1863 from DRracer/lcd20190523
...
Fix. menu texts and formatting - issues PFW-877 and PFW-879
2019-05-23 14:31:51 +02:00
Ondrej Tuma
63235625ab
pause printer by flag
2019-05-23 13:13:11 +02:00
DRracer
e17f3f8405
change language files accordingly
2019-05-23 11:14:26 +02:00
DRracer
da98977de3
Fix. menu texts and formatting - issues PFW-877 and PFW-879
2019-05-23 10:45:55 +02:00
MRprusa3d
a408f90659
recovery from "Stop()"
2019-05-18 21:28:59 +02:00
Marek Bel
15ba17f110
Fix translator columns hint for Adjusting Z:
2019-05-16 17:30:15 +02:00
Marek Bel
74d8c15b4f
Fix documentation.
2019-05-16 17:23:54 +02:00
Marek Bel
dcfc6348ed
Fix documentation.
2019-05-16 17:22:47 +02:00
DRracer
a453c6fc9d
Save 236B by improving functions in menu.cpp. Beware - the label now has
...
to come with a ':' as its last character. Changed language files along
with this commit too.
2019-05-16 16:43:44 +02:00
Marek Bel
dad2065da6
Merge branch 'MK3' into rise_z
2019-05-15 16:37:17 +02:00
Marek Bel
1f3877b221
Extract duplicate code into function. Saves 4B of flash.
2019-05-15 16:31:10 +02:00
Marek Běl
fbc0c260b1
Merge pull request #1826 from ondratu/selftest_wizard
...
Selftest fan improvements
2019-05-15 13:43:48 +02:00
Ondrej Tuma
ebfc8c1c79
Fan autotest for swapping in Selftest
2019-05-15 10:10:46 +02:00
Ondrej Tuma
c851e158cc
Manual fan check menu have default (selected) option
2019-05-15 10:10:46 +02:00
Marek Bel
1a78bd53ba
Fix compiler warning
...
sketch/Marlin_main.cpp: In function 'void marlin_wait_for_click()':
sketch/Marlin_main.cpp:9646:12: warning: unused variable 'busy_state_backup' [-Wunused-variable]
2019-05-14 19:11:46 +02:00
Marek Bel
91e72a79f0
Fix compiler warning
...
sketch/Marlin_main.cpp:871:13: warning: unused variable 'ir_detected' [-Wunused-variable]
2019-05-14 19:07:50 +02:00
Marek Bel
acfcd59369
Fix compiler warning:
...
sketch/menu.cpp: In function 'int menu_draw_item_puts_P(char, const char*, char)':
sketch/menu.cpp:184:1: warning: no return statement in function returning non-void [-Wreturn-type]
2019-05-14 18:32:40 +02:00
Marek Bel
89fc9e7f92
sketch/menu.h:90:115: warning: invalid conversion from 'void (*)(int)' to 'void (*)(uint8_t) {aka void (*)(unsigned char)}' [-fpermissive]
...
#define MENU_ITEM_FUNCTION_NR_P(str, number, func, fn_par) do { if (menu_item_function_P(str, number, func, fn_par)) return; } while (0)
^
sketch/ultralcd.cpp:5926:5: note: in expansion of macro 'MENU_ITEM_FUNCTION_NR_P'
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', extr_adj, 0); ////MSG_LOAD_FILAMENT_1 c=16
2019-05-14 18:25:43 +02:00
Marek Bel
66d20f0297
Fix code formatting (indentation).
2019-05-14 16:45:15 +02:00
Marek Bel
4de93ca19c
Fix eject filament menu items numbering.
2019-05-14 16:43:33 +02:00
Marek Bel
150787efbd
Generate menu item texts Cut filament <nr.> during runtime to conserve flash.
2019-05-14 16:25:29 +02:00
Marek Bel
6495a8fa58
Decrease flash reserved for secondary language.
2019-05-14 16:10:04 +02:00
Marek Bel
7c4f66181f
Generate menu item texts Load filament <nr.> and Eject filament <nr.> during runtime to conserve flash.
2019-05-14 15:47:25 +02:00
Marek Běl
dddc1b84e6
Merge pull request #1825 from prusa3d/MK3_3.7.1
...
Increase version 3.7.1 final.
2019-05-13 17:29:30 +02:00
Marek Běl
efa8e6e6ba
Merge pull request #1658 from Harpalyke/save-ustep-res-with-M500
...
Allow save of uStep resolution with M500
2019-05-13 17:08:34 +02:00
Marek Bel
e93f043fee
Increase version 3.7.1 final.
2019-05-13 15:09:58 +02:00
Marek Běl
bbd1b60229
Merge pull request #1437 from craiglink/memory-overrun
...
set array size correctly to 4
2019-05-11 03:01:52 +02:00
Marek Běl
12b801fa1f
Merge pull request #1397 from jhoblitt/plumbing/sh-chmod
...
make all shell scripts executable
2019-05-11 02:37:09 +02:00
Marek Běl
0a343d4d66
Merge pull request #1806 from NotaRobotexe/fw_check
...
check if firmware is on right type of printer
2019-05-11 02:11:54 +02:00
Marek Běl
176b28bc83
Merge pull request #1813 from prusa3d/MK3_3.7.1
...
Enable watchdog for all variants.
2019-05-10 17:33:44 +00:00
Marek Bel
a9d6ae296b
Enable watchdog for all variants.
2019-05-10 16:30:08 +02:00
Marek Běl
2a39fad400
Merge branch 'MK3' into bugfixes
2019-05-10 13:43:36 +00:00
Marek Běl
084c6f2700
Merge pull request #1805 from DRracer/MK3
...
PFW-844
2019-05-10 13:41:59 +00:00
Marek Bel
5707d4b85c
Set all target hot ends to 0 deg. Celsius instead of just hotend nr. 0 to be more safe with custom modifications.
2019-05-10 15:27:25 +02:00
DRracer
dc4f30530d
Fix a number overflow to last line of LCD when doing large extruder in
...
menu Settings -> Move axis -> Extruder
2019-05-09 13:44:35 +02:00
DRracer
714fb23de6
Merge remote-tracking branch 'upstream/MK3' into MK3
2019-05-09 13:40:28 +02:00
NotaRobotexe
e7dd5c60d3
check if firmware is on right type of printer
2019-05-07 18:10:44 +02:00
Marek Běl
8692565cf0
Merge pull request #1802 from XPila/MK3
...
Variable bed PWM resolution/frequency (adjusted to 5bits/32Hz)
2019-05-07 15:13:02 +00:00
DRracer
f431d24762
Merge branch 'MK3' of https://github.com/DRracer/Prusa-Firmware into MK3
2019-05-07 16:17:14 +02:00
DRracer
0124fbf9ee
Fix: display target extruder temperature on the main screen when doing
...
PID calibration
2019-05-07 16:15:42 +02:00
Robert Pelnar
85806a0f38
variable bed pwm frequency fix (input value is 7bit, not 8bit)
2019-05-07 15:35:34 +02:00
Ondrej Tuma
b7fe43bf68
Deleted bad cols/rows definitions for translation.
2019-05-07 12:52:23 +02:00
Robert Pelnar
58683da2fb
Variable bed PWM resolution/frequency (adjusted to 5bits/32Hz)
2019-05-06 18:07:42 +02:00
Marek Běl
e56be687bb
Merge pull request #1800 from XPila/MK3
...
return with exitcode 1 if any language not generated properly
2019-05-06 15:58:34 +00:00
Marek Bel
1a0370e1c7
Make macro ON_MENU_LEAVE() usage similar to macros MENU_ITEM_BACK_P() and MENU_ITEM_FUNCTION_P().
2019-05-06 17:39:00 +02:00
Robert Pelnar
fa1bdd6ab1
Lang - decreased reserved space for secondary language (10496 bytes)
2019-05-06 17:29:47 +02:00
DRracer
ffbdb43881
Remove commented code
2019-05-06 17:26:42 +02:00
Robert Pelnar
41a827fa00
Removed unused texts, increased reserved space to 0x2e00 (11776 bytes)
2019-05-06 17:24:06 +02:00
DRracer
0794430208
Fix for linearity correction not being stored to EEPROM when doing MENU-
...
UP
2019-05-06 15:33:13 +02:00
Robert Pelnar
1c9d134c62
return with exitcode 1 if any language not generated properly
...
fix - include system_timer.h
2019-05-06 15:29:57 +02:00
DRracer
e5911c42da
limit printed menu text to max 18 characters
2019-05-06 12:44:36 +02:00
Robert Pelnar
3852aa4275
Different secondary language reserved space for MK3 and MK25
2019-04-30 12:42:18 +02:00
Marek Běl
177c123b4d
Merge pull request #1780 from MRprusa3d/PFW-841
...
"stop" immediately after "pause" patch
2019-04-29 14:49:49 +00:00
Marek Bel
8fadbf1b44
Do not call watchdog reset from updateTemperaturesFromRawValues().
2019-04-29 16:41:38 +02:00
MRprusa3d
b93f37ee02
"stop" immediately after "pause" patch
2019-04-29 14:39:19 +02:00
Robert Pelnar
18dec75b56
MK2.5 - watchdog enabled + test (command "D-1")
2019-04-29 13:19:59 +02:00
NotaRobotexe
f16bea26e5
raise the Z axis before filament loading to nozzle on MMU2S
2019-04-25 17:39:09 +02:00
XPila
238079fc95
Merge pull request #1763 from mkbel/save_flash_timer2
...
Do not compile timer02.c if not used. Saves 148B flash.
2019-04-24 16:07:17 +02:00
mkbel
e8e7fa907f
Change comment
2019-04-24 15:52:24 +02:00
Robert Pelnar
1d8b2b3e18
Secondary language reserved space resized
2019-04-24 15:22:17 +02:00
Marek Bel
f25f8f1b71
Do not compile timer02.c if not used. Saves 148B flash.
2019-04-23 19:39:49 +02:00
mkbel
ca449ef517
Merge pull request #1742 from XPila/MK3-bed_pwm_revert
...
Bed high frequency PWM disabled
2019-04-16 21:04:28 +00:00
Marek Bel
75fac9dab2
Do not kill printer if External SPI flash W25X20CL is not responding.
...
Remove internationalization macro for this message. It has no sense to be translated as internationalization in most cases doesn't work if it is not responding.
Show this message instead of splash screen if the error is encountered.
There is no additional delay or wait for click, as such functions doesn't work in setup function.
2019-04-16 22:20:53 +02:00
Robert Pelnar
1f9737b4a6
Bed high frequency PWM disabled
2019-04-16 16:48:01 +02:00
Paul Bransford
863c7158b2
use modification times for sdcard sort
2019-04-16 06:24:47 -04:00
PavelSindler
7168c09eec
Merge pull request #1713 from mkbel/fix_octoprint_mmu_load_failed
...
Fix octoprint mmu load failed
2019-04-10 18:21:06 +02:00
MRprusa3d
b5f196406e
(preliminary) fix @ preHeatError II
2019-04-10 00:29:58 +02:00
Marek Bel
0d3e3c506a
Merge remote-tracking branch 'prusa3d/MK3' into fix_octoprint_mmu_load_failed
2019-04-09 20:54:21 +02:00
Marek Bel
c7d403733a
Allow load filament retry after button push unlimited times in case mmu_continue_loading() is in blocking mode.
2019-04-09 20:50:29 +02:00
MRprusa3d
32f3471862
print parameters checking
...
prusa_stat_diameter()
2019-04-09 15:22:08 +02:00
Voinea
173062295f
Enable print fan while waiting for cooldown
2019-04-06 13:42:21 +03:00
Marek Bel
84cabd3836
Change busy_state type, save 340B of flash
2019-04-05 15:20:34 +02:00
Marek Bel
bf57a59147
Extract duplicate code into function. Saves 106B flash.
2019-04-05 15:12:35 +02:00
Marek Bel
4bfa3d7e0b
Reporty busy: paused for user in case MMU is not responding.
2019-04-04 19:04:15 +02:00
Marek Bel
bf1a55ab02
Add mmu_continue_loading blocking variant and use it for usb printing, so that "ok" is not returned to the controller in case MMU load failed.
...
Known limitation: MMU load failed is not handled properly if it happens again after user clicked printer button to continue print.
2019-04-04 18:15:37 +02:00
MRprusa3d
aa0edd09f5
(preliminary) fix @ (bed) preHeatError
2019-04-03 22:48:58 +02:00
MRprusa3d
4b1fc69088
"disable_z()" for Delta PSU III
...
stealthChop set if motor-disable (@ Z) required
2019-04-02 20:04:44 +02:00
PavelSindler
fd96bde69f
Merge pull request #1667 from mkbel/Add_IR_sensor_fail_message
...
Add ir sensor fail message
2019-04-02 14:55:27 +02:00
PavelSindler
a8d8d9e4c9
version change
2019-04-01 20:52:24 +02:00
PavelSindler
c440ca7369
Revert "Phase correct PWM for bed, frequency 40KHz."
2019-04-01 18:44:13 +02:00
PavelSindler
ae11c1e26f
rename function
2019-03-28 16:39:56 +01:00
PavelSindler
97594c83bb
function misleading names changed
2019-03-28 14:58:58 +01:00
PavelSindler
96a111119b
document
2019-03-28 14:52:50 +01:00
PavelSindler
8f69d5a501
document
2019-03-28 14:48:35 +01:00
PavelSindler
1dd486d86d
max length of menu item strings added
2019-03-28 13:18:28 +01:00
PavelSindler
d22793f276
Z-probe nr. states reduced to 1; 3; 5
2019-03-28 12:02:46 +01:00
PavelSindler
02faadf0b9
MMU mode renamed
2019-03-28 09:49:08 +01:00
PavelSindler
e7900aeaa1
Merge remote-tracking branch 'upstream/MK3' into 7x7_polishing
2019-03-28 08:08:54 +01:00
PavelSindler
c1da07bda0
Merge pull request #1653 from XPila/MK3
...
Phase correct PWM for bed, frequency 40KHz.
2019-03-27 21:07:15 +01:00
PavelSindler
e259967991
remove / comment debug code
2019-03-27 20:41:45 +01:00
PavelSindler
5863297538
if deviation between current Z-probe and avg, value > 50um, enlarge Z-probe movements and repeat measurement
2019-03-27 20:25:00 +01:00
PavelSindler
a9ce38df71
Function for decision if we have valid Z-calibration data in eeprom fixed, mesh bed leveling: possible crash fix, temporaty debug info on serial line.
2019-03-26 17:14:05 +01:00
MRprusa3d
17a534e42b
"disable_z()" for Delta PSU II
2019-03-25 23:28:25 +01:00
Marek Bel
baeee5817e
Make lcd_selftest_error() calls safer, as nullptr parameter is not handled. It is hard to believe, but it actually saves 4B flash.
2019-03-22 00:24:22 +01:00
Marek Bel
966e772702
Fix compile error for non TMC2130 endstops check.
2019-03-22 00:14:29 +01:00
Marek Bel
89f1a3bacf
Fix compile error for non TMC2130 pulley check.
2019-03-22 00:11:02 +01:00
Marek Bel
8582babddb
Fix compile error for manual fan check.
2019-03-22 00:08:44 +01:00
Marek Bel
d1c5c03907
Fix compile error for manual fan check.
2019-03-22 00:03:14 +01:00
Marek Bel
c45a7f8641
Fix 1_75mm_MK3-EINSy10a-E3Dv6full variant build error.
2019-03-21 23:50:01 +01:00
Marek Bel
91779a5d04
Add filament sensor false triggering message.
2019-03-21 23:36:59 +01:00
Marek Bel
ba23b1b2c5
Remove unused.
2019-03-21 22:50:46 +01:00
Marek Bel
6c28ed6349
Convert lcd_selftest_error() first parameter to enum class.
2019-03-21 22:48:57 +01:00
PavelSindler
fbe68cb287
variables scope changed
2019-03-21 19:37:34 +01:00
PavelSindler
576bfb17c7
whitespace
2019-03-21 18:51:54 +01:00
PavelSindler
175f840d16
return statement not used (fixes Pronterface issues)
2019-03-21 18:46:07 +01:00
MRprusa3d
632781c4a2
"disable_z()" for Delta PSU
2019-03-21 00:45:15 +01:00
Harpalyke
0f21ccee3c
Adding the microstepping resolution for all axis to the eprom config which is persisted during M500 for Mk3 and Mk3S
2019-03-19 21:39:59 +00:00
MRprusa3d
7d98177716
farmMode updates
2019-03-19 19:48:40 +01:00
Robert Pelnar
cfd185f315
Phase correct PWM for bed, frequency 40KHz.
2019-03-19 14:50:57 +01:00
Marek Bel
4100bd33a7
Fix Dcodes compilation errors and warnings.
2019-03-19 13:53:58 +01:00
PavelSindler
e37c2e0b2e
version change
2019-03-15 20:01:02 +01:00
PavelSindler
7c5e9500a8
version change
2019-03-15 20:00:07 +01:00
PavelSindler
c05561d6b1
Merge pull request #1607 from PavelSindler/7x7
...
7x7 mbl and switching mmu modes
2019-03-15 19:55:15 +01:00
PavelSindler
0ca52216f3
Revert "variants update"
...
This reverts commit c3a95ab79b
.
2019-03-15 13:14:32 +01:00
Marek Bel
ffe45bdef3
Disable mmu filament cutter feature.
2019-03-15 03:38:37 +01:00
PavelSindler
80ef2686ae
mmu mode switching fix
2019-03-14 18:17:40 +01:00
PavelSindler
6e26f61726
fixed 7x7 mesh bed leveling vs. Z calibration check
2019-03-14 14:48:01 +01:00
PavelSindler
ef198856a4
increase relative movement in Z to work better with higher hysteresis PINDAs
2019-03-14 14:10:52 +01:00
PavelSindler
9e0e4198c5
Mesh by 3d-gussner, fixed difference between mbl points coordinates and coordinates used in planner for corrections, mbl settings menu update
2019-03-14 01:52:44 +01:00
MRprusa3d
1f131f66e0
print parameters checking
...
nozzle diameter
2019-03-14 00:36:56 +01:00
PavelSindler
72f51989fa
compare measured Z-value during mesh bed leveling with Z-calibration value even for 7x7 mesh
2019-03-13 19:41:09 +01:00
PavelSindler
32138ea09a
menu item alignment
2019-03-13 15:08:09 +01:00
PavelSindler
6c70d59810
mbl settings initialization fix
2019-03-13 15:05:10 +01:00
PavelSindler
c3a95ab79b
variants update
2019-03-12 11:57:35 +01:00
PavelSindler
b20d9171b6
Merge remote-tracking branch 'upstream/MK3' into 7x7
2019-03-12 11:47:17 +01:00
PavelSindler
42036270cf
Merge pull request #1619 from MRprusa3d/PFW-795d
...
better autoLoad II
2019-03-12 11:44:30 +01:00
PavelSindler
c55f42965d
Merge pull request #1601 from MRprusa3d/PFW-749
...
SD card menu enhancement
2019-03-12 11:42:53 +01:00
PavelSindler
c9cff11732
Merge pull request #1593 from MRprusa3d/PFW-647
...
mode switching, G-code unification
2019-03-12 11:40:43 +01:00
PavelSindler
4d2b155ff9
Merge pull request #1594 from mkbel/fix_change_filament
...
Fix change filament
2019-03-12 11:39:15 +01:00
PavelSindler
0aa21c362e
compile error fix
2019-03-11 23:37:30 +01:00
PavelSindler
9a83925a97
fixed bug in counting approximate Z coordinate
2019-03-11 23:13:55 +01:00
MRprusa3d
3388444b6c
better autoLoad II
...
autoLoad inhibit if Support::ExtruderInfo(@MKx)/SensorInfo(@MKxS)-menu is selected
2019-03-11 20:43:07 +01:00
PavelSindler
698f81abe0
fix compile error
2019-03-11 15:55:48 +01:00
PavelSindler
819a91ab1e
switching stealth/normal mode for mmu in settings menu and tune menu
2019-03-11 12:33:22 +01:00
PavelSindler
141b78c048
number of Z-probes defualt value changed from 4 to 3, mmu stealth mode switch in settings menu
2019-03-10 16:03:46 +01:00
PavelSindler
091934462d
menu correction
2019-03-08 20:06:30 +01:00
PavelSindler
315959c13a
menu update
2019-03-08 20:03:23 +01:00
PavelSindler
952e0e1e77
change min. nProbeRetry to 1
2019-03-08 19:49:10 +01:00
PavelSindler
f293d61d3d
faster Z probe: move Z 150um relatively to last measurement. If PINDA is triggered at the beginning of measurement, move Z 500um higher and repeat measurement
2019-03-08 18:52:14 +01:00
PavelSindler
6a864ffbab
G80 parameters configurable via settings menu
2019-03-08 15:43:37 +01:00
PavelSindler
98bb2b7acf
merge debug gcodes for bed analysis
2019-03-06 20:45:23 +01:00
PavelSindler
dccb6ca2c6
Merge remote-tracking branch 'upstream/MK3' into bed_analysis_gcodes2
2019-03-06 19:56:52 +01:00
PavelSindler
f0cc313fed
debug gcodes (fans, bed analysis) moved to Dcodes, HOST_KEEPALIVE_FEATURE simplified
2019-03-06 19:56:48 +01:00
PavelSindler
2a71dbefb8
Merge pull request #1597 from mkbel/fix_compiler__warning
...
Fix compiler warning
2019-03-06 19:55:18 +01:00
MRprusa3d
6217329d50
SD card menu enhancement
2019-03-06 19:51:26 +01:00
PavelSindler
101453b674
mbl submenu
2019-03-06 13:27:31 +01:00
PavelSindler
5766a5537e
limit number of probes
2019-03-05 22:43:44 +01:00
PavelSindler
7c187541e1
function for valid points determination improved; simple Z-coordinate estimation; measure all points and use inaccurate Z-coordinate in case that we don't have enought information for counting Z-coordinate estimation
2019-03-05 22:36:30 +01:00
PavelSindler
d9e93e8a77
measurements points moved 10mm to the left; measure only chosen points (e.g. not points affected by magnets proximity)
2019-03-05 20:40:08 +01:00
Marek Bel
1eab058ad4
Fix uninitialized variable used.
2019-03-05 18:08:35 +01:00
Marek Bel
7fcecabd5f
Fix compiler warning: variable 'previous_millis_cmd' set but not used
2019-03-05 18:04:58 +01:00
Marek Bel
484259cbb2
Fix compiler warning: 'lcd_settings_linearity_correction_menu_save' defined but not used
2019-03-05 18:00:16 +01:00
Marek Bel
28f1e309a2
Fix compiler warning: 'old_x_max_endstop' defined but not used
...
Fix compiler warning: 'old_y_max_endstop' defined but not used
2019-03-05 17:44:47 +01:00
Marek Bel
7bcd54f8ba
Add missing function prototype.
2019-03-05 17:30:27 +01:00
Marek Bel
ebfd4b2f47
Fix compiler warning: unused parameter 'calib'
2019-03-05 17:02:57 +01:00
Marek Bel
790ae9f0ce
Fix compiler warning: unused parameter 'pstep'.
2019-03-05 16:41:41 +01:00
Marek Bel
5b9e7c4fe7
Fix warning: assignment makes pointer from integer without a cast.
2019-03-05 16:27:47 +01:00
PavelSindler
f1031d2302
new farm statuses for pause (14) and wait for user (15)
2019-03-05 16:00:50 +01:00
Marek Bel
23859921b9
Fix compiler warnings macro redefined.
2019-03-05 15:56:20 +01:00
MRprusa3d
20a03d703d
G-code unification
...
"FSENSOR_RECOVER" ->-> "PRUSA fsensor_recover"
2019-03-05 13:36:13 +01:00
Marek Bel
f161d3ade4
Change formatting.
2019-03-04 22:17:43 +01:00
Marek Bel
b2255c8be9
Preheat nozzle before loading filament in M600 (change filament) gcode.
...
This fixes problem of not heating the nozzle when retrying load after MMU load failed.
2019-03-04 22:00:24 +01:00
MRprusa3d
7e48d633cb
mode switching
...
info-message viewing during mode switching
2019-03-04 21:30:36 +01:00
PavelSindler
17f095b957
shorter Z movements (makes calibration faster)
2019-03-04 20:32:56 +01:00
mkbel
27f69bb761
Merge pull request #1570 from PavelSindler/mmu_stealth_mode
...
mmu stealth mode
2019-03-04 17:09:11 +01:00
PavelSindler
7f92d73a40
MMU_STEALTH_MODE -> MMU_FORCE_STEALTH_MODE; activate_stealth_mode() function update
2019-03-04 17:04:22 +01:00
PavelSindler
9dde8c4732
Merge pull request #1591 from MRprusa3d/PFW-795c
...
better autoLoad
2019-03-04 15:31:04 +01:00
PavelSindler
1051b7c39f
Merge pull request #1583 from mkbel/fix_cut
...
Fix unable to cut filament, if nozzle is already preheated.
2019-03-04 15:29:54 +01:00
PavelSindler
e832f0f2ee
Merge pull request #1582 from mkbel/remove_unused_code
...
Remove commented out code, fix formatting.
2019-03-04 15:29:36 +01:00
Marek Bel
8812d40546
Revert "Fix compiler warning: variable 'kill_message' set but not used"
...
This reverts commit a964f996fa
.
2019-03-04 15:05:14 +01:00
MRprusa3d
b02ca18c93
better autoLoad
...
autoLoad inhibit if Support::ExtruderInfo-menu is selected
2019-03-04 12:52:35 +01:00
Marek Bel
9e38b1e101
Add missing message "Preheating to cut".
2019-03-01 18:17:08 +01:00
Marek Bel
6437d44991
Fix unable to cut filament, if nozzle is already preheated.
2019-03-01 18:10:06 +01:00
Marek Bel
83e07b5cdf
Fix compiler warnings:
...
sketch/ultralcd.cpp: In function 'void mFilamentPrompt()':
sketch/ultralcd.cpp:2335:7: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
switch(eFilamentAction)
^
sketch/ultralcd.cpp:2335:7: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
switch(eFilamentAction)
^
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuLoad' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuUnLoad' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuEject' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp: In function 'void mFilamentItem(uint16_t, uint16_t)':
sketch/ultralcd.cpp:2513:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
switch(eFilamentAction)
^
sketch/ultralcd.cpp:2513:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2562:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
switch(eFilamentAction)
^
sketch/ultralcd.cpp:2562:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
2019-03-01 18:07:19 +01:00
Marek Bel
824d11e4b0
Remove "Press the knob to eject filament" message, as it is never shown.
2019-03-01 17:43:28 +01:00
Marek Bel
57cf7ee171
Fix compiler warning: 'lcd_selftest_fsensor' defined but not used
2019-03-01 17:21:13 +01:00
Marek Bel
4c2d4fcf77
Fix compiler warning ultralcd.cpp:4038:10: warning: unused variable 'chars
2019-03-01 17:18:05 +01:00
Marek Bel
a964f996fa
Fix compiler warning: variable 'kill_message' set but not used
...
kill_message is unused since:
Author: MRprusa3d <martin.remis@prusa3d.cz>
Date: 4 months ago (11/2/2018 11:03:14 PM)
Commit hash: 73794b56cf
MeshBed Leveling Fail
Z-leveling after MeshBed leveling failing
2019-03-01 17:08:36 +01:00
Marek Bel
8e51b37d91
Suppress warning: unused parameter.
2019-03-01 16:57:20 +01:00
Marek Bel
22500970ba
Remove commented out code, fix formatting.
2019-03-01 16:18:16 +01:00
PavelSindler
85c208f9f4
Merge branch 'MK3' into bad_load_cut
2019-03-01 14:55:55 +01:00
PavelSindler
22c0d6e230
Merge pull request #1577 from mkbel/add_cut
...
Add MMU cut filament
2019-03-01 14:53:12 +01:00
PavelSindler
e14e4be94e
Merge pull request #1575 from mkbel/add_ramming_eject
...
Add filament ramming to eject filament.
2019-03-01 14:21:23 +01:00
PavelSindler
0db721b244
Merge pull request #1559 from mkbel/detect_bad_load
...
Move extruder forth and back after filament detected by sensor to det…
2019-03-01 14:21:04 +01:00
PavelSindler
3cbcbba738
Merge pull request #1510 from mkbel/fix_menu_stack_third_time
...
Fix menu stack overrun.
2019-03-01 14:20:22 +01:00
PavelSindler
250a448d05
Merge pull request #1549 from mionut/7MBL
...
7x7 mesh bed leveling with power failure save + pinda temperature filter
2019-03-01 14:19:52 +01:00
PavelSindler
488497df2c
version change
2019-03-01 13:56:03 +01:00
PavelSindler
ca88010018
Revert "version change"
...
This reverts commit f14733f2dd
.
2019-03-01 13:54:25 +01:00
PavelSindler
f14733f2dd
version change
2019-03-01 13:53:18 +01:00
PavelSindler
e27fdafcec
menu switch - initial
2019-02-28 19:42:09 +01:00
PavelSindler
482f8ef01a
Merge remote-tracking branch 'mionut/7MBL' into 7x7
2019-02-28 15:54:49 +01:00
Marek Bel
2a005caf42
Add cutter enable to tune menu.
2019-02-27 17:47:51 +01:00
Marek Bel
02a692c5d9
Store cutter enable state in EEPROM.
2019-02-27 17:34:03 +01:00
PavelSindler
ff6eb0b1af
Merge pull request #1568 from MRprusa3d/PFW-795
...
preHeat @ filament management
2019-02-27 13:15:39 +01:00
Marek Bel
4a4eb9962c
Cut filament when cutter is enabled and MMU load fails.
2019-02-27 10:42:26 +01:00
MRprusa3d
2f1e968563
"lcd_update_enable()" replacement
2019-02-26 23:17:52 +01:00
Marek Bel
49b1d1cb93
Move prototype to header file.
2019-02-26 18:50:15 +01:00
Marek Bel
a67645fda6
Merge branch 'add_cut' into bad_load_cut
2019-02-26 18:35:55 +01:00
Marek Bel
815231bc26
Add MMU cut filament menu.
2019-02-26 17:58:00 +01:00
MRprusa3d
ff35119ef3
preHeat @ filament management
...
another funcionality III / autoLoad
2019-02-26 17:33:37 +01:00
Marek Bel
5a5a482a59
Rename preprocessor macro K1 to PID_K1 to avoid future conflict with MMU command.
2019-02-26 13:59:44 +01:00
Marek Bel
6c9dd4f272
Add filament ramming to eject filament.
2019-02-26 13:41:28 +01:00
Marek Bel
7a1b47c340
Convert functions mmu_eject_fil_0 to mmu_eject_fil_4 to template function.
2019-02-26 11:11:05 +01:00
Marek Bel
34e2495487
Convert mmu_load_to_nozzle_0 to mmu_load_to_nozzle_4 to template.
2019-02-26 10:32:10 +01:00
Marek Bel
d5c5ed55eb
Change formatting.
2019-02-25 11:12:39 +01:00
Marek Bel
8f5fbe569c
Merge branch 'MK3' into detect_bad_load
2019-02-25 10:41:26 +01:00
PavelSindler
8e3d52ee6d
fix compilation error for MK2.5, make code more readable
2019-02-22 17:15:40 +01:00
PavelSindler
26cab2911f
mmu stealth mode
2019-02-22 16:30:54 +01:00
Laurentiu
51827c578f
MESH_MEAS_NUM_X_POINTS constant correction to MESH_MEAS_NUM_Y_POINTS
2019-02-22 15:05:06 +02:00
Laurentiu
62875f2e95
MESH_MEAS_NUM_X_POINTS constant correction to MESH_MEAS_NUM_Y_POINTS
2019-02-22 14:35:48 +02:00
MRprusa3d
c0a8d87e9e
Merge remote-tracking branch 'my_remote/PFW-795' into PFW-795
2019-02-22 03:16:23 +01:00
MRprusa3d
be0ed46335
preHeat @ filament management
...
another funcionality III
2019-02-22 03:09:50 +01:00
PavelSindler
730e370e78
Merge pull request #1565 from PavelSindler/MK3_for_merging
...
version change
2019-02-21 19:17:03 +01:00
PavelSindler
da28773480
version change
2019-02-21 19:16:24 +01:00
MRprusa3d
e422cc1c26
Merge branch 'MK3' into PFW-795
2019-02-21 15:43:56 +01:00
MRprusa3d
ed93f1b7f0
preHeat @ filament management
...
another funcionality IIb
2019-02-21 15:27:22 +01:00
PavelSindler
16bb6c80c7
Merge pull request #1562 from PavelSindler/mmu_stop_print_fix
...
comments
2019-02-21 14:29:04 +01:00
PavelSindler
6ad5c07e6d
comments
2019-02-21 14:28:05 +01:00
MRprusa3d
323071f50a
preHeat @ filament management
...
another funcionality II
2019-02-21 13:20:29 +01:00
MRprusa3d
a54c68b874
preHeat @ filament management
...
another funcionality II
2019-02-21 04:45:44 +01:00
Marek Bel
8b858286ac
Document.
2019-02-21 02:30:01 +01:00
Marek Bel
326c8492b5
Move extruder forth and back after filament detected by sensor to detect bad load.
2019-02-21 01:19:26 +01:00
PavelSindler
1e729048dc
cmdqueue_reset fix
2019-02-21 00:14:49 +01:00
MRprusa3d
da0867cfc5
preHeat @ filament management
...
another funcionality
2019-02-20 03:01:33 +01:00
Laurentiu
afc86a1363
missing ;
2019-02-18 05:50:29 +02:00
PavelSindler
11d19879fc
Merge pull request #1533 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad / MMU
2019-02-15 17:45:38 +01:00
PavelSindler
9d76b6912c
merge new changes from upstream
2019-02-15 17:05:39 +01:00
PavelSindler
2b6668b853
merge MK3S branch into MK3
2019-02-15 16:42:40 +01:00
PavelSindler
fec64a9d5e
Merge pull request #1525 from mkbel/improve_mmu_load_failed_2
...
Improve mmu load failed 2
2019-02-15 15:52:35 +01:00
PavelSindler
69ff37729e
whitespace
2019-02-15 14:19:30 +01:00
PavelSindler
0f791ce47f
mmu needs attention: idler error fix
2019-02-15 14:17:47 +01:00
MRprusa3d
0c1f9b5100
preHeat @ filament management
...
target temperature keeping
2019-02-15 02:25:44 +01:00
Laurentiu
4835b9b220
7x7 points mesh bed leveling
2019-02-14 10:57:58 +02:00
MRprusa3d
80c3420a12
Merge branch 'MK3' into PFW-210
2019-02-14 00:05:50 +01:00
MRprusa3d
ef1f82627e
preHeat @ filament load / unload / autoLoad / MMU
...
MMU options added
2019-02-13 23:53:00 +01:00
Marek Bel
a5437cb15b
Resend MMU T commands only.
...
This solves problem with unload repeated if unload takes too long, second ok reply then triggers Wait end and resumes print.
2019-02-13 22:29:29 +01:00
Marek Bel
a4032e437e
Add MMU wait command after MMU load failed. Resume print when MMU wait command returns OK.
2019-02-13 21:28:21 +01:00
Marek Bel
daaec0ef04
Convert MmuCmd to enum class.
2019-02-13 17:12:35 +01:00
Marek Bel
8e23e7f322
Save some flash by using smaller type for filament.
2019-02-13 16:37:54 +01:00
Marek Bel
9e873ac0f7
Use enum for mmu_cmd instead of plain integer type.
2019-02-13 01:51:39 +01:00
Marek Bel
bb7eeef1f4
Define debug printf and puts functions to make code more readable.
2019-02-12 23:24:23 +01:00
Marek Bel
e1216934ef
Save flash by defining underlying type and omitting number value.
2019-02-12 21:53:11 +01:00
Marek Bel
3379fb4866
Convert mmu_state to enum.
2019-02-12 21:43:26 +01:00
PavelSindler
4c76393231
version change
2019-02-12 13:44:50 +01:00
PavelSindler
62500f0b55
version changed
2019-02-12 10:39:09 +01:00
Marek Bel
6c8d9c6fb4
Retry filament load on MMU load failure once.
2019-02-11 23:43:42 +01:00
Marek Bel
d33b24c281
Unload filament after MMU load failed so MMU unit can be controlled by its buttons.
2019-02-11 23:24:55 +01:00
PavelSindler
b85661309f
configuration change
2019-02-11 16:38:36 +01:00
PavelSindler
ccc542d74a
MK2.5 IR_SENSOR_PIN modified
2019-02-11 14:32:21 +01:00
PavelSindler
cd692f6be6
version change
2019-02-07 19:43:08 +01:00
PavelSindler
065d56b2c6
version change
2019-02-06 23:58:30 +01:00
PavelSindler
38b0e5439b
version change
2019-02-06 23:52:24 +01:00
MRprusa3d
b17a961241
MK2.5S
...
pin definition for filament sensor connection
2019-02-06 23:31:48 +01:00
PavelSindler
e028db7bf9
version change
2019-02-06 23:30:01 +01:00
PavelSindler
ff52499bdc
extr fan RPM measuring fix
2019-02-06 23:05:13 +01:00
PavelSindler
e432e258dc
extr fan RPM measuring fix
2019-02-06 22:56:10 +01:00
PavelSindler
22217a42f7
message change
2019-02-06 21:37:39 +01:00
PavelSindler
a85d8e7f97
message change
2019-02-06 21:36:21 +01:00
PavelSindler
d19c92bca8
welcome message changed
2019-02-06 19:41:17 +01:00
PavelSindler
de9c87c592
welcome message changed
2019-02-06 19:38:52 +01:00
Marek Bel
c704a4b7ab
Fix menu stack overrun.
2019-02-06 18:25:45 +01:00
PavelSindler
726d5aa3c3
typo fixed
2019-02-06 16:29:10 +01:00
PavelSindler
63c8a36185
typo fixed
2019-02-06 16:27:44 +01:00
PavelSindler
a220c97f94
Revert "variant files"
...
This reverts commit 850d3316b6
.
2019-02-06 16:19:30 +01:00
PavelSindler
2fe8e0670a
MK2 build fail fixed
2019-02-06 16:15:19 +01:00
PavelSindler
850d3316b6
variant files
2019-02-06 15:18:12 +01:00
PavelSindler
ef86c78f25
menu item text changed
2019-02-06 14:24:47 +01:00
PavelSindler
1ba046395e
fan measurements fix: keep fanSpeedSoftPwm = 255 during measurements, selftest changes
2019-02-06 12:37:18 +01:00
PavelSindler
27d002a46f
Merge remote-tracking branch 'robert/MK3-variants' into variants
2019-02-06 09:20:21 +01:00
PavelSindler
860e6f9994
Merge remote-tracking branch 'upstream/MK3' into variants
2019-02-06 09:19:38 +01:00
PavelSindler
fcb7dd90cf
Merge pull request #1505 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad
2019-02-06 09:14:03 +01:00
MRprusa3d
a53d150903
preHeat @ filament load / unload / autoLoad
...
autoLoad option added
2019-02-06 01:58:05 +01:00
Robert Pelnar
93d4128163
Fixed timer2 colission with arduino framework around "tone" function.
2019-02-05 19:08:57 +01:00
PavelSindler
62e253edd0
fanSpeed -> fanSpeedSoftPwm (fixes fan speed menu)
2019-02-05 18:21:44 +01:00
PavelSindler
903028e574
fix fan speed measuring for PWM = 255
2019-02-05 17:46:31 +01:00
PavelSindler
91b12ff64b
bed level correction menu fix (menu_item_edit for negative integers)
2019-02-05 16:49:29 +01:00
PavelSindler
f9298b37b8
fan check hotfix (selftest, measuring RPM, fan errors)
2019-02-05 04:02:38 +01:00
PavelSindler
ea20529945
merge changes from upstream
2019-02-04 15:23:39 +01:00
MRprusa3d
5a2df47077
minTemp
...
better stability for delay-cutting
2019-02-04 14:54:25 +01:00
PavelSindler
9a51a7be29
Merge branch 'bed_correction_fix' into variants
2019-02-04 12:47:06 +01:00
PavelSindler
0853ef5d06
Merge remote-tracking branch 'upstream/MK3' into variants
2019-02-04 12:45:28 +01:00
PavelSindler
b4f2dc3b5e
Merge remote-tracking branch 'robert/MK3-variants' into variants
2019-02-04 12:41:08 +01:00
PavelSindler
6d5a2ae816
Merge pull request #1499 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload
2019-02-04 12:37:42 +01:00
Robert Pelnar
d2a4cb4c49
Use _delay_ms instead of delay (fix - fast scrolling in sd card menu - temporary solution)
2019-02-04 12:20:07 +01:00
MRprusa3d
fff8fc8a48
preHeat @ filament load / unload
...
filament-list correction (PET missing)
2019-02-04 12:12:35 +01:00
PavelSindler
2f9ab7b185
Merge branch 'dev' into variants
2019-02-04 01:32:24 +01:00
Robert Pelnar
3244c37435
Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control
2019-02-04 01:32:04 +01:00
PavelSindler
036bd4eb46
Merge branch 'dev' into variants
2019-02-04 01:20:14 +01:00
PavelSindler
6bf8611afa
mintemp: delay cutting lines removed
2019-02-04 01:19:58 +01:00
PavelSindler
71e4459cc9
Merge branch 'dev' into variants
2019-02-04 01:14:11 +01:00
PavelSindler
fba207e0ec
crash detection: don't wait for heater if target temp = 0; new priting type
2019-02-04 01:13:46 +01:00
PavelSindler
5324181bf7
maximum bed level correction value enlarged from 50um to 100um and is now used in menus and mesh bed leveling itself
2019-02-03 20:56:14 +01:00
PavelSindler
454a087fb3
Merge branch 'dev' into variants
2019-02-01 21:24:38 +01:00
PavelSindler
4444b155f1
M600: prevention of blob; massage changed when autoload is active
2019-02-01 21:08:34 +01:00
PavelSindler
97aaf919a3
Merge remote-tracking branch 'upstream/MK3' into dev
2019-02-01 18:12:59 +01:00
Robert Pelnar
79449a8eaf
Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control
2019-02-01 13:29:50 +01:00
PavelSindler
2cb3b99981
Merge branch 'dev' into variants
2019-01-31 18:04:38 +01:00
PavelSindler
4f67a9569c
dont show filament sensor in extruder info menu
2019-01-31 18:03:56 +01:00
PavelSindler
6342b6032c
Merge remote-tracking branch 'upstream/MK3' into variants
2019-01-31 10:18:41 +01:00
PavelSindler
491dbf5ebd
Merge pull request #1493 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload
2019-01-31 10:15:59 +01:00
MRprusa3d
921b6993ee
preHeat @ filament load / unload
2019-01-31 05:21:53 +01:00
PavelSindler
9926468c91
Merge remote-tracking branch 'upstream/MK3' into variants
2019-01-30 17:26:45 +01:00
PavelSindler
b24cd58a50
Merge pull request #1491 from XPila/MK3-bed_fast_pwm
...
HW pwm fix
2019-01-30 12:52:44 +01:00
Robert Pelnar
9890c60fe5
HW PWM fix
2019-01-30 00:06:12 +01:00
PavelSindler
bbdb2c1597
Merge branch 'dev' into variants
2019-01-29 15:34:56 +01:00
MRprusa3d
19fd05bb46
Merge pull request #1490 from PavelSindler/menu_update
...
menu update
2019-01-29 13:29:27 +01:00
PavelSindler
1fa9913029
include printers.h
2019-01-28 21:54:44 +01:00
PavelSindler
220437316b
Merge pull request #1485 from XPila/MK3-bed_fast_pwm
...
Mk3 bed fast pwm
2019-01-28 21:14:01 +01:00
PavelSindler
60acdd23c5
variants
2019-01-28 21:12:38 +01:00
PavelSindler
29e156b26d
printer types updated
2019-01-28 19:48:46 +01:00
PavelSindler
25d54d43aa
menu update
2019-01-28 19:41:02 +01:00
Marek Bel
6d2358125a
Fix Timer_test broken by conditional translation for SYSTEM_TIMER_2.
2019-01-28 19:29:31 +01:00
PavelSindler
dd4d8e1277
calibrate z endstop update
2019-01-28 19:23:19 +01:00
PavelSindler
af348aa8ba
compilation error fix: pin for LCD brightness
2019-01-28 17:56:44 +01:00
PavelSindler
83510ed489
check_for_ir_sensor
2019-01-28 17:27:16 +01:00
PavelSindler
8fe2d1de9a
Merge remote-tracking branch 'my_dev/MK3' into dev
2019-01-28 17:15:22 +01:00
PavelSindler
8f039263d5
variant files and version
2019-01-28 17:14:24 +01:00
PavelSindler
1742dbdb9e
Merge remote-tracking branch 'my_dev/MK3' into dev
2019-01-28 16:21:57 +01:00
PavelSindler
2ea34d21e7
Revert "Revert "Mk3 bed fast pwm""
2019-01-28 14:20:31 +01:00
Robert Pelnar
1b4e49b5ac
Fixed fancheck and include in TimerRemaining.h
...
this commit enables fast pwm mode for bed (SYSTEM_TIMER_2 definition uncomented)
fancheck fix verified with selftest
2019-01-28 12:57:33 +01:00
PavelSindler
0514306bed
selftest fixed
2019-01-28 11:09:41 +01:00
PavelSindler
7889305702
merging changes from upstream
2019-01-28 11:00:42 +01:00
PavelSindler
41f103c28f
Revert "Mk3 bed fast pwm"
2019-01-28 10:53:51 +01:00
PavelSindler
c6e6df404c
Merge pull request #1482 from mkbel/IR_fsens_selftest
...
Ir fsens selftest
2019-01-28 10:39:12 +01:00
Robert Pelnar
eea755496b
Conditional translation for SYSTEM_TIMER_2 because we want to have posibility to switch between old/new implementation.
...
Timing functions (millis, micros and delay) replaced in whole source, defined in Marlin.h.
This commit enables original implementation (SYSTEM_TIMER_2 undefined)
Verified with passed complete wizard process.
2019-01-27 22:48:51 +01:00
Robert Pelnar
9a1e914637
fix - bed heating durring selftest
2019-01-27 18:14:01 +01:00
Robert Pelnar
434a723151
Timing functions 'micros' and 'delay' replaced in whole source with 'micros2' and 'delay2'
2019-01-27 17:37:27 +01:00
Robert Pelnar
fc0b55b213
Timing functions micros2 and delay2 + fix of delay_keep_alive().
2019-01-27 17:23:53 +01:00
Marek Bel
aaa2670ef8
Remove redundant enum numbering.
2019-01-25 20:14:29 +01:00
Marek Bel
b167896c6d
Convert lcd_selftest_screen parameter int _step to enum class testScreen screen.
2019-01-25 20:00:12 +01:00
PavelSindler
ab2a25cd3f
Revert "Fast PWM for bed - newer set HEATER_BED_PIN to 1"
...
This reverts commit 50bcfae183
.
2019-01-25 18:38:46 +01:00
PavelSindler
31236e411e
Revert "Fast PWM for bed - set pwm value from soft_pwm_bed variable."
...
This reverts commit e612eb2a17
.
2019-01-25 18:38:36 +01:00
PavelSindler
76db58605b
Revert "Fast PWM for bed - timer2 used as system timer"
...
This reverts commit 0963c889f0
.
2019-01-25 18:37:23 +01:00
Marek Bel
6d1256eaad
Internationalize "Calibrating home".
2019-01-25 18:06:30 +01:00
PavelSindler
fc1491670f
mmu_idler_sensor_detected -> ir_sensor_detected
2019-01-25 18:03:05 +01:00
PavelSindler
6b6a3d7d5f
MMU_IR_SENSOR_PIN -> IR_SENSOR_PIN
2019-01-25 18:01:17 +01:00
PavelSindler
7e3a1c7d45
merge changes from upstream
2019-01-25 17:57:24 +01:00
PavelSindler
579fb42be2
Merge pull request #1480 from MRprusa3d/PFW-556
...
Pfw 556
2019-01-25 15:04:26 +01:00
PavelSindler
0d1a7a1774
Merge pull request #1479 from MRprusa3d/PFW-749
...
SD card menu
2019-01-25 14:32:12 +01:00
PavelSindler
661c40ef75
Merge pull request #1472 from mkbel/IR_fsens_selftest
...
Ir fsens selftest
2019-01-25 13:14:18 +01:00
Marek Bel
edc412697c
Increase selftest_irsensor() filament nozzle unload temperature to ABS.
...
Resume nozzle temperature immediately after unload.
2019-01-24 21:24:46 +01:00
Marek Bel
68ffa95aa9
Fix axis self-test progress visualization.
2019-01-24 21:06:03 +01:00
Marek Bel
1c4f3259ea
Increase heater check minimum expected temperature rises.
...
Bed increased from 3 to 10 K.
Nozzle increased from 10 to 30 K.
Measured rises with my MK3 printer:
Bed 26K,
Nozzle 73K.
2019-01-24 21:02:04 +01:00