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
Alex Voinea
6bc59197ad
Merge branch 'MK3' into MK3_NEW_SD_COMPILATION 2020-09-12 08:28:13 +03:00
DRracer
22a8c18551
Merge pull request #2784 from leptun/PFW-1134-ALTFAN_KILLSWITCH 
altfan killswitch
 2020-08-06 08:15:42 +02:00
Yuri D'Elia
a8ce9358e5 Avoid redundant temperature error strings 
Factor-out MIN/MAXTEMP [BED/AMB] out of the error message, which is now
built at runtime instead.

Introduce two missing ultralcd functions lcd_setalertstatus and
lcd_updatestatus to handle regular strings.

246272 -> 246084 = 188 bytes saved
 2020-08-01 17:47:42 +02:00
Alex Voinea
ec6a20971e
Add experimental menu to HW_setup 2020-07-29 11:23:24 +03:00
Alex Voinea
a95feb56d9
ALTFAN override 2020-07-20 19:35:25 +03:00
Yuri D'Elia
d53c55ce64 Disable filament checks inside the Move -> Extruder menu 2020-06-24 16:10:32 +02:00
3d-gussner
d1865fc59a
MK3s IR sensor improvement (#2698) 
* Update EEPROM_FSENSOR_PCB documentation

* Update IR sensor check

* Rename IR messags and add UNKNOWN state

* Update code to use new messages

* To be continued

* Move fsensor related things from ultralcd.h to fsensor.h

* Use defined Thresholds

* IR sensor auto detection "0.3 or older" and "0.4 or newer" when trigger status changes.
Typo fixes
Doxygen documentation

* Cleanup spaces

* Revert PF-build.sh changes

* re-add space in messages

* revert doxygen snytax

* Remove double _Undef

* Fix indentation and doxygen syntax

* Fix indentation

* Better message handling

* Fix indentation

* Fix indentation

* More indentation fixwa

* Extract common code into manage_inactivity_IR_ANALOG_Check

Saves ~60B of code

* Revert indentation changes on fsensor.cpp

* Keep the selftest IR sensor part disabled

Everything shall happen at runtime

* Fix indentation fsensor_update

* Fix another misleading indentation in fsensor_update

Co-authored-by: Alex Voinea <voinea.dragos.alexandru@gmail.com>
Co-authored-by: D.R.racer <drracer@drracer.eu>
 2020-06-03 16:14:56 +02:00
Alex Voinea
b1a83c8add
Merge branch 'MK3' into MK3_NEW_SD_COMPILATION 2020-05-19 16:37:47 +03:00
DRracer
67e9b4c096
IR fsensor fixes (#2632) 
* MK3S IR sensor detection and safe operational range fix
* debug, change of fsensor_IR_check behavior
* more doc + disable debug print voltage
* fix displaying MSG_04_OR_NEWER and MSG_03.... kudos to @ovariludovit
* better handling of fsensor not responding scenario
 2020-04-28 10:20:21 +02:00
DRracer
baaa372a56
Rephrase texts for fsensor detection and cleanup (#2630) 
* Rephrase texts for fsensor detection and cleanup

* fsensor msgs only for MK3S
 2020-04-24 19:46:54 +02:00
Alex Voinea
0e25eaee8f
Merge branch 'MK3' into MK3_NEW_SD_COMPILATION 2020-04-19 16:02:11 +03:00
D.R.racer
818efb4fa2 updated messages + slight refactoring to save some bytes 2020-03-26 15:07:48 +01:00
D.R.racer
34ac2917ae fix. warning "Macro expansion producing 'defined' has undefined 
behavior"
update screen layout comments
 2020-03-26 14:40:47 +01:00
MRprusa3d
2a9504b20a !!! for testing only !!! 
filament sensor auto-detection
 2020-03-02 19:07:23 +01:00
MRprusa3d
ec5e54de25 state fixing 2020-03-02 17:52:25 +01:00
Alex Voinea
7028583e9b
Merge branch 'MK3_ShellSort' into MK3_NEW_SD_COMPILATION 2020-01-08 16:27:31 +02:00
Alex Voinea
1ba89b9689
Merge branch 'MK3' into MK3_ShellSort 2020-01-07 14:18:31 +02:00
Alex Voinea
f0f7db57ea
Fist attempt at "saved position SD menu" 2019-12-17 00:45:25 +02:00
DRracer
d68d9c7fef
Merge pull request #2058 from leptun/MK3_fix_warnings 
Fix "LANG_MODE 0" warnings
 2019-12-15 09:29:27 +01:00
Alex Voinea
103e29d38a
Merge branch 'MK3' into MK3_ShellSort 2019-11-29 16:52:20 +02:00
Alex Voinea
960f4a88ed
Status bar, lcd optimization, compile warning fix 2019-11-26 13:36:28 +02:00
MRprusa3d
6e2793566c
Merge branch 'MK3' into PFW-943 2019-11-18 14:43:46 +01:00
DRracer
56251c4f99
Merge pull request #1937 from arons/MK3 
added new function belt test under calibration menu
 2019-11-15 09:39:42 +01:00
Marek Bel
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
Marek Bel
966d9baf2b Document. 2019-09-17 19:00:03 +02:00
Marek Bel
c66b4bd876 Do not ask for preheat temperature twice if calibrating first layer from wizard without filament. 2019-09-16 21:14:17 +02:00
MRprusa3d
0e1d559f03
Merge branch 'MK3' into PFW-943 2019-09-16 15:29:28 +02:00
MRprusa3d
011468598e IR sensor gen. II 
disconnected PCB detection
 2019-09-16 00:43:37 +02:00
Marek Bel
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
Marek Bel
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
Marek Bel
6674cbf0d7 Select material / temperature before first layer calibration. 2019-09-12 17:54:05 +02:00
Marek Bel
3628d893ee Remove duplicate preheat menu. 
Known limitations: farm_mode missing, wizard_active missing, cooldown missing, ASA missing, print fan missing.
 2019-08-26 20:11:52 +02:00
Marek Bel
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
leptun
5fdaead663 Fix language related warnings in LANG_MODE 0 2019-07-29 15:55:42 +03:00
NotaRobotexe
2bae208133
Merge pull request #2011 from MRprusa3d/PFW-873 
GUI updates
 2019-07-17 14:49:07 +02:00
MRprusa3d
034cbff10a GUI updates 2019-07-16 20:10:49 +02:00
Marek Bel
fecccf50e5 Remove duplicate prototypes from ultralcd.h. Make functions unreferenced outside lcd.cpp static. Disable unused functions by preprocessor to suppress warnings. 2019-07-16 20:01:49 +03:00
MRprusa3d
98bae7af9f
Merge branch 'MK3' into PFW-873 2019-07-10 16:50:14 +02:00
MRprusa3d
3333d937ed some improvements 2019-07-10 16:29:40 +02:00
Renzo
e54497d802 added new function belt test under calibration menu 2019-06-20 00:09:55 +02:00
Marek Bel
1390d4e5b9 Use first letter capital camel case for enum class members. Change underlying type to uint_least8_t. 2019-06-12 19:11:41 +02:00
Marek Bel
5fcf760954 Use first letter capital camel case for enum class members. Rename CustomMsgTypes to CustomMsg. Remove unnecessary maping to numbers. Change underlying type to uint_least8_t. 2019-06-12 18:54:43 +02:00
Marek Bel
51df6cdfdc Remove LcdCommands::Unknown3. Remove LcdCommands mapping to numbers, as it is not needed. 2019-06-12 18:54:37 +02:00
Marek Bel
cbb92860d0 Use first letter capital camel case for enum class members. 2019-06-12 18:54:32 +02:00
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
94a5175980 Code size reduction - saved almost 2KB 2019-06-12 15:41:34 +02:00
DRracer
58948cffcd Code size reduction - saved almost 2KB 2019-06-11 17:23:01 +02:00
Vojtech Pavlik
5494f23942 M0/M1/M117 fix: Add new CUSTOM_MSG states. 
When the printer prints from a SD card, the display of progress messages
and filename takes precedence over CUSTOM_MSG_TYPE_STATUS messages used
by M0/M1/M117. Let's introduce two new CUSTOM_MSG states, one that
overrides the SD status while waiting in M0/M1 (M0WAIT) and one that
ensures the message will be displayed in at least one screen update
(MSGUPD).
 2019-06-06 14:25:06 +02:00
DRracer
9cb0bc7bcf Fix MINTEMP errors and fsensor runout 2019-05-24 08:46:44 +02:00
Marek Bel
89fc9e7f92 sketch/menu.h:90:115: warning: invalid conversion from 'void (*)(int)' to 'void (*)(uint8_t) {aka void (*)(unsigned char)}' [-fpermissive] 
#define MENU_ITEM_FUNCTION_NR_P(str, number, func, fn_par) do { if (menu_item_function_P(str, number, func, fn_par)) return; } while (0)
                                                                                                                   ^
sketch/ultralcd.cpp:5926:5: note: in expansion of macro 'MENU_ITEM_FUNCTION_NR_P'
     MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', extr_adj, 0); ////MSG_LOAD_FILAMENT_1 c=16
 2019-05-14 18:25:43 +02:00
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