3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,072 Commits 3 Branches 78 Tags 40 MiB
a8de9d5696
Commit Graph

198 Commits

Author SHA1 Message Date
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
MRprusa3d
1f131f66e0 print parameters checking 
nozzle diameter
 2019-03-14 00:36:56 +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
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
819a91ab1e switching stealth/normal mode for mmu in settings menu and tune menu 2019-03-11 12:33:22 +01:00
PavelSindler
9dde8c4732
Merge pull request #1591 from MRprusa3d/PFW-795c 
better autoLoad
 2019-03-04 15:31:04 +01:00
MRprusa3d
b02ca18c93 better autoLoad 
autoLoad inhibit if Support::ExtruderInfo-menu is selected
 2019-03-04 12:52:35 +01:00
PavelSindler
22c0d6e230
Merge pull request #1577 from mkbel/add_cut 
Add MMU cut filament
 2019-03-01 14:53:12 +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
d5c5ed55eb Change formatting. 2019-02-25 11:12:39 +01:00
MRprusa3d
da0867cfc5 preHeat @ filament management 
another funcionality
 2019-02-20 03:01:33 +01:00
MRprusa3d
ef1f82627e preHeat @ filament load / unload / autoLoad / MMU 
MMU options added
 2019-02-13 23:53:00 +01:00
MRprusa3d
a53d150903 preHeat @ filament load / unload / autoLoad 
autoLoad option added
 2019-02-06 01:58:05 +01:00
Marek Bel
e95c2ad592 Display auto deplete as not available if filament sensor is disabled. 2018-11-05 17:43:07 +01:00
PavelSindler
688c10247e
Merge pull request #1291 from XPila/MK3-new_bs 
lang update
 2018-11-05 10:38:29 +01:00
PavelSindler
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
MRprusa3d
73794b56cf MeshBed Leveling Fail 
Z-leveling after MeshBed leveling failing
 2018-11-02 23:03:14 +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
Robert Pelnar
a0e4acead3 lang - removed unused code and some service messages changed to "not translated" 2018-11-01 14:07:16 +01:00
PavelSindler
e80af46503 load to nozzle and Tx and Tc codes: intial version 2018-10-31 21:48:05 +01:00
Marek Bel
635a1b4cd8 Add possibility to to select preheat temperature when unloading filament in first layer calibration wizard. 
Known limitations:
During filament eject, menu is shown for some moment.
 2018-09-14 18:29:14 +02:00
Marek Bel
fe30e58fb5 Add possibility to unload filament from wizard before first layer calibration, if it is not PLA. 
Known limitations:
Preheat temperature other than PLA can not be selected.
During filament eject, menu is shown for some moment.
 2018-09-14 16:06:25 +02:00
Marek Bel
d14822b22f Give wizard states human readable names. Use uint8_t as underlying type - saves 20B of FLASH memory. 2018-09-13 16:37:41 +02:00
Marek Bel
13b67f0e0a Add Cancel item into PLA filament selection menu initiated by first layer calibration with MMU. 2018-09-11 22:33:13 +02:00
Marek Bel
19a1ccdc76 Rename choose_extruder_menu() to choose_menu_P(), add parameters to make it reusable. 2018-09-11 16:51:00 +02:00
Marek Bel
920d828833 Rename lcd_sdcard_pause() to lcd_pause_print() to reflect, that also USB printing could be possible to pause. Unite it with pause_print() and use new (immediate) pause mechanism in all places where old mechanism was used. Rename resume_print() to lcd_resume_print() and make it global, unite it with lcd_sdcard_resume() and use it also in place, where lcd_commands_type = LCD_COMMAND_LONG_PAUSE_RESUME was used. Remove LCD_COMMAND_LONG_PAUSE_RESUME lcd_command_type. Remove unused pause_lastpos[]. 2018-09-06 08:43:54 +02:00
Marek Bel
af08e16426 Use stop_and_save_print_to_ram() and restore_print_from_ram_and_continue() pair to pause print from menu. Move declaration of those functions to marlin.h. Move declaration of FSensorStateMenu to ultralcd.h. 
Known limitations: Filament is not retracted, extruder is not lifted in Z and moved to rear left corner in XY. Nozzle heating is not turned off nor restored. Unused code is not removed.
 2018-09-04 08:13:56 +02:00
Marek Bel
adde0d3944 Merge branch 'prusa3d_MK3' into MK3_dev 2018-08-28 17:31:12 +02:00
PavelSindler
3e2cb72695
Merge branch 'MK3' into auto_deplete_2 2018-08-28 11:01:30 +02:00
Marek Bel
7aadb2f660 Fix compile time error: default argument given for parameter 2 of int8_t lcd_show_fullscreen_message_yes_no_and_wait_P 2018-08-27 20:57:57 +02:00
Marek Bel
b08ae95568 Rename autoDeplete to lcd_autoDeplete and make it global. When filament runs out, call M600 AUTO if lcd_autoDeplete is enabled. Shorten finda polling period to 300 ms. 2018-08-27 19:36:54 +02:00
Marek Bel
3b3d6ab472 Merge branch 'MK3' into MK3_dev 2018-08-21 17:56:34 +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
f1ad1d22ba Menu lcd_adjust_bed fixed (Bed level correction, PFW-499) 2018-08-19 13:59:33 +02:00
Marek Bel
ac62117d6b Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev 2018-08-13 19:38:55 +02:00
Robert Pelnar
923a06c164 menu data shared memory re-design 
+code cleaning
 2018-08-10 02:59:49 +02:00
Marek Bel
e06e19edf5 Fix showing calibration results. 
Messages:
_i("XYZ calibration failed. Bed calibration point was not found.")
_T(MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED);
_i("XYZ calibration failed. Front calibration points not reachable.")
_i("XYZ calibration failed. Right front calibration point not reachable.")
_i("XYZ calibration failed. Left front calibration point not reachable.");
were never shown.
Fix compiler warnings:
sketch/ultralcd.cpp:3476:19: warning: comparison is always false due to limited range of data type [-Wtype-limits]
sketch/ultralcd.cpp:3478:26: warning: comparison is always false due to limited range of data type [-Wtype-limits]
 2018-08-07 15:46:23 +02:00
Robert Pelnar
468873ec68 MMU2 - removed conditional translation for SNMM_V2, new module mmu 2018-08-02 18:54:00 +02:00
Marek Bel
ef8921d45e Fix 10 compiler warnings of type: sketch/menu.cpp: In function 'void _menu_edit_int3()': 
sketch/menu.cpp:272:51: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
 #define _menu_data (*((menu_data_edit_t*)menu_data))
 2018-08-01 22:43:36 +02:00
PavelSindler
04d0178150 automatic M600 initial version 2018-07-31 12:24:22 +02:00
PavelSindler
77cc55ed76
Merge pull request #951 from PavelSindler/use_timer 
Use timer
 2018-07-24 09:31:45 +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
efd03b426f final edits to fit changes on upstream 2018-07-23 09:14:22 +02:00
PavelSindler
565a6db3e4 use timer class 2018-07-22 16:26:12 +02:00
PavelSindler
33f9af65c8 merge with upstream/MK3 2018-07-17 16:36:53 +02:00
Robert Pelnar
19a72ef9eb LCD menu optimalization - LiquidCrystal_Prusa removed 2018-07-16 23:23:15 +02:00
Robert Pelnar
e22d204e8e LCD menu optimalization - print functions 
+removed unused code
 2018-07-16 19:29:27 +02:00
Robert Pelnar
fd3fc31304 LCD menu optimalization - conversion functions - source separation 2018-07-16 17:23:35 +02:00
Robert Pelnar
b6223d5623 LCD menu optimalization 2018-07-16 04:13:26 +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
Robert Pelnar
39bb855333 LCD menu optimalization - menu_item_edit_int3 
MenuStack removed
FILAMENT_LCD_DISPLAY and ENCODER_STEPS_PER_MENU_ITEM removed (unused)
EXPERIMENTAL_FEATURES menu removed
 2018-07-15 18:37:59 +02:00
PavelSindler
1ad49dc5e9 first working version 2018-07-10 10:45:45 +02:00
Robert Pelnar
0cf7d12ae3 New ML support - lcd optimalization 
lcd_puts_P and lcd_printf_P functions
LineFeed implemented in LiquidCrystal_Prusa
 2018-06-10 22:06:00 +02:00
Robert Pelnar
fcfb4cdcae New ML support - menu tunning, startup 
+config headers (bool - true/false replaced with 0/1)
+fixed include hierarchy
+removed comments
 2018-06-10 16:04:32 +02:00
Robert Pelnar
5de0a6437d New ML support - W25X20CL - lang switching 
+removed unused code
 2018-06-09 23:49:26 +02:00
XPila
739de5224e
Merge branch 'MK3' into MK3-new_lang 2018-06-08 14:38:00 +02:00
Robert Pelnar
bd1e410228 New ML support - W25X20CL external spi flash support 2018-06-08 00:20:28 +02:00
Marek Bel
01af8a806b Merge branch 'MK3' into Use_Timer 2018-06-05 19:03:11 +02:00
Marek Bel
07a7ce1acf Remove unused lcd_ping_allert(). 2018-05-11 15:09:27 +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
7e462b3224
Merge branch 'MK3' into MK3 2018-04-25 19:15:36 +00:00
MRprusa3d
0b6644915a
Add files via upload 2018-04-25 18:47:19 +00:00
PavelSindler
010ceceff9 add another homing after steel sheet is removed; added timeout for pinda cooling; if PINDA doesn't trigger before reaching Z = -1mm, temp. calibration fails 2018-04-24 13:43:51 +02:00
PavelSindler
043c8c66be waiting for pinda probe cooling 2018-04-19 16:55:00 +02:00
Marek Bel
9cb036fbcb Merge remote-tracking branch 'prusa3d/MK3' into ustep_linearity_2 2018-03-28 19:11:02 +02:00
Marek Bel
40a064ffbc Add extruder linearity correction to settings menu. 2018-03-28 18:53:37 +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
27cc5e51c3 removed duplicit declaration of prusa_statistics function 2018-03-13 19:12:36 +01:00
PavelSindler
5d389a2c36 Farm mode: when print finishes, ask which filament was used for print; statistics modified 2018-03-13 19:11:02 +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
PavelSindler
85bc19b77c force selftest if user upgraded from 3.1.2-RC1 or older fw version 2018-02-27 17:52:13 +01:00
Robert Pelnar
c5175e97ec Pinout, conditional translation and variant file for MK2 2018-02-21 15:19:34 +01:00
PavelSindler
0c98ec5f6b selftest, max endstops undefined, initialization of extruder fan, y offset from extruder 2018-02-06 17:01:09 +01:00
PavelSindler
c36af887b7 M600 has timeout for nozzle, different procedure for unload 2018-01-15 11:30:28 +01:00
PavelSindler
17d9bb205a selftest tests filament sensor, selftest messages have language variants 2017-12-20 23:40:18 +01:00
PavelSindler
011ebb3675 selftest is checking if fans are swapped, host keepalive messages added 2017-12-14 19:36:32 +01:00
PavelSindler
1c61f2f29c First working version 2017-12-11 11:30:49 +01:00
PavelSindler
26135ea227 all sd sort files: initial version; sorting type switch not added to SD card menu itself 2017-12-10 11:08:50 +01:00
PavelSindler
2170c1bbe7 timeout to status prolonged, no timeout allowed when MSG_WIZARD_RERUN 2017-11-23 15:46:10 +01:00
PavelSindler
5e4236dd2e selftest for axis improved (better code readibility) and no crash triggered 2017-11-16 18:02:11 +01:00
PavelSindler
2199c84ec9 wrapper function for selftest 2017-11-15 16:40:35 +01:00
PavelSindler
eda0c6bd39 english version of xyz: place/remove steel sheet; wait for cooling down removed, 2017-11-13 17:09:26 +01:00
PavelSindler
fbbcc27f1a X max lowered to 250, XYZ/Z calibration: Z top coordinate changed, changes in xyz cal. because of stell sheet, still not final version 2017-11-12 11:30:06 +01:00
PavelSindler
2e68770e62 initial version - messages missing (will not compile) 2017-11-07 16:49:04 +01:00
PavelSindler
d1a065881b fan error: long pause is used during print, resuming print resets error flag; stop print used during heating phase 2017-09-22 20:43:30 +02:00
PavelSindler
a53428835a fan error improvements 2017-09-22 18:22:21 +02:00
PavelSindler
6eb57da770 fan check can be turned off from support menu, saving parameters to eeprom with offset and different levels, fan kickstart,2nd heatbed version, fans check modified 2017-09-21 15:20:02 +02:00
PavelSindler
54ef2936c7 selftest 2017-07-06 13:19:11 +02:00
PavelSindler
43d696659f 3.0.12-RC2 sync 2017-06-29 18:35:43 +02:00
michalprusa
3faef75a0d 3.0.10 sync 2017-03-24 19:47:50 +01:00
bubnikv
b470e103dc Reset live adjust on XYZ calibration. 
Disable timeouts in the XYZ/Z calibration.
Don't modify feed rate multiplier during the XYZ/Z calibration.
Support multi screen messages in the XYZ/Z calibration - "move the Z carriages up" step.
Support up to three lines in the XYZ/Z calibration messages.
Added a new message "Measuring reference height of calibration point xx of 9".
Changed the "move the Z carriages up" message to suggest rotating the knob.
Changed the "live adjust not set" message to reference the manual chapter and section.
Remove debugging serial line output on Z calibration.
 2016-09-01 10:44:24 +02:00
bubnikv
26405ee16f Syncing with 3.0.7 public 2016-08-31 17:12:05 +02: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