29c8cb2927
Fix bad merge.
2019-08-27 22:22:36 +02:00
3f04c4db87
Merge branch 'MK3' into preheat_menu
2019-08-27 22:20:23 +02:00
07169ad84a
Make file local variable static.
2019-08-27 20:48:53 +02:00
e57fcc04a7
Fix compiler warnings.
2019-08-27 20:23:48 +02:00
d927d5b05d
Port wizard_active to mFilamentItem().
2019-08-27 20:19:03 +02:00
cef7f31b9f
Set FilamentAction to None if mFilamentMenu left by cooldown or menu back action.
2019-08-27 20:13:55 +02:00
ffc5a64154
Remove commented out code.
2019-08-27 20:06:48 +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
bf2097342d
Add ASA preheat into mFilamentMenu();
2019-08-27 17:01:41 +02:00
3da43ae8c2
Do not port print fan preheat speed preset, as it was never used. And it was broken until recently fixed when adding ASA profile.
2019-08-26 21:14:07 +02:00
4792559536
Add farm preheat items. Add setWatch() call.
2019-08-26 21:00:30 +02:00
aa13f9e809
Fix formatting.
2019-08-26 20:19:34 +02:00
668e89e5a9
Preheat menu: Add ASA, hide menu item back when in wizard.
2019-08-26 20:18:34 +02:00
52ae62bbba
Fix formatting.
2019-08-26 20:14:00 +02:00
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
b9b0d6049e
Fix formatting.
2019-08-26 19:48:39 +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
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
170c1ea866
Split first layer calibration load filament and intro line into separate steps. If load fails, pause print apparently flushes command buffer and intro line is not printed after issue is resolved.
2019-08-16 20:47:55 +02:00
1036c4f755
Do not precede first layer calibration without filament if print is paused due to MMU load failed.
2019-08-16 19:00:45 +02:00
b10bd8340a
Make local functions static.
2019-08-15 17:57:30 +02:00
0b798767af
Fix preheat ASA.
2019-08-15 17:54:23 +02:00
a6f955b62d
Use unused macros *_PREHEAT_FAN_SPEED.
2019-08-15 17:47:34 +02:00
eb68bb9b43
Add ASA preheat.
2019-08-15 17:46:29 +02:00
36a69281ee
Remove unused functions forward declarations.
2019-08-15 17:36:05 +02:00
d9dec38815
Workaround for the "viper" situation bug.
2019-08-07 17:23:19 +02:00
f1a947af2c
Whole hw settings hidden in farm mode
2019-08-05 10:40:21 +02:00
5f14e9c2e5
Removed sheet setting when in farm mode
2019-08-03 17:35:39 +02:00
bca0fd81eb
Fix loading filament 255 instead of 0 in first layer calibration wizard.
2019-07-30 19:15:33 +02:00
3ddb853bbd
Fix shifted languages. Use \n and \x0a
2019-07-26 18:53:08 +03:00
5021fadd5d
multiple sheets - menu switching bug
2019-07-24 11:20:27 +02:00
851aaac053
Merge branch 'MK3' of https://github.com/NotaRobotexe/Prusa-Firmware into MK3
2019-07-23 19:29:36 +02:00
fb35009628
multiple sheets,fix of bug in switching sheets from menu
2019-07-23 19:25:59 +02:00
c4d5e332c8
Merge branch 'MK3' into MK3
2019-07-23 11:34:42 +02:00
b9f622f8a6
variables to PROGMEM, text formating
2019-07-23 11:31:20 +02:00
b5129ff2ec
Revert "force push"
...
This reverts commit 19e7838c20
2019-07-23 11:12:53 +02:00
19e7838c20
add default names to PROGMEM, text formating edit
2019-07-22 20:35:10 +02:00
ab2eafe175
sheet menu, add hw setting, sheet change in menu, sheet name initialization in eeprom
2019-07-22 18:43:43 +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
b96c9700ce
fix prusa_statistics code size optimization according to unit test
...
results
2019-07-22 17:10:04 +02:00
9c95f8c015
sheet menu
2019-07-19 18:34:46 +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
2bae208133
Merge pull request #2011 from MRprusa3d/PFW-873
...
GUI updates
2019-07-17 14:49:07 +02:00
255db28684
merge unit test and upstream changes
2019-07-17 10:30:49 +02:00
034cbff10a
GUI updates
2019-07-16 20:10:49 +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
0422713b29
Merge pull request #2005 from prusa3d/MK3_3.7.2
...
Mk3 3.7.2
2019-07-16 08:50:38 +02:00
Marek Bel
Marek Běl
DRracer
Marek Kühn
leptun
NotaRobotexe
MRprusa3d