Marek Bel
bf57a59147
Extract duplicate code into function. Saves 106B flash.
2019-04-05 15:12:35 +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
d22793f276
Z-probe nr. states reduced to 1; 3; 5
2019-03-28 12:02:46 +01:00
MRprusa3d
632781c4a2
"disable_z()" for Delta PSU
2019-03-21 00:45:15 +01:00
MRprusa3d
7d98177716
farmMode updates
2019-03-19 19:48:40 +01:00
PavelSindler
b20d9171b6
Merge remote-tracking branch 'upstream/MK3' into 7x7
2019-03-12 11:47:17 +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
6a864ffbab
G80 parameters configurable via settings menu
2019-03-08 15:43:37 +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
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
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
Marek Bel
02a692c5d9
Store cutter enable state in EEPROM.
2019-02-27 17:34:03 +01:00
Marek Bel
4a4eb9962c
Cut filament when cutter is enabled and MMU load fails.
2019-02-27 10:42:26 +01:00
Marek Bel
49b1d1cb93
Move prototype to header file.
2019-02-26 18:50:15 +01:00
PavelSindler
9926468c91
Merge remote-tracking branch 'upstream/MK3' into variants
2019-01-30 17:26:45 +01:00
Marek Bel
6d2358125a
Fix Timer_test broken by conditional translation for SYSTEM_TIMER_2.
2019-01-28 19:29: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
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
fc0b55b213
Timing functions micros2 and delay2 + fix of delay_keep_alive().
2019-01-27 17:23:53 +01:00
PavelSindler
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
Marek Bel
b4d4bfa667
Do not declare extern class in .cpp file, include appropriate header.
2018-11-06 20:54:53 +01:00
PavelSindler
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
PavelSindler
0e0dbad871
#ifdef __cplusplus added to allow including to .c file
2018-10-25 21:06:37 +02:00
PavelSindler
01529f18d2
upstream/MK3 merge
2018-10-25 20:57:27 +02:00
Robert Pelnar
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
Marek Bel
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
Marek Bel
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
Marek Bel
ca179a2d18
Use cs.filament_size from ConfigurationStore.
2018-09-24 17:29:02 +02:00
Marek Bel
e225e9cab0
Use cs.volumetric_enabled from ConfigurationStore.
2018-09-24 17:12:16 +02:00
Marek Bel
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
Marek Bel
7e593e6922
Use cs.autoretract_enabled from ConfigurationStore.
2018-09-24 17:03:10 +02:00
Marek Bel
f2ae3fb1f7
Use cs.zprobe_zoffset from ConfigurationStore.
2018-09-24 16:47:57 +02:00
Marek Bel
959d0069fa
Use cs.add_homing from ConfigurationStore.
2018-09-24 16:42:28 +02:00
PavelSindler
1253fb338a
wizard hotfix
2018-09-10 18:02:54 +02:00
PavelSindler
2f02828273
time remaining fix
2018-09-07 02:02:35 +02:00
Marek Bel
12b1769531
Fix printer reset when changing filament during print over USB.
2018-08-30 16:02:13 +02:00
Marek Bel
2cd8691376
Do not use global variable tmp_extruder when setting temperature.
2018-08-28 20:26:33 +02:00
PavelSindler
ceb49d1262
finda filament runout: initial version
2018-08-27 04:21:43 +02:00
Robert Pelnar
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
Robert Pelnar
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
Robert Pelnar
310751397c
line endings + fixed declaration
2018-08-08 20:11:57 +02:00
Robert Pelnar
990a5c9119
PFW489 (github issue 1008) - time remaining variables declared as uint32
2018-08-08 19:51:50 +02:00
Robert Pelnar
23e5cea5d0
MMU - code cleaning (modularity)
...
M403 set filament type
hardware reset
2018-08-08 18:58:03 +02:00
Robert Pelnar
9e09efc9f4
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
...
conflicts + fix
2018-08-07 20:55:08 +02:00
PavelSindler
a1f69e0924
manage response update
2018-08-03 18:37:52 +02:00
PavelSindler
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
PavelSindler
b99b73c924
missing declaration
2018-07-31 19:03:53 +02:00
PavelSindler
40da6deef8
timeouts used when getting response from mmu, M600 improvements, no filament sensor in variants file
2018-07-31 19:00:42 +02:00
PavelSindler
04d0178150
automatic M600 initial version
2018-07-31 12:24:22 +02:00
Martin Remiš
c7d7389e27
PowerPanic & Sound
2018-07-23 20:04:47 +02:00
PavelSindler
b688bc9294
Merge branch 'MK3' into reapply_fix_compiler_warnings
2018-07-23 14:38:43 +02:00
PavelSindler
dcf3b792be
Merge pull request #948 from XPila/MK3-new_lang
...
FSensor - optical quality meassurement
2018-07-23 14:37:16 +02:00
Marek Bel
88cce94cf9
Revert "Revert "Save 80B of flash and 8B of RAM and fix compiler warning:""
...
This reverts commit 77426b563a
.
2018-07-23 13:35:38 +02:00
PavelSindler
18419eefc4
no timeouts when communicating with mmu (temporarily ?)
2018-07-23 10:50:58 +02:00
Robert Pelnar
60b4db15e0
FSensor - M600 fix + cond. translation + tunning filter and params
2018-07-22 16:14:13 +02:00
Robert Pelnar
c6a3f073dd
FSensor - M600/autoload fix + optical quality meassurement
2018-07-21 17:04:29 +02:00
PavelSindler
231a6dcf1b
M600 for single material fix
2018-07-19 20:27:39 +02:00
PavelSindler
86882ae10a
M600 for snmm_v2 intial working version
2018-07-19 20:16:42 +02:00
PavelSindler
5fecb7a2dc
M600
2018-07-19 16:17:46 +02:00
PavelSindler
7600848533
load to nozzle function, M600 work in progress
2018-07-19 13:14:29 +02:00
PavelSindler
b9be718deb
timeout used everywhere where we are waiting for mmu reponse
2018-07-18 16:25:31 +02:00
PavelSindler
0a43b9ce6b
timeout when waiting for mmu OK
2018-07-18 16:17:45 +02:00
XPila
7bec5c6d5c
Merge branch 'MK3' into MK3-new_lang
2018-07-17 11:47:01 +02:00
PavelSindler
77426b563a
Revert "Save 80B of flash and 8B of RAM and fix compiler warning:"
2018-07-17 11:28:44 +02:00
PavelSindler
85c37d1225
Merge branch 'MK3' into fix_compiler_warnings
2018-07-17 10:56:25 +02:00
PavelSindler
322978c920
Merge branch 'MK3_mk_prep' into MK3
2018-07-17 10:03:31 +02:00
Robert Pelnar
e22d204e8e
LCD menu optimalization - print functions
...
+removed unused code
2018-07-16 19:29:27 +02:00
Robert Pelnar
268d2634f0
LCD menu optimalization - lcd and menu
...
removed unused code and conditional translation
2018-07-16 02:13:52 +02:00
PavelSindler
6824ab65dd
G28 fix
2018-07-15 20:00:29 +02:00
Marek Bel
c251777590
Fix compiler warning:
...
In file included from sketch/BlinkM.cpp:5:0:
sketch/Marlin.h:422:13: warning: 'void print_time_remaining_init()' declared 'static' but never defined [-Wunused-function]
static void print_time_remaining_init();
Make local functions static. Saves 6B of flash.
2018-07-13 18:44:54 +02:00
Robert Pelnar
e2ff00b05f
Menu optimalization - SDcard menu - initial implementation for async variant
2018-07-09 12:44:19 +02:00
PavelSindler
1077895fd4
Don't return "Not SD printing" in case that SD card print is paused
2018-06-13 18:22:58 +02:00
Robert Pelnar
a1ea5019dc
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-06-10 16:29:29 +02:00
Robert Pelnar
c0946d8f04
New ML support - w25x20cl spi external flash support
...
+fixed some messages
+sec lang update test
2018-06-09 01:23:04 +02:00
PavelSindler
a15f0138de
show estimated time to end of the print if available in gcode: initial version
2018-06-07 20:50:30 +02:00
PavelSindler
d307868a90
merge with upstream
2018-05-28 20:38:55 +02:00
PavelSindler
7e79ce8e53
MK3: crash detection for Z axis is active during auto home and mesh bed leveling (normal mode is forced for Z movents); temp cal coordintes corrections; temp cal: xy movents always in safe Z distance from heatbed, Z-axis homing improved
2018-05-28 20:26:15 +02:00
PavelSindler
d63a17c696
Safety timer not active during filament runout detection
2018-05-22 13:31:21 +02:00
Marek Bel
ae08788c99
Split lcd_service_mode_show_result screens to separate functions. Make them non blocking. Remove global array distance_from_min, pass it as function return value. Make Support submenus returning to Support menu.
2018-04-26 16:36:02 +02:00
MRprusa3d
0b6644915a
Add files via upload
2018-04-25 18:47:19 +00:00
Robert Pelnar
baade7db61
Removed unused files (ST7565R-dogm, digipot)
...
renamed functions digipot_init and digipot_current
fixed cond. trans. (menus)
fixed variant files - MK25, MK3
2018-03-29 23:01:13 +02:00
PavelSindler
08ec920d33
merge with upstream
2018-03-15 14:25:17 +01:00
Robert Pelnar
ac1a56b493
Merge branch 'MK25' into MK3
2018-03-13 20:43:19 +01:00
PavelSindler
f45f206faf
sorting files disabled in farm mode, start printer status needs reponse from monitoring
2018-03-13 18:50:11 +01:00
PavelSindler
ddeb7b8c84
statistics improved, initial version of function which forces user to connect printer to monitoring
2018-03-13 18:43:42 +01:00
Robert Pelnar
a6f900fd3c
Merge remote-tracking branch 'upstream/MK25' into MK25
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-03-06 15:11:50 +01:00
XPila
30bb84a7a7
Merge pull request #487 from PavelSindler/eeprom_printer_versions
...
Eeprom hw versions
2018-02-22 11:48:26 +01:00
PavelSindler
a4b3389dfa
M45 verbosity, steel sheet define, minor modifications in xyz cal
2018-02-22 10:38:46 +01:00
PavelSindler
0323af531d
printer types and motherboard types added to eeprom; min extrude temp lowered because of woodfil
2018-02-22 00:09:12 +01:00
bubnikv
ba49c21f17
Unified the volumetric_multiplier with extrusion_multiply to improve
...
numeric accuracy and to reduce compuatitonal load. With this commit,
the numeric rounding is fixed not only for the M221 G-code
(as implemented by the preceding commit), but also for the volumetric
extrusion in general.
Removed the old FILAMENT_SENSOR code, which served the purpose
to modulate the volumetric multiplayer in real time depending
on the measured filament diameter. This feature will certainly not be
used by Prusa Research in the near future as we know of no sensor,
which would offer sufficient accuracy for a reasonable price.
2018-02-21 11:25:21 +01:00
Robert Pelnar
79caf3d9c6
tmc2130 optimalization, accurate homing and microstep linearity correction
...
dcode D12 removed (no longer needed)
homeaxis optimized + xy home calibration support
new eeprom variables
new lcd menu edit types (byte3, mres, wfac), new menu "Experimental"
currents adjusted
2018-02-15 04:17:58 +01:00
PavelSindler
29978c4126
TACH_1 must be defined to enable print fan error
2018-02-07 11:10:04 +01:00
PavelSindler
3bd892135a
erase eeprom section which belongs to M500 gcode in case that version was changed and default settings are used
2018-02-05 16:49:06 +01:00
bubnikv
5ed9233abc
Missed a bit with the last commit.
2018-01-12 22:01:53 +01:00
bubnikv
82304a2268
Slight optimization of the fan speed interrupt routine by accessing
...
the Arduino millis() without locking interrupts.
2018-01-12 21:16:29 +01:00
PavelSindler
087532085f
development fw versions has initial message for warning
2018-01-11 15:50:26 +01:00
Robert Pelnar
3ddbac6056
LCD_PWM removed (will be solved other way)
2017-12-21 01:00:49 +01:00
PavelSindler
17d9bb205a
selftest tests filament sensor, selftest messages have language variants
2017-12-20 23:40:18 +01:00
PavelSindler
82dffb688a
force high power mode during xyz cal. and selftest
2017-12-12 20:21:09 +01:00
PavelSindler
071873b38a
init; last merged file: Marlin_main.cpp
2017-12-06 17:48:16 +01:00
PavelSindler
44218a1b53
incomplete file check ported from MK2: initial version
2017-12-06 14:55:53 +01:00
Robert Pelnar
7c8de94778
filament unload - initial
...
lower currents for power panic
2017-11-27 15:54:36 +01:00
PavelSindler
42b533b5d8
first working version
2017-11-27 06:20:51 +01:00
Robert Pelnar
b8525f8043
Print class printf function (experimental, disabled by default)
...
LiquidCrystal VT100 escape codes (EraseScreen, CursorHome, ...)
Stream support for lcd and uart, fprintf and printf (stdout=uartout)
Dcodes enabled, code reduced, printf used
Splash screen with esc codes
2017-11-20 20:09:54 +01:00
Robert Pelnar
aee62750e7
Build 109
2017-11-16 22:03:36 +01:00
XPila
279ea79bf6
Merge pull request #86 from PavelSindler/keepalive_messages
...
host keep alive messages
2017-11-16 20:53:09 +01:00
Robert Pelnar
ee2f927148
Build Number = 108
...
FSensor log can be enabled with D9125L1
Selftest menu
PINDA D codes
2017-11-16 20:51:50 +01:00
PavelSindler
91d125369e
keepalive messages initial version
2017-11-15 15:09:29 +01:00
PavelSindler
2e68770e62
initial version - messages missing (will not compile)
2017-11-07 16:49:04 +01:00
PavelSindler
1ee6016fa0
Merge remote-tracking branch 'upstream/MK3' into 4point_xyz_cal
2017-10-30 11:48:45 +01:00
PavelSindler
c4d7b801b9
Initial version. XYZ cal works, but bed ref. points coordinates must be checked.
2017-10-27 16:12:37 +02:00
PavelSindler
f4d5d891df
measuring pulse width: initial version
2017-10-26 17:42:27 +02:00
Robert Pelnar
b475d11bdb
Maker Faire brainstorm 2.0 (2)
...
Automatic recover after short power loss (according to heatbed temperature drop)
Adjusted crashdetection - TMC2130_TCOOLTHRS_X and TMC2130_TCOOLTHRS_Y = 450 to be enabled at low speed
!!!ALL FEATURES TESTED AT THIS POINT!!!
2017-09-26 06:11:42 +02:00
Robert Pelnar
89121e6e34
Maker Faire brainstorm 2.0
...
Added filament sensor and crash detection to EEPROM
Added crash-detection counters display disable directive
Added Restore/Save print directive
Added crash detection and filament sensor settings to Tune menu
2017-09-26 04:30:10 +02:00
Robert Pelnar
f2f74ebddf
Powerpanic Z correction improved.
2017-09-23 20:36:10 +02:00
Robert Pelnar
480838a0a1
Fixed homing (mbl and babystep - crashdetection recovery work fine now).
2017-09-23 16:35:01 +02:00
Robert Pelnar
e34d816004
Recover print
2017-09-20 16:04:02 +02:00
Robert Pelnar
2c3387e71d
Recover print - simple solution
2017-09-19 21:38:47 +02:00
Robert Pelnar
f563618b1c
PINDA thermistor + extruder current adjust.
2017-08-30 21:56:48 +02:00
Robert Pelnar
1e705198e0
LCD backlight brightnes pwm control and lcd blinking.
2017-08-21 17:23:30 +02:00
Robert Pelnar
ec7678a25f
pat9125 filament sensor
...
sg homing - bug fix + homing multiple axes simultanously (AXIS_MASK)
2017-07-07 04:45:09 +02:00
PavelSindler
a8678cb2fd
recover print
2017-07-04 11:31:39 +02:00
PavelSindler
17074e1d25
saving/restoring filename and current position in bytes to eeprom, UVLO changed
2017-07-02 21:01:23 +02:00
PavelSindler
db12119b68
position saving and restoring in UVLO
2017-07-02 00:11:21 +02:00
PavelSindler
c4be651d2b
uvlo initial version
2017-07-01 18:51:02 +02:00
PavelSindler
43d696659f
3.0.12-RC2 sync
2017-06-29 18:35:43 +02:00
PavelSindler
0578ea527e
fan speed check initial version, selftest updated
2017-06-28 14:24:45 +02:00
michalprusa
3faef75a0d
3.0.10 sync
2017-03-24 19:47:50 +01:00
michalprusa
307d17422d
3.0.6 sync
2016-08-11 10:42:53 +02:00
michalprusa
30f0528aba
Initial commit
2016-07-22 15:28:01 +02:00