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
18eaf21baf
Halve memory usage of saved feedrate
...
Truncate the saved feedrate to an uint16_t.
This is more than sufficient for recovery.
2019-11-28 17:16:37 +01:00
17176c1df2
Save/restore the default feedrate correctly
...
Since the global feedrate can be similarly modified for moves ahead of
time, save the original feedrate in the planner as we do for
gcode_target.
This avoids having to undo feedmultiply (and machine limits!) from
"nominal_speed" as previously done.
Thanks @leptun
2019-11-28 17:16:37 +01:00
4f0af648fb
Save/restore feedmultiply independently of the feedrate
2019-11-28 17:16:36 +01:00
6ecff003b7
Fix M600 insertion by the filament sensor
...
Remove incorrect usage of stop_and_save_print combined with the
fsensor_recovert internal instruction which would result in a
broken sequence of events and/or broken stack.
Re-use the now safe stop/recover functions in the same spot
(fsensor_checkpoint_stream) to effectively cut a hole in the current
gcode stream to insert an M600 instruction, which removes all
recursive behavior without the need of extra state variables.
2019-11-28 17:13:37 +01:00
4268c2fdae
Fix recovery from relative/chunked moves
...
When starting to replay existing USB/SD commands from a recovery state,
an immediate relative move needs to compensate for a previously
interrupted move. This is almost the norm for the E axis.
Instead of saving the relative status of the move (which needs to
account for the world2machine conversion and is not always available on
a chunked move split by MBL) save directly the calculated target
position for the move in the original plan, which is easy to replay.
2019-11-28 16:42:35 +01:00
faa9e925fe
Replace a few loops with set_current_to_destination()
2019-11-28 15:57:21 +01:00
5fa7c178b5
Do not set current_position in mesh_plan_buffer_line
...
This is a task which _has_ to be performed by the caller,
such as prepare_move().
2019-11-28 15:57:21 +01:00
0f6b9b4051
Unroll the stack in restore_print_from_ram_and_continue
...
While handling moves in a recursive plan, such a filament check,
ensure restore_print_from_ram_and_continue unwinds the stack by
aborting early from any call that waits on the planner.
This currently only handles G1 moves, but hard-coded behavior that can
trigger recursive behavior (such as filament change) will probably have
to be checked too.
2019-11-28 15:57:20 +01:00
660b646b57
RR Wiki for Dcodes
...
open D-1, D80, D81, D106, D2130
2019-11-27 11:29:55 +01:00
475551431c
How does M862.5 P works???
2019-11-26 20:21:05 +01:00
84cb373905
More G codes documented in RR wiki
...
M44, M45, M47, M403, M509, M851, M601, M602, M603, M862
2019-11-26 20:11:55 +01:00
5eaf6f0133
Merge branch 'MK3' into MK3-Gcode_documentation
...
Merge with MK3 branch
2019-11-26 12:48:21 +01:00
abb220ff69
Merge pull request #2323 from Panayiotis-git/MK3_Fix_M603
...
Add oversighted ‘break’ statement at the M603 command's source
2019-11-25 06:04:41 +01:00
07b6173aaa
Merge branch 'MK3' into MK3-PFW-1024
2019-11-16 11:28:29 +02:00
86ea24c364
Merge pull request #2273 from wavexx/do_not_wait_for_disabled_heater
...
Do not wait forever if the heater on the extruder is disabled
2019-11-15 17:19:11 +01:00
23cf076242
Add oversighted ‘break’ statement at the M603 command's source
2019-11-12 21:32:39 +02:00
422e7fde4a
Merge branch 'MK3' into MK3-Gcode_documentation
2019-11-08 18:16:56 +01:00
4cf2f05d1d
Merge pull request #2057 from leptun/MK3_fix_M350
...
M350 for all axis - MK3
2019-11-08 16:15:15 +01:00
a14d7545a5
Update Marlin_main.cpp
2019-11-08 16:06:42 +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
5bd995b21b
Added more info to doxygen G-Codes
2019-11-06 11:14:06 +01:00
e6eeafd20c
More M-Commands ...
2019-11-05 15:47:04 +01:00
ca234a11ed
M-Commands to M240
2019-11-05 12:40:51 +01:00
8114bd5b1c
Merge with MK3 and few spaces
2019-11-05 09:05:05 +01:00
cd5ff783cf
General fixes and improvements to code
2019-10-31 19:07:20 +02:00
4501f9d760
M commands documentation #2
2019-10-31 15:46:23 +01:00
21dcfb23f4
Follow RepRap Wiki G-codes documentation
...
M120 is Enable endstops
M121 is disable endstops
I guess this was just a typo issue.
2019-10-31 15:31:08 +01:00
c899320590
Fix M81 Turn off Power Supply...
...
... as it should be active if PS_ON_PIN is defined and assinged to an actual pin.
2019-10-31 15:08:07 +01:00
ce8dbb5013
M commands documentation #1
2019-10-30 18:52:25 +01:00
b9dca5f895
other doxygen format changes
2019-10-30 15:52:27 +01:00
d472f0730c
Change doxygen format
2019-10-30 15:50:23 +01:00
986ac95c45
G codes documented ... next M commands
2019-10-30 11:19:51 +01:00
8f05627747
Update #1 gcodes doxygen documentation
...
added some RepRap G-codes Wiki external links.
2019-10-25 13:04:04 +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
4943e17bda
Preserve power during PP by turning off backlight
2019-10-19 18:45:31 +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
5a4126e00c
Merge pull request #2263 from leptun/MK3-Fix_PSU_DELTA_SILENT
...
PSU_DELTA fix force_high_power_mode()
2019-10-16 13:22:22 +02:00
7f3ba499a0
Do not wait forever if the heater on the extruder is disabled
2019-10-15 20:54:00 +02: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
68491c9d4d
First implementation
2019-10-11 19:06:37 +03:00
e3ac2e2509
PSU_DELTA fix force_high_power_mode()
2019-10-10 19:01:57 +03:00
219a5e0625
Initialize EEPROM_SILENT in one place both for MK3 and MK25 printers and make it more clear.
2019-10-03 21:25:52 +02:00
7feb763643
Move check for clear EEPROM just after factory_reset() to ensure nothing is written to EEPROM before check.
...
Fix wizard not starting after Factory RESET / All Data on MK25 printer.
This was broken by:
Author: leptun <voinea.dragos.alexandru@gmail.com>
Date: 3 weeks ago (9/12/2019 6:16:31 AM)
Commit hash: 78708903e8
2019-10-02 18:38:46 +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
ed13788e0c
EEPROM_BABYSTEP_Z using removal
2019-10-01 16:57:37 +02:00
06187f52f3
Merge pull request #2230 from leptun/MK3_Octoprint_fIxes
...
Mk3 Fan error fix
2019-10-01 11:34:55 +02:00
61c7479579
Code cleanup: Move texts to messages.c/h
2019-09-30 20:16:01 +03:00
aba9d1c360
Merge branch 'MK3' into MM_lay1_cal
2019-09-30 18:13:57 +02:00
8c7015df53
Document set current command.
2019-09-27 15:42:31 +02:00
9c22692827
Fix Cancel Print command processing
2019-09-25 22:34:31 +03:00
4d149f0dfa
Do not send useless keepalive messages after print is canceled from lcd
2019-09-25 18:50:29 +03:00
14b72d2b46
Prevent timeout when printing from SD with USB host connected
2019-09-25 18:12:19 +03:00
2363f19a62
Minor tweaks for usb printing
2019-09-20 21:07:20 +03:00
fd01942db8
FAN Error fix - Initial
2019-09-19 20:48:59 +03:00
19a8537901
Document.
2019-09-17 20:35:18 +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
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
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
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
14dc6b86e0
Change undocumented behaviour of M190 (Wait for bed temperature). Document M190 and M109 (Wait for extruder temperature).
...
Do not remember CooldownNoWait property set by M190 and M109. If M190 was invoked without parameters, CooldownNoWait property was set if it was previously set by "M109 S" or "M109 S" or printer was after power up. Otherwise CooldownNoWait was not set. Now CooldownNoWait is never set if M190 is invoked without parameters.
Saves 44 B of FLASH memory.
2019-09-11 23:37:09 +02:00
e1e40213b2
Enable fan pin test even for MK3 (was disabled in 3.7.2 due to lack of
...
FLASH)
2019-09-10 16:49:22 +02:00
898e85e69f
Merge pull request #2038 from Eriobis/MK3
...
Add a threshold distance to Z calibration
2019-09-10 16:20:24 +02:00
978ace7fd7
Update Marlin_main.cpp
2019-09-09 02:16:06 +02:00
e73b0a88d5
Use same format for all instances where "ok" is send to serial line.
2019-09-05 22:35:01 +02: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
3f04c4db87
Merge branch 'MK3' into preheat_menu
2019-08-27 22:20:23 +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
11ce786aaa
Support for more special characters allowed in file names (^ + = [ ] ;
...
,)
2019-08-27 13:47:58 +02:00
159a1a70d8
Update documentation.
2019-08-26 17:19:57 +02:00
52cb37770b
Fix repeated power panic restarted print from beginning or jumped at most 65536 B back in file printed from SD card.
...
As sdpos_atomic was not updated after printer power up and first power panic recovery, it was equal 0. When the first command from SD card was queued its size on SD card was computed as current SD index position minus sdpos_atomic. This was equal to offset from beginning of the file limited to 16 bit storage type. When next power outage occurred earlier then this command was finished and wiped out of queue, this command size (extraordinarily big) was subtracted from sdpos_atomic and saved to EEPROM. This led to up to 65536 B jump back in file printed after next power panic recovery.
2019-08-23 19:30:20 +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
a7c2aec04c
Code size reduced by almost 5KB
2019-08-21 09:59:51 +02:00
3ed6d0637c
Re-enable tmc2130_sg_stop_on_crash only if crash detection enabled from menu.
...
This fixes bug, that disabling crash detection from menu doesn't work during recovery from crash detection.
2019-08-20 19:32:39 +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
f07635d08a
Merge pull request #2116 from mkbel/fix_mmu_lay1cal
...
Fix mmu lay1cal
2019-08-19 19:07:10 +02:00
f0642f88f1
Fix power panic broken when PSU_Delta defined.
...
Remove disable_z() call from uvlo_() and uvlo_tiny() power panic interrupt handlers. As historically this function was empty. And in case PSU_Delta macro defined it switches Z trinamic to silent mode, which could take some time and is not needed. Remove alignment to to full step from disable_force_z(), as it is not needed when switching to silent mode.
2019-08-19 17:37:23 +02:00
e53734895f
Make MMU load failed blocking to workaround lack of resume print menu item.
...
The same workaround used as for USB print (Octoprint).
2019-08-16 20:20:17 +02:00
ba81149afe
Merge branch 'MK3' into MK3_3.7.3
2019-08-15 10:25:51 +02:00
a28c365bb1
Merge pull request #2075 from MRprusa3d/PFW-873b
...
farm mode update, documentation correction
2019-08-07 17:48:30 +02:00
b471bb7540
farm mode update, documentation correction
2019-08-05 17:51:26 +02:00
091cd49ca5
Fw version check disabled in farm mode
2019-08-05 16:59:09 +02:00
cb19f0958b
Use _delay() and _micros() for future compatibility
2019-08-05 09:51:06 +02:00
18b8dc89e5
Merge remote-tracking branch 'upstream/MK3' into MK3_LA15
2019-08-04 17:06:34 +02:00
7c9d3dd177
Update doxydoc of new G-codes
2019-08-01 13:09:20 +02:00
49d2866b48
Add threshold distance to Z calibration
...
Add missing if statement
2019-07-30 19:43:07 -04:00
556b87edec
M350 for all axis - MK3
2019-07-29 09:41:33 +03:00
3e60cf4537
enable only for MK3S (out of FLASH on the MK3)
2019-07-23 16:51:02 +02:00
593675c667
delay, micros for the 3.7.x branch
2019-07-23 16:40:21 +02:00
6860a572c2
detection of faulty RAMBo (incorrect capacitor on fan tach pin) for MK3/S
2019-07-23 15:55:53 +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
bd4bfbe586
Added M862 details
2019-07-19 16:15:12 +02:00
94e79806bc
Updated doxygen docs to work better with confluence.
2019-07-19 13:51:55 +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
255db28684
merge unit test and upstream changes
2019-07-17 10:30:49 +02:00
e6255e8451
octoprint fan error work
2019-07-16 19:18:31 +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
8b806f692e
Merge pull request #1664 from MRprusa3d/PFW-811
...
"disable_z()" for Delta PSU
2019-07-16 16:46:34 +02:00
d65b333664
Merge pull request #2003 from mkbel/heat_hysteresis
...
Heat hysteresis
2019-07-16 13:10:47 +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
9083d151b2
wait_for_heater() in restore_print_from_ram_and_continue() only if saved_extruder_temperature differs from target hot-end temperature.
...
This fixes problem, that restore_print_from_ram_and_continue() blocked for heating for at least TEMP_RESIDENCY_TIME (3 seconds) even if temperature was resumed by M600 command.
2019-07-15 18:07:05 +02:00
549a8a1a6b
Restore print fan speed earlier then nozzle temperature.
...
Avoids nozzle temperature dip when fan is turned on.
2019-07-15 16:25:21 +02: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
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
9585789288
Merge pull request #1976 from NotaRobotexe/MK3_3.7.2_PP
...
dont fire power panic at normal power off
2019-07-10 14:19:00 +02:00
8229a45187
pre-production version ;-)
2019-07-09 12:16:51 +02:00
9592460281
add old delay
2019-07-04 18:43:59 +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
ff3c9d1a7c
dont fire power panic at normal power off
2019-06-28 11:25:56 +02:00
4a16fe6902
Save z_offset, bed_temp and pinda_temp with sheet calibration.
2019-06-26 14:10:12 +02:00
4058cd144b
add delay_keep_alive without updating lcd
2019-06-25 14:30:11 +02:00
b5168bd6c2
fan error fix
2019-06-24 17:30:56 +02:00
19a474eaa5
Fix compiler warnings.
2019-06-20 18:00:29 +02:00
0a48082609
Add steel sheet profile selector.
2019-06-20 16:40:53 +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
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
6717590631
Merge branch 'MK3' into MK3_LA15
2019-06-13 15:39:50 +02:00
55dc78546b
Merge pull request #1913 from mkbel/fix_spelling
...
Fix spelling.
2019-06-13 15:12:30 +02:00
25f0eb9a39
Fix spelling.
2019-06-13 15:01:54 +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
cbb92860d0
Use first letter capital camel case for enum class members.
2019-06-12 18:54:32 +02:00
b7d3766ae2
Merge branch 'MK3' into PFW-790
2019-06-12 17:32:13 +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
baa36ce740
another almost 200B down by proper usage of smaller data types and enum
...
classes
2019-06-12 09:58:42 +02:00
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
13c3ab14fa
test fan check error only when enabled by #ifdef
2019-06-11 15:05:40 +02:00
3e37150552
Do not allow resume printing if fans are still not ok
2019-06-11 14:53:10 +02:00
bb980e2fca
sound edit, delete mute mode, add blind mode
2019-06-10 15:03:52 +02:00
327e6cd39b
Merge pull request #1889 from DRracer/fan_check_error_fix
...
Fan check error fix
2019-06-06 15:52:44 +02:00
0cf6bc0677
Merge pull request #1903 from mkbel/filament_runout_mk3_2
...
Filament runout mk3 2
2019-06-06 15:51:35 +02:00
a4bc91ed2f
M0/M1/M117 fix: Use CUSTOM_MSG states in M0/1/M117
...
Now that we have the new CUSTOM_MSG states, we can use them in the M0/M1
and M117 handlers to force the user message to be displayed even when
the printer is printing from a SD card and displaying a file name.
2019-06-06 14:25:36 +02:00
5d8eb84965
M0/M1/M117 fix: Move M0/M1 to the top of decoder.
...
Move M0/M1 decoding before any other command. The M0/M1 message can contain
arbitrary characters and so it also can contain substrings that other
decoders trigger on, like the letter 'G'. Any such substring would cause
misdecoding of the M0/M1 and unpredictable behavior in addition to not
making the printer stop.
M117 already received the same treatment in the past, so we take the same
approach for M0/M1.
2019-06-06 14:24:34 +02:00
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
1d8c24e8a9
"disable_z()" for Delta PSU IV
...
correction for (motor) mode switching
2019-06-05 19:22:04 +02:00
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
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
10247a28a3
Merge pull request #1896 from NotaRobotexe/power_panic
...
documentation for power panic
2019-06-05 16:10:04 +02:00
0cab2284ea
PFW-874 new firmware alert timeout
2019-06-05 15:48:10 +02:00
14270ac1f6
power panic documentation
2019-06-05 15:10:51 +02:00
d263728c37
documentation
2019-06-05 14:55:59 +02:00
33b2aa5e58
Merge pull request #1894 from NotaRobotexe/power_panic
...
Power panic Z axis fix
2019-06-05 13:34:21 +02:00
2c4e98dc27
power panic improvement
2019-06-05 13:12:08 +02:00
8ce1c04740
Remove useless "extruder under pressure" flag
...
That's exactly what LA does
2019-06-04 16:22:27 +02:00
bca5618145
Save/restore K during a power panic
2019-06-03 17:33:19 +02:00
6755791778
Fix repeated fan error checking
2019-05-31 11:29:11 +02:00
e79c203c96
Do not always cut if it is not enabled from menu.
2019-05-30 23:04:06 +02:00
ccb649b1f6
Add always cut experimental / for testing feature.
2019-05-30 23:03:59 +02:00
e9c870e7a0
fix of fixof power panic
2019-05-29 20:33:22 +02:00
3b2cbc68d8
PFW-571 send PRN:4 instead PRN:1 while changing filament
2019-05-28 18:22:34 +02:00
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
bcb6129c29
delete comment
2019-05-28 14:11:38 +02:00
8842d16832
add back uvlo tiny z positio
2019-05-28 13:50:21 +02:00
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
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
f070a10904
edit
2019-05-27 10:10:24 +02:00
55a2d588f1
PFW-828 printing in the air after power panic
2019-05-24 18:30:58 +02:00
69455bfc75
PFW-828 fix printing in the air after power panic
2019-05-24 18:28:16 +02:00
eeea2725cb
Partial LA15 support
2019-05-24 17:08:32 +02:00
9cb0bc7bcf
Fix MINTEMP errors and fsensor runout
2019-05-24 08:46:44 +02:00
1399d7dcc8
support only for MK3/MK3S
2019-05-23 15:22:31 +02:00
63235625ab
pause printer by flag
2019-05-23 13:13:11 +02:00
dad2065da6
Merge branch 'MK3' into rise_z
2019-05-15 16:37:17 +02:00
1f3877b221
Extract duplicate code into function. Saves 4B of flash.
2019-05-15 16:31:10 +02:00
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
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
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
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
e7dd5c60d3
check if firmware is on right type of printer
2019-05-07 18:10:44 +02:00
b7fe43bf68
Deleted bad cols/rows definitions for translation.
2019-05-07 12:52:23 +02:00
18dec75b56
MK2.5 - watchdog enabled + test (command "D-1")
2019-04-29 13:19:59 +02:00
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
84cabd3836
Change busy_state type, save 340B of flash
2019-04-05 15:20:34 +02:00
bf57a59147
Extract duplicate code into function. Saves 106B flash.
2019-04-05 15:12:35 +02:00
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
4b1fc69088
"disable_z()" for Delta PSU III
...
stealthChop set if motor-disable (@ Z) required
2019-04-02 20:04:44 +02:00
d22793f276
Z-probe nr. states reduced to 1; 3; 5
2019-03-28 12:02:46 +01:00
e7900aeaa1
Merge remote-tracking branch 'upstream/MK3' into 7x7_polishing
2019-03-28 08:08:54 +01:00
e259967991
remove / comment debug code
2019-03-27 20:41:45 +01:00
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
17a534e42b
"disable_z()" for Delta PSU II
2019-03-25 23:28:25 +01:00
576bfb17c7
whitespace
2019-03-21 18:51:54 +01:00
175f840d16
return statement not used (fixes Pronterface issues)
2019-03-21 18:46:07 +01:00
632781c4a2
"disable_z()" for Delta PSU
2019-03-21 00:45:15 +01:00
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
7d98177716
farmMode updates
2019-03-19 19:48:40 +01:00
4100bd33a7
Fix Dcodes compilation errors and warnings.
2019-03-19 13:53:58 +01:00
6e26f61726
fixed 7x7 mesh bed leveling vs. Z calibration check
2019-03-14 14:48:01 +01:00
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
1f131f66e0
print parameters checking
...
nozzle diameter
2019-03-14 00:36:56 +01:00
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
b20d9171b6
Merge remote-tracking branch 'upstream/MK3' into 7x7
2019-03-12 11:47:17 +01:00
42036270cf
Merge pull request #1619 from MRprusa3d/PFW-795d
...
better autoLoad II
2019-03-12 11:44:30 +01:00
c9cff11732
Merge pull request #1593 from MRprusa3d/PFW-647
...
mode switching, G-code unification
2019-03-12 11:40:43 +01:00
4d2b155ff9
Merge pull request #1594 from mkbel/fix_change_filament
...
Fix change filament
2019-03-12 11:39:15 +01:00
9a83925a97
fixed bug in counting approximate Z coordinate
2019-03-11 23:13:55 +01:00
3388444b6c
better autoLoad II
...
autoLoad inhibit if Support::ExtruderInfo(@MKx)/SensorInfo(@MKxS)-menu is selected
2019-03-11 20:43:07 +01:00
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
952e0e1e77
change min. nProbeRetry to 1
2019-03-08 19:49:10 +01:00
6a864ffbab
G80 parameters configurable via settings menu
2019-03-08 15:43:37 +01:00
98bb2b7acf
merge debug gcodes for bed analysis
2019-03-06 20:45:23 +01:00
dccb6ca2c6
Merge remote-tracking branch 'upstream/MK3' into bed_analysis_gcodes2
2019-03-06 19:56:52 +01:00
f0cc313fed
debug gcodes (fans, bed analysis) moved to Dcodes, HOST_KEEPALIVE_FEATURE simplified
2019-03-06 19:56:48 +01:00
5766a5537e
limit number of probes
2019-03-05 22:43:44 +01:00
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
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
7bcd54f8ba
Add missing function prototype.
2019-03-05 17:30:27 +01:00
ebfd4b2f47
Fix compiler warning: unused parameter 'calib'
2019-03-05 17:02:57 +01:00
790ae9f0ce
Fix compiler warning: unused parameter 'pstep'.
2019-03-05 16:41:41 +01:00
20a03d703d
G-code unification
...
"FSENSOR_RECOVER" ->-> "PRUSA fsensor_recover"
2019-03-05 13:36:13 +01:00
f161d3ade4
Change formatting.
2019-03-04 22:17:43 +01:00
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
17f095b957
shorter Z movements (makes calibration faster)
2019-03-04 20:32:56 +01:00
9dde8c4732
Merge pull request #1591 from MRprusa3d/PFW-795c
...
better autoLoad
2019-03-04 15:31:04 +01:00
b02ca18c93
better autoLoad
...
autoLoad inhibit if Support::ExtruderInfo-menu is selected
2019-03-04 12:52:35 +01:00
85c208f9f4
Merge branch 'MK3' into bad_load_cut
2019-03-01 14:55:55 +01:00
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
e27fdafcec
menu switch - initial
2019-02-28 19:42:09 +01:00
482f8ef01a
Merge remote-tracking branch 'mionut/7MBL' into 7x7
2019-02-28 15:54:49 +01:00
02a692c5d9
Store cutter enable state in EEPROM.
2019-02-27 17:34:03 +01:00
4a4eb9962c
Cut filament when cutter is enabled and MMU load fails.
2019-02-27 10:42:26 +01:00
ff35119ef3
preHeat @ filament management
...
another funcionality III / autoLoad
2019-02-26 17:33:37 +01:00
be0ed46335
preHeat @ filament management
...
another funcionality III
2019-02-22 03:09:50 +01:00
da0867cfc5
preHeat @ filament management
...
another funcionality
2019-02-20 03:01:33 +01:00
afc86a1363
missing ;
2019-02-18 05:50:29 +02:00
11d19879fc
Merge pull request #1533 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad / MMU
2019-02-15 17:45:38 +01:00
4835b9b220
7x7 points mesh bed leveling
2019-02-14 10:57:58 +02:00
80c3420a12
Merge branch 'MK3' into PFW-210
2019-02-14 00:05:50 +01:00
ef1f82627e
preHeat @ filament load / unload / autoLoad / MMU
...
MMU options added
2019-02-13 23:53:00 +01:00
daaec0ef04
Convert MmuCmd to enum class.
2019-02-13 17:12:35 +01:00
9e873ac0f7
Use enum for mmu_cmd instead of plain integer type.
2019-02-13 01:51:39 +01:00
27d002a46f
Merge remote-tracking branch 'robert/MK3-variants' into variants
2019-02-06 09:20:21 +01:00
860e6f9994
Merge remote-tracking branch 'upstream/MK3' into variants
2019-02-06 09:19:38 +01:00
fcb7dd90cf
Merge pull request #1505 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad
2019-02-06 09:14:03 +01:00
a53d150903
preHeat @ filament load / unload / autoLoad
...
autoLoad option added
2019-02-06 01:58:05 +01:00
93d4128163
Fixed timer2 colission with arduino framework around "tone" function.
2019-02-05 19:08:57 +01:00
62e253edd0
fanSpeed -> fanSpeedSoftPwm (fixes fan speed menu)
2019-02-05 18:21:44 +01:00
903028e574
fix fan speed measuring for PWM = 255
2019-02-05 17:46:31 +01:00
f9298b37b8
fan check hotfix (selftest, measuring RPM, fan errors)
2019-02-05 04:02:38 +01:00
9a51a7be29
Merge branch 'bed_correction_fix' into variants
2019-02-04 12:47:06 +01:00
fba207e0ec
crash detection: don't wait for heater if target temp = 0; new priting type
2019-02-04 01:13:46 +01:00
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
4444b155f1
M600: prevention of blob; massage changed when autoload is active
2019-02-01 21:08:34 +01:00
97aaf919a3
Merge remote-tracking branch 'upstream/MK3' into dev
2019-02-01 18:12:59 +01:00
dd4d8e1277
calibrate z endstop update
2019-01-28 19:23:19 +01:00
af348aa8ba
compilation error fix: pin for LCD brightness
2019-01-28 17:56:44 +01:00
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
434a723151
Timing functions 'micros' and 'delay' replaced in whole source with 'micros2' and 'delay2'
2019-01-27 17:37:27 +01:00
fc0b55b213
Timing functions micros2 and delay2 + fix of delay_keep_alive().
2019-01-27 17:23:53 +01:00
7e3a1c7d45
merge changes from upstream
2019-01-25 17:57:24 +01:00
6b1cf99066
conditional compilation updated
2019-01-24 16:14:02 +01:00
da2c963893
conditional compilation improved: fsensor_autoload_check_stop() and fsensor_autoload_check_start(); M600 "filament not responding" error on printers with ir sensor fixed
2019-01-24 16:00:52 +01:00
e0c1e4a02d
version which should on all printer versions: autoload, selftest, filament detection, filament sensors initialization, filament menus
2019-01-24 01:12:30 +01:00
54f8f4eb4d
Merge pull request #1460 from MRprusa3d/PFW-723
...
Pfw 723
2019-01-23 14:12:19 +01:00
052ae323f8
Merge branch 'MK3' into prusa3d-DEV_MK3
2019-01-15 16:58:36 +01:00
2db42c8577
Merge branch 'MK3' into auto_deplete_2
2019-01-07 21:39:46 +01:00
c080b899c3
Change filament number in T command to alternative if depleted and lcd_autoDepleteEnabled().
2019-01-04 22:32:48 +01:00
4e300fd552
minTemp
...
safety heaters management during/after minTemp
2019-01-02 18:25:41 +01:00
ba57986b72
merge changes from upstream
2018-12-21 20:58:38 +01:00
b8c5b6259e
Fix - move down after calibrate Z (PFW718)
2018-12-19 14:40:10 +01:00
16e5fb50dd
Remove M601 from queue before saving state (prevent infinite loop - PFW713)
2018-12-18 20:39:38 +01:00
34f116b4d9
Move 1mm down with disabled endstop after calibrate_z_auto (PFW718)
2018-12-18 19:57:29 +01:00
2100376eb1
Merge remote-tracking branch 'upstream/MK3' into idler_sensor
2018-12-18 16:16:48 +01:00
927898151a
fix - tmc2130 conditional translation
2018-12-14 15:46:50 +01:00
cfe83daf4a
Meshbed leveling fail - move 1mm outside of colission with disabled endstop
2018-12-14 15:32:47 +01:00
df71398066
statistics fix
2018-12-13 00:43:27 +01:00
a9829b6a1a
add statistics and idler sensor state
2018-12-13 00:12:00 +01:00
29ecd4ec7a
duplicit T-codes execution improved, E-stepper movements when waiting for ok from mmu, continue loading function improved, eeprom: fail stats for mmu
2018-12-12 22:32:47 +01:00
3d4cb8a994
Document gcode T.
2018-12-12 20:30:28 +01:00
c256af0a1c
unknown filament added; the same T-code will be not executed twice in a row; continue loading
2018-12-12 14:50:55 +01:00
e52e53d1eb
send continue loading commands periodically if initial load fails
2018-12-12 13:54:17 +01:00
6157c3ab32
New filament sensor
2018-12-06 15:41:53 +01:00
41b78187ca
LCD backlight - full brightnes at start
2018-12-06 15:27:05 +01:00
d1d4a8c58c
whitespace
2018-11-29 17:33:36 +01:00
8e239ce76f
changed M220
2018-11-29 17:02:38 +01:00
929e1de253
special variable for saving/restoring feedmultiply using M220
2018-11-29 17:02:10 +01:00
839de141a3
resolving conflicts
2018-11-29 16:26:49 +01:00
abf20ef6a2
merged changes from public upstream (Prusa-Firmware repository)
2018-11-29 13:46:58 +01:00
b3ab9d0ee0
Merge pull request #1354 from XPila/V3_5
...
Lang - final corrections
2018-11-22 19:03:30 +01:00
42f2a61416
Lang - text "TRIGGERED" removed from dictionary
2018-11-22 18:46:02 +01:00
e9131542ca
Lang - text "Sleep..." removed from dictionary
2018-11-22 18:43:21 +01:00
72c7810641
Lang - text "Resend" removed from dictionary
2018-11-22 18:38:20 +01:00
7426efac9b
Lang - text "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" removed from dictionary
2018-11-22 18:36:38 +01:00
123bef636a
Lang - text "Printer halted. kill() called!" removed from dictionary
2018-11-22 18:33:15 +01:00
123725edd1
Lang - duplicate text "Some problem encountered, Z-levelling enforced ..." removed
2018-11-22 18:30:53 +01:00
0fceade481
Lang - text "PowerUp" removed from dictionary
2018-11-22 18:24:21 +01:00
1cbb261707
Lang - text "open" removed from dictionary
2018-11-22 18:18:25 +01:00
72d47eaeba
Lang - text "ok" removed from dictionary
2018-11-22 18:12:19 +01:00
fd3cd9b551
Lang - texts "Mxxx Invalid extruder " removed from dictionary
2018-11-22 18:06:10 +01:00
60e567b660
Lang - text " Last Updated: " removed from dictionary
2018-11-22 17:48:12 +01:00
a1f03e9531
Lang - text " Free Memory: " removed from dictionary
2018-11-22 17:46:44 +01:00
104353c0c5
Lang - text " PlannerBufferBytes: " removed from dictionary
2018-11-22 17:43:11 +01:00
099fe216b6
Lang - text "KILLED. " removed from dictionaries
2018-11-22 17:26:01 +01:00
e5dd4d757a
progress bar fix
2018-11-16 15:45:55 +01:00
ffe906c733
MeshBed Levelling Fail V
2018-11-14 16:45:49 +01:00
51b4858a87
Merge pull request #1334 from XPila/V3_5
...
PFW658 - disable extruder motor while changing filament with mmu2 (pr…
2018-11-13 16:10:24 +01:00
bfc343c7c5
PFW658 - disable extruder motor while changing filament with mmu2 (prevents extruder motor overheating)
2018-11-13 16:04:46 +01:00
15d0b083ed
whitespace
2018-11-13 15:58:21 +01:00
17a1049f23
T-codes fix
2018-11-13 15:56:19 +01:00
3d97d81734
Merge pull request #1329 from PavelSindler/M600_load_fil_message
...
M600 filament load progress bar changes
2018-11-12 20:52:06 +01:00
41b885c537
M907 fix - value in mA (PFW)
2018-11-12 20:39:25 +01:00
32da5bc039
progress bar time counted from feedrate and E - distance
2018-11-12 19:55:53 +01:00
f4c1e7924f
M600: show progress bar during first filament load
2018-11-12 18:35:06 +01:00
c991c8b314
resume print fix: wait for heater() never disable steppers
2018-11-09 18:29:35 +01:00
22cf2c6b6b
M600 load messages synchronization fixed
2018-11-09 15:31:44 +01:00
0e7fb26dc5
Merge pull request #1316 from MRprusa3d/PFW-635
...
MeshBed Levelling Fail IV
2018-11-08 10:18:08 +01:00
ccb58ae7c9
Revert "MeshBed Levelling Fail IV"
...
This reverts commit bd554df02e
2018-11-08 04:02:32 +01:00
bd554df02e
MeshBed Levelling Fail IV
2018-11-08 03:54:05 +01:00
b80a0edac0
Merge pull request #1312 from mkbel/fix_long_press_modal
...
Fix long press modal
2018-11-07 10:28:24 +01:00
b4d4bfa667
Do not declare extern class in .cpp file, include appropriate header.
2018-11-06 20:54:53 +01:00
9a68501039
MK2 variants compilable
2018-11-06 14:17:43 +01:00
c3bdd21fa5
Merge pull request #1308 from MRprusa3d/PFW-635
...
MeshBed Leveling Fail II
2018-11-06 10:47:03 +01:00
46b2c93d60
MeshBed Leveling Fail III
2018-11-06 01:44:53 +01:00
9953518681
MeshBed Leveling Fail II
2018-11-06 01:28:47 +01:00
d6b5f5a1c7
PFW643 - removed M910-M918, implemented M907
2018-11-05 16:15:27 +01:00
7e43b15b54
Merge pull request #1303 from PavelSindler/m600_idler
...
M600: move extruder to the left to make space for idler opening
2018-11-05 10:38:51 +01:00
78775e2f87
Merge pull request #1302 from PavelSindler/wizard_improvements
...
Wizard improvements
2018-11-05 10:38:41 +01:00
0a2ad97bc6
Merge pull request #1290 from PavelSindler/mmu_improvements
...
mmu improvements: load to nozzle, gcodes for single material mode, M600 fix
2018-11-05 10:38:05 +01:00
2619c6f7a1
Merge pull request #1283 from PavelSindler/crashdet_cancel
...
canceling print after crash detection sets saved_priting flag to false
2018-11-05 10:37:51 +01:00
aeeb2af0a4
whitespace
2018-11-05 00:15:36 +01:00
b058ec7120
whitespace
2018-11-05 00:14:16 +01:00
934b76ade3
wait message added
2018-11-05 00:12:46 +01:00
e2d2fb58aa
Z calibraion: always ask user to clean nozzle
2018-11-04 18:47:08 +01:00
73794b56cf
MeshBed Leveling Fail
...
Z-leveling after MeshBed leveling failing
2018-11-02 23:03:14 +01:00
aaf65051f9
M600: "is color clear?" menu synchronization
2018-11-01 18:28:52 +01:00
1342c312a0
use feedrate 200mm/min for final feed (faster and better filament sensor function), show default welcome message when load is finished
2018-11-01 16:51:18 +01:00
96ce324b7c
load to nozzle improved, unified feedrate and E-distance for final feed used in load filament function, M600 etc.
2018-11-01 16:29:09 +01:00
e80af46503
load to nozzle and Tx and Tc codes: intial version
2018-10-31 21:48:05 +01:00
f445b6018e
canceling print after crash detection sets saved_priting flag to false
2018-10-28 11:06:10 +01:00
4ecc00e4e3
M600: move extruder 100mm to the left to make space for opening idler
2018-10-26 18:19:00 +02:00
cdb06c65f3
Merge pull request #1275 from PavelSindler/3_4_2_branch_merging
...
3_4_2 branch merging into MK3
2018-10-25 21:45:51 +02:00
01529f18d2
upstream/MK3 merge
2018-10-25 20:57:27 +02:00
d005005e22
Merge remote-tracking branch 'upstream/3_4_2' into 3_4_2_branch_merging
2018-10-22 20:33:38 +02:00
940f436a5f
merge MK3_dev into MK3
2018-10-22 20:25:29 +02:00
bc247ca02c
MK2.5 sw reset at setup function
2018-10-19 17:54:48 +02:00
ac18eb67c0
New lang, arduino 1.8.5 - boot_app debug output
...
+ variable _uartout linkage fix
+ DEBUG_DCODE5
2018-10-18 16:20:14 +02:00
9cae0c378a
Rename _EEPROM_writeData to EEPROM_writeData. Rename _EEPROM_readData to EEPROM_readData. Add return value to EEPROM_writeData to detect failure to write. Do not mark data as valid, if write has failed. Remove EEPROM_WRITE_VAR and EEPROM_READ_VAR macros. Make pos input only parameter. Convert EEPROM_OFFSET macro to typed constatant EEPROM_M500_base, it was defined in two places, leave it in one place. Use Config_StoreSettings() instead of erase_eeprom_section(). Compare float with 0xff byte by byte to avoid compiler warning "Dereferencing type punned pointer will break strict aliasing rules."
2018-10-08 20:24:56 +02:00
1585dc66b0
Merge remote-tracking branch 'prusa3d/MK3_dev' into simplify_EEPROM_M500
...
Known limitation: Unable to compile.
2018-10-08 15:58:49 +02:00
7882b3c975
Update fsensor in Manage_inactivity instead of main loop.
2018-10-03 17:29:24 +02:00
d80fcab66c
Disable filament sensor response quality check.
2018-09-25 15:50:50 +02:00
19c1ba6274
Remove duplicate condition. This condition was already in if(mmu_enabled) {} else branch.
2018-09-25 14:25:03 +02:00
c38fef281d
Use cs.max_feedrate_silent, cs.max_acceleration_units_per_sq_second_silent from ConfigurationStore.
2018-09-24 17:33:58 +02:00
ca179a2d18
Use cs.filament_size from ConfigurationStore.
2018-09-24 17:29:02 +02:00
e225e9cab0
Use cs.volumetric_enabled from ConfigurationStore.
2018-09-24 17:12:16 +02:00
a201128b20
Use cs.retract_length, cs.retract_feedrate, cs.retract_zlift, cs.retract_recover_length and cs.retract_recover_feedrate from ConfigurationStore.
2018-09-24 17:10:25 +02:00
7e593e6922
Use cs.autoretract_enabled from ConfigurationStore.
2018-09-24 17:03:10 +02:00
20ba2b1c79
Use cs.bedKp, cs.bedKi and cs.bedKd from ConfigurationStore.
2018-09-24 16:57:48 +02:00
54bcc8aa52
Use cs.Kp, cs.Ki and cs.Kd from ConfigurationStore.
2018-09-24 16:54:50 +02:00
f2ae3fb1f7
Use cs.zprobe_zoffset from ConfigurationStore.
2018-09-24 16:47:57 +02:00
959d0069fa
Use cs.add_homing from ConfigurationStore.
2018-09-24 16:42:28 +02:00
ac7c062161
Use cs.max_jerk from ConfigurationStore.
2018-09-24 16:35:33 +02:00
bb66bfe6a7
Use cs.minsegmenttime from ConfigurationStore.
2018-09-24 16:22:50 +02:00
0e7afc67ca
Merge pull request #1175 from PavelSindler/eeprom_version
...
M500 EEPROM version update and M500 EEPROM block size check
2018-09-24 16:19:55 +02:00
10428b30d9
Use cs.mintravelfeedrate from ConfigurationStore.
2018-09-24 16:01:58 +02:00
26e2fd1c76
Use cs.minimumfeedrate from ConfigurationStore.
2018-09-24 15:57:24 +02:00
b8fefceb4d
Use cs.retract_acceleration from ConfigurationStore.
2018-09-24 15:53:35 +02:00
7dbe0afdc4
Use cs.acceleration from ConfigurationStore.
2018-09-24 15:47:36 +02:00
cee51cf9c3
Use cs.max_acceleration_units_per_sq_second_normal from ConfigurationStore.
2018-09-24 15:40:35 +02:00
02becb5e6a
Use cs.max_feedrate_normal from ConfigurationStore.
2018-09-24 15:09:19 +02:00
053b94b711
remove "start" duplicity in setup
2018-09-24 14:57:46 +02:00
3f28632443
Use cs.axis_steps_per_unit from ConfigurationStore.
2018-09-24 14:54:41 +02:00
752aec37fb
M500 EEPROM version changed; if EEPROM_M500_SIZE is not updated, data are not stored
2018-09-19 14:36:26 +02:00
1253fb338a
wizard hotfix
2018-09-10 18:02:54 +02:00
001680bbdc
Merge branch 'MK3' into time_remaining_fix
...
# Conflicts:
# Firmware/Marlin_main.cpp
2018-09-07 08:21:36 +02:00
801f8e93e8
Merge pull request #1112 from PavelSindler/MK25_time_remaining
...
MK25: always show "normal mode" remaining time (PFW-553)
2018-09-07 08:05:16 +02:00
2f02828273
time remaining fix
2018-09-07 02:02:35 +02:00
66305b3e04
MK25: always show "normal mode" remaining time
2018-09-06 23:05:36 +02:00
40679dcb3a
Merge branch 'MK3' into MK3
2018-09-05 00:06:48 +02:00
25a22120fb
1-st Layer Calibration correction
...
filament loading improvement
2018-08-30 03:32:33 +02:00
b284c70d9b
auto deplete: dont eject filament
2018-08-29 13:08:09 +02:00
515e78cfd1
Eject filament feature in menu, M600: if it was envoked by FINDA, eject filament
2018-08-29 01:58:28 +02:00
d290543d7d
Merge pull request #1085 from mkbel/fix_active_filament
...
Fix active filament PFW-528
2018-08-28 23:50:57 +02:00
2cd8691376
Do not use global variable tmp_extruder when setting temperature.
2018-08-28 20:26:33 +02:00
0695f3f345
Z-move correction
...
Z-move inhibition after FactoryReset
2018-08-28 19:58:03 +02:00
8aeb7e04f1
Fix bound check for T0 .. T4 command. Document mmu_load_to_nozzle().
2018-08-28 18:52:16 +02:00
55eaa1de83
Fix code indentation.
2018-08-28 18:26:10 +02:00
9fb68fb724
Remove usage of global variable tmp_extruder in M200.
2018-08-28 18:08:21 +02:00
3e2cb72695
Merge branch 'MK3' into auto_deplete_2
2018-08-28 11:01:30 +02:00
2a00e5d348
Fix loading filament screen hangs if changed automatically.
2018-08-27 20:09:22 +02:00
191e5dfddd
mmu M600: dont use change extruder posibility; unload starts always imidiately
2018-08-27 16:12:10 +02:00
168bc74102
Merge pull request #1075 from PavelSindler/mmu_filament_sensor
...
Mmu filament sensor
2018-08-27 05:26:12 +02:00
b01e2a1a22
Merge pull request #1073 from PavelSindler/M600_mmu_fix
...
M600 mmu fix
2018-08-27 05:26:00 +02:00
03fffae4c3
finda runout sensor can be turned on/off from menu
2018-08-27 05:20:42 +02:00
ceb49d1262
finda filament runout: initial version
2018-08-27 04:21:43 +02:00
d3ed270a5a
single material printer (no mmu unit) M600 hotfix: M600_check_state loop working
2018-08-26 23:52:45 +02:00
2610547a48
Fixed displayed filament after load
2018-08-26 16:39:21 +02:00
85358342bc
Merge pull request #1065 from PavelSindler/mmu_v2_continue_loading
...
Mmu v2: continue loading command
2018-08-25 20:03:12 +02:00
f3edd37d11
removing unretract
2018-08-25 16:52:19 +02:00
68f2e22dad
continue loading command
2018-08-24 18:28:05 +02:00
5dc2af961b
ShippingPrepare & M600
...
message after ShippingPrepare
M600 :: better filament (un)retraction
2018-08-23 00:08:14 +02:00
315bfc43dd
MMU communication fix
2018-08-21 16:41:01 +02:00
94423e6f7e
MMU communication - mmu_ready
2018-08-20 20:53:53 +02:00
c4281b0b36
Status screen redesign - fix of flickering and text wraping on status screen
...
printf formating, saved flash, reduced code size
2018-08-20 00:27:45 +02:00
fd9516f520
Status screen - status message logic simplification
...
added definitions of custom_message_type values
removed flag custom_message (previous solution maybe caused displaying of empty status line)
fixed in Marlin_main.cpp code "custom_message = _T(MSG_TEMP_CALIBRATION)"
2018-08-19 18:34:57 +02:00
f1ad1d22ba
Menu lcd_adjust_bed fixed (Bed level correction, PFW-499)
2018-08-19 13:59:33 +02:00
8409a26594
Live adjust Z - display zero in case of invalid calibration status (same logic in babystep_load and _lcd_babystep)
2018-08-10 19:55:50 +02:00
9ee7a2124b
removed unused code
2018-08-09 18:43:07 +02:00
796079bb08
MMU2 communication - connection after reset, fw versions, state machine
...
+removed debug log from tmc2130
2018-08-09 17:43:43 +02:00
310751397c
line endings + fixed declaration
2018-08-08 20:11:57 +02:00
990a5c9119
PFW489 (github issue 1008) - time remaining variables declared as uint32
2018-08-08 19:51:50 +02:00
23e5cea5d0
MMU - code cleaning (modularity)
...
M403 set filament type
hardware reset
2018-08-08 18:58:03 +02:00
9e09efc9f4
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
...
conflicts + fix
2018-08-07 20:55:08 +02:00
71f1a1f6db
MMU - communication, check after start, code cleaning
2018-08-07 20:37:59 +02:00
d21e527c73
PRUSA Fir reports also buildnumber
2018-08-05 20:17:04 +02:00
cf06c5171c
merge with upstream
2018-08-03 18:43:09 +02:00
a1f69e0924
manage response update
2018-08-03 18:37:52 +02:00
5824da8310
add more extrusion to M600 load filament
2018-08-03 15:42:06 +02:00
dd4c4b39b4
Added support for the upstream Marlin interpretation of the M204 code:
...
M204 S.. T..:
T is interpreted the old way (as acceleration when retracting)
only if an S code is found at the same line.
This allows PrusaResearch to interpret the legacy G-codes generated
by our older Slic3r with older Slic3r profiles.
M204 P.. R.. T..:
T is ignored, P is interpreted as acceleration when extruding,
R is interpreted as acceleration when retracting.
This will be the format the Slic3r 1.41.0 will produce from
the Machine Limits page.
In the future both MK3 firmware and Slic3r will likely be extended
to support the separate travel acceleration.
This change will help us to solve the following Slic3r issue:
https://github.com/prusa3d/Slic3r/issues/1089
2018-08-03 15:33:41 +02:00
ae7561bb27
M600 fix: set hotend temperature to correct value, manage_response function fix: now works in case that user presses button on mmu unit before he is asked to do it, compiler warnings (uninitialized variables) fixed
2018-08-03 15:26:39 +02:00
468873ec68
MMU2 - removed conditional translation for SNMM_V2, new module mmu
2018-08-02 18:54:00 +02:00
282ff6c577
removed unused union
2018-08-02 17:09:02 +02:00
d378575a68
SNMM_V2 - default retraction declared as variable
2018-08-02 17:07:09 +02:00
ac60b3ebe7
Merge pull request #996 from PavelSindler/snmm_v2
...
M600 updated
2018-08-01 19:39:08 +02:00
618aea25d6
Merge pull request #995 from PavelSindler/filament_type
...
snmm v2: send filament type to mmu
2018-08-01 19:33:44 +02:00
24e7f0d0ec
mmures fix
2018-08-01 19:29:50 +02:00
06063118bd
M600 updated
2018-08-01 18:47:28 +02:00
b0077182e5
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:53:49 +02:00
54adb0beea
missing eol added
2018-08-01 16:54:26 +02:00
b35ef498f0
comments updated
2018-08-01 16:46:46 +02:00
665a885a21
Merge commit 'baddf38dbc2c72ab095deaf9b3e251ea2faeb699' into fix_compiler_warnings
2018-08-01 16:44:17 +02:00
135c4db5da
gcode for filemant type initial version: just re-sending information to mmu
2018-08-01 15:43:13 +02:00
0e059f8da6
single material fix: remove semicolon, unload_filament() function definition
2018-08-01 11:33:58 +02:00
e153a29bdb
messages corrected, 5 minutes timeout when communicating with mmu
2018-08-01 10:42:09 +02:00
45ac42caff
snmm v2: manage response: wait for nozzle temp only when heating
2018-08-01 09:58:07 +02:00
be1167fae3
M600 for multimaterial: don't check if filament unload was succesfull
2018-07-31 19:18:09 +02:00
40da6deef8
timeouts used when getting response from mmu, M600 improvements, no filament sensor in variants file
2018-07-31 19:00:42 +02:00
04d0178150
automatic M600 initial version
2018-07-31 12:24:22 +02:00
67f56d3de9
merge with upstream
2018-07-30 17:24:58 +02:00
970ba6fa2a
Sound
...
all cases
2018-07-29 22:59:14 +02:00
5bc40aff85
Merge pull request #975 from XPila/MK3-new_lang
...
EEPROM dump (code D3)
2018-07-26 19:59:09 +02:00
2f9003dbdd
fsensor - better state handling
2018-07-26 19:50:33 +02:00
9235ffb497
T code for SNMM_V2 fix
2018-07-26 17:03:43 +02:00
691e7a24ed
EEPROM dump (code D3)
2018-07-26 13:20:35 +02:00
cadb2e9cfe
Merge pull request #973 from MRprusa3d/MK3
...
PowerPanic IV
2018-07-26 09:40:57 +02:00
5be82962ee
PowerPanic IV
2018-07-25 19:24:41 +02:00
59c0127b77
automatic M600 for mmu v2: work in progress
2018-07-25 16:48:39 +02:00
Alex Voinea
Yuri D'Elia
3d-gussner
DRracer
Panayiotis-git
Marek Bel
MRprusa3d
MRprusa3d
Marek Běl
Marek Kühn
Simon Benoit
NotaRobotexe
Vojtech Pavlik
Ondrej Tuma
Robert Pelnar
PavelSindler
Harpalyke
PavelSindler
Laurentiu
bubnikv