Commit Graph

196 Commits

Author SHA1 Message Date
DRracer
8b806f692e
Merge pull request #1664 from MRprusa3d/PFW-811
"disable_z()" for Delta PSU
2019-07-16 16:46:34 +02:00
DRracer
a3fde091ab More than 7.5KB saved by slight refactoring of printing to serial line 2019-07-12 10:10:56 +02:00
NotaRobotexe
e77898d5dc code edit 2019-07-04 13:21:27 +02:00
NotaRobotexe
81b3b71cca check eeprom inicialization 2019-07-03 19:37:11 +02:00
Marek Bel
72f5e87c61 Merge branch 'MK3' into use_enum_class_2 2019-06-12 19:17:35 +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
cbb92860d0 Use first letter capital camel case for enum class members. 2019-06-12 18:54:32 +02:00
MRprusa3d
b7d3766ae2
Merge branch 'MK3' into PFW-790 2019-06-12 17:32:13 +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
baa36ce740 another almost 200B down by proper usage of smaller data types and enum
classes
2019-06-12 09:58:42 +02:00
MRprusa3d
1d8c24e8a9 "disable_z()" for Delta PSU IV
correction for (motor) mode switching
2019-06-05 19:22:04 +02:00
DRracer
9cb0bc7bcf Fix MINTEMP errors and fsensor runout 2019-05-24 08:46:44 +02:00
Marek Bel
1f3877b221 Extract duplicate code into function. Saves 4B of flash. 2019-05-15 16:31:10 +02: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
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