Commit Graph

2666 Commits

Author SHA1 Message Date
Marek Bel
e53734895f Make MMU load failed blocking to workaround lack of resume print menu item.
The same workaround used as for USB print (Octoprint).
2019-08-16 20:20:17 +02:00
Marek Bel
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
Marek Bel
b10bd8340a Make local functions static. 2019-08-15 17:57:30 +02:00
Marek Bel
0b798767af Fix preheat ASA. 2019-08-15 17:54:23 +02:00
Marek Bel
a6f955b62d Use unused macros *_PREHEAT_FAN_SPEED. 2019-08-15 17:47:34 +02:00
Marek Bel
eb68bb9b43 Add ASA preheat. 2019-08-15 17:46:29 +02:00
Marek Bel
36a69281ee Remove unused functions forward declarations. 2019-08-15 17:36:05 +02:00
DRracer
0e4e644476
Merge branch 'MK3' into MK3_3.8.0 2019-08-15 10:34:50 +02:00
DRracer
ba81149afe
Merge branch 'MK3' into MK3_3.7.3 2019-08-15 10:25:51 +02:00
DRracer
dc78bc7362 Improve performance of bed PWM automaton - proof of concept
There are still some artefacts on the output pin - work in progress.
2019-08-14 17:53:08 +02:00
leptun
596ffe1dc2 Actual fix to the missing first two characters 2019-08-10 21:03:45 +03:00
leptun
7ce2fedac7 Fix missing first two characters in multi-lang mode 2019-08-10 09:16:23 +03:00
leptun
29dcb1cad3 Toggle FANS_CHECK 2019-08-10 08:43:07 +03:00
leptun
505deb28fd Toggle menu item 2019-08-10 08:42:33 +03:00
Paul Bransford
720ea49fa3 Merge branch 'MK3' into MK3-fix-sdcard-sorting 2019-08-08 19:48:50 -04:00
DRracer
2ddbd606f2 Version changed (3.8.0 build 2608) 2019-08-08 16:44:16 +02:00
DRracer
84cf1b83c3
Merge pull request #2083 from DRracer/viper
Workaround for the "viper" situation bug.
2019-08-07 17:48:57 +02:00
DRracer
a28c365bb1
Merge pull request #2075 from MRprusa3d/PFW-873b
farm mode update, documentation correction
2019-08-07 17:48:30 +02:00
DRracer
d9dec38815 Workaround for the "viper" situation bug. 2019-08-07 17:23:19 +02:00
Robert Pelnar
7da2ee5fc3 Version changed (3.7.3 build 2370) 2019-08-06 15:37:23 +02:00
Yuri D'Elia
33037d369c Prevent LCD long-press re-entry (fixes #1196) 2019-08-05 19:00:29 +02:00
MRprusa3d
b471bb7540 farm mode update, documentation correction 2019-08-05 17:51:26 +02:00
DRracer
5cb86a7e8f
Merge pull request #2074 from kuhnmarek/MK3_PFW-967_filament_sensor_check
Fw version check disabled in farm mode
2019-08-05 17:41:16 +02:00
Marek Kühn
091cd49ca5 Fw version check disabled in farm mode 2019-08-05 16:59:09 +02:00
DRracer
9f8590c572
Merge pull request #2072 from kuhnmarek/MK3_PFW-961_blind_sound
changed blind sound
2019-08-05 12:47:31 +02:00
Marek Kühn
f77414be2b blind alert sound shorter 2019-08-05 12:41:27 +02:00
Marek Kühn
f1a947af2c Whole hw settings hidden in farm mode 2019-08-05 10:40:21 +02:00
DRracer
cb19f0958b Use _delay() and _micros() for future compatibility 2019-08-05 09:51:06 +02:00
Marek Kühn
5f14e9c2e5 Removed sheet setting when in farm mode 2019-08-03 17:35:39 +02:00
Marek Kühn
15a095ea76 changed blind sound 2019-08-03 15:37:11 +02:00
DRracer
7c9d3dd177 Update doxydoc of new G-codes 2019-08-01 13:09:20 +02:00
DRracer
9214e30f74
Merge pull request #2062 from MRprusa3d/PFW-873
UI update
2019-08-01 07:20:09 +02:00
MRprusa3d
2cb977e4a0 UI update 2019-07-31 20:39:57 +02:00
DRracer
e43e89421c
Merge pull request #2056 from BoCoKeith/patch-1
Correct bug in util.cpp is_whitespace_or_nl function.
2019-07-31 17:00:49 +02:00
Simon Benoit
49d2866b48 Add threshold distance to Z calibration
Add missing if statement
2019-07-30 19:43:07 -04:00
Marek Bel
bca0fd81eb Fix loading filament 255 instead of 0 in first layer calibration wizard. 2019-07-30 19:15:33 +02:00
Marek Bel
0aed59c947 Fix unsigned char overflow cause invalid filament load. 2019-07-30 19:06:57 +02:00
leptun
556b87edec M350 for all axis - MK3 2019-07-29 09:41:33 +03:00
Keith Spitz
952a24b45d
Update util.cpp
Correct "is_whitespace_or_nl": change 'r' to '\r'.
2019-07-28 19:40:18 -06:00
leptun
3ddb853bbd Fix shifted languages. Use \n and \x0a 2019-07-26 18:53:08 +03:00
DRracer
0687b8e4a2
Merge pull request #2044 from mkbel/fix_missing_mmu_attention
Fix missing mmu attention
2019-07-26 09:07:06 +02:00
Marek Bel
3b396fb8bf Merge branch 'MK3' into fix_missing_mmu_attention 2019-07-25 19:10:07 +02:00
Marek Bel
a9e9a9857b Fix "MMU needs attention screen is missing in case of failed unload filament". 2019-07-25 19:09:52 +02:00
DRracer
3438c0e411
Merge pull request #2042 from NotaRobotexe/octoprint_bugs
fixed redundant OK messages in serial
2019-07-25 12:41:43 +02:00
DRracer
2820baf016
Merge pull request #2040 from NotaRobotexe/MK3
multiple sheets - menu switching bug
2019-07-25 09:56:07 +02:00
NotaRobotexe
64115fb146 fixed redundant OK messages in serial 2019-07-24 18:08:14 +02:00
NotaRobotexe
5021fadd5d multiple sheets - menu switching bug 2019-07-24 11:20:27 +02:00
DRracer
33195baf9d
Merge pull request #2035 from mkbel/enable_lin_corr
Re-enable linearity correction for MK3.
2019-07-24 09:08:43 +02:00
NotaRobotexe
851aaac053 Merge branch 'MK3' of https://github.com/NotaRobotexe/Prusa-Firmware into MK3 2019-07-23 19:29:36 +02:00
NotaRobotexe
fb35009628 multiple sheets,fix of bug in switching sheets from menu 2019-07-23 19:25:59 +02:00
Marek Bel
f9e32c4bf4 Re-enable linearity correction for MK3. 2019-07-23 19:22:54 +02:00
DRracer
3e60cf4537 enable only for MK3S (out of FLASH on the MK3) 2019-07-23 16:51:02 +02:00
DRracer
593675c667 delay, micros for the 3.7.x branch 2019-07-23 16:40:21 +02:00
DRracer
6860a572c2 detection of faulty RAMBo (incorrect capacitor on fan tach pin) for MK3/S 2019-07-23 15:55:53 +02:00
NotaRobotexe
c4d5e332c8
Merge branch 'MK3' into MK3 2019-07-23 11:34:42 +02:00
NotaRobotexe
b9f622f8a6 variables to PROGMEM, text formating 2019-07-23 11:31:20 +02:00
NotaRobotexe
b5129ff2ec Revert "force push"
This reverts commit 19e7838c20.
2019-07-23 11:12:53 +02:00
NotaRobotexe
19e7838c20 add default names to PROGMEM, text formating edit 2019-07-22 20:35:10 +02:00
NotaRobotexe
ab2eafe175 sheet menu, add hw setting, sheet change in menu, sheet name initialization in eeprom 2019-07-22 18:43:43 +02:00
DRracer
6f79ef4c9c resolve hidden conflicts in commented code 2019-07-22 17:29:43 +02:00
DRracer
65087b89ee Merge remote-tracking branch 'upstream/MK3' into code_size_optimization
and resolve conflicts (ultralcd.cpp)
2019-07-22 17:26:14 +02:00
DRracer
b96c9700ce fix prusa_statistics code size optimization according to unit test
results
2019-07-22 17:10:04 +02:00
DRracer
79c326cdaa
Merge pull request #2022 from kuhnmarek/gcodes_doxygen
Updated doxygen docs to work better with confluence.
2019-07-22 12:52:27 +02:00
NotaRobotexe
9c95f8c015 sheet menu 2019-07-19 18:34:46 +02:00
Marek Kühn
bd4bfbe586 Added M862 details 2019-07-19 16:15:12 +02:00
Marek Kühn
94e79806bc Updated doxygen docs to work better with confluence. 2019-07-19 13:51:55 +02:00
Marek Kühn
03e80ce4a8 PFW-917 Adjust Z value persists across update to v3.8 2019-07-18 16:50:44 +02:00
DRracer
b0c41ec979
Merge pull request #2017 from NotaRobotexe/octoprint_fix
Octoprint fix
2019-07-18 16:02:38 +02:00
DRracer
14b39b0094
Merge pull request #2019 from leptun/MK3_fix_LCD_WDT_RESET
Fix lcd not initing after WDT reset
2019-07-18 13:27:32 +02:00
leptun
121e60655a Fix lcd not initing after WDT reset 2019-07-18 11:50:18 +03:00
DRracer
1ae072c332
Merge pull request #2014 from NotaRobotexe/sound_fix
crash and filament unload sound change
2019-07-18 09:41:05 +02:00
DRracer
090ea3145d
Merge pull request #2015 from NotaRobotexe/text_edits
small text edit
2019-07-18 09:39:28 +02:00
NotaRobotexe
756ce51b5e
Merge branch 'MK3' into octoprint_fix 2019-07-17 20:06:06 +02:00
NotaRobotexe
b8fec59f21 octoprint fan error fix 2019-07-17 19:59:31 +02:00
NotaRobotexe
2bae208133
Merge pull request #2011 from MRprusa3d/PFW-873
GUI updates
2019-07-17 14:49:07 +02:00
NotaRobotexe
1c44eddf81 crash and filament unload sound change 2019-07-17 12:32:27 +02:00
DRracer
255db28684 merge unit test and upstream changes 2019-07-17 10:30:49 +02:00
DRracer
eb705b6b17
Merge pull request #2012 from leptun/MK3_LCD_improvements
LCD fix status screen lcd_putchar
2019-07-17 08:05:56 +02:00
Yuri D'Elia
3a87ff56f6 Default to "Move Z" above a certain height even when printing
This speeds-up the ability to manually get the carriage out of the way
just after a print has finished
2019-07-16 22:04:32 +02:00
leptun
d8ecb2d0c9 Fix status screen 2019-07-16 21:11:27 +03:00
MRprusa3d
034cbff10a GUI updates 2019-07-16 20:10:49 +02:00
Marek Bel
0c660a6fb1 Revert "Fix sketch/lcd.cpp:196:1: warning: no return statement in function returning non-void [-Wreturn-type]."
This reverts commit a54fd29fa4.
2019-07-16 21:10:11 +03:00
NotaRobotexe
e6255e8451 octoprint fan error work 2019-07-16 19:18:31 +02:00
DRracer
1dab0f7a04
Merge pull request #2008 from leptun/MK3_LCD_improvements
Lcd optimization - 1K of flash saved
2019-07-16 19:15:57 +02:00
Marek Bel
a54fd29fa4 Fix sketch/lcd.cpp:196:1: warning: no return statement in function returning non-void [-Wreturn-type]. 2019-07-16 20:02:01 +03: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
Marek Bel
3e292fd6b0 Fix compiler warnings:
sketch/Marlin.h:178:17: warning: extra tokens at end of #undef directive
sketch/Marlin.h:181:24: warning: extra tokens at end of #undef directive
sketch/Marlin.h:182:0: warning: "enable_z" redefined
2019-07-16 18:16:28 +02:00
Marek Bel
cee875fc6a Fix compiler warnings:
warning: enumeration value '_None' not handled in switch [-Wswitch]
warning: enumeration value '_Undef' not handled in switch [-Wswitch]
2019-07-16 17:40:28 +02:00
Marek Bel
6b8a5bc3ac Fix compiler warnings
sketch/tmc2130.cpp:146:42: warning: default argument given for parameter 1 of 'void tmc2130_init(bool)' [-fpermissive]
sketch/tmc2130.cpp:146:24: warning: unused parameter 'bSupressFlag' [-Wunused-parameter]
2019-07-16 17:31:56 +02:00
DRracer
8b806f692e
Merge pull request #1664 from MRprusa3d/PFW-811
"disable_z()" for Delta PSU
2019-07-16 16:46:34 +02:00
DRracer
d65b333664
Merge pull request #2003 from mkbel/heat_hysteresis
Heat hysteresis
2019-07-16 13:10:47 +02:00
DRracer
0422713b29
Merge pull request #2005 from prusa3d/MK3_3.7.2
Mk3 3.7.2
2019-07-16 08:50:38 +02:00
leptun
8b1c687629 Lcd optimization - 1K of flash saved 2019-07-15 20:32:58 +03:00
Marek Bel
f0727214ed Document 2019-07-15 19:15:15 +02:00
Marek Bel
9083d151b2 wait_for_heater() in restore_print_from_ram_and_continue() only if saved_extruder_temperature differs from target hot-end temperature.
This fixes problem, that restore_print_from_ram_and_continue() blocked for heating for at least TEMP_RESIDENCY_TIME (3 seconds) even if temperature was resumed by M600 command.
2019-07-15 18:07:05 +02:00
Marek Bel
ab4e789688 Partially revert "aeed49a Fix filament runout on optical filament sensors"
Revert plan move to filament change position before enqued M600.
This was workaround to problem that restore_print_from_ram_and_continue() did 3s heating pause before resuming print. This problem will be fixed properly in restore_print_from_ram_and_continue() in next commit.

Save 166B of FLASH.
2019-07-15 17:22:39 +02:00
Marek Bel
549a8a1a6b Restore print fan speed earlier then nozzle temperature.
Avoids nozzle temperature dip when fan is turned on.
2019-07-15 16:25:21 +02:00
NotaRobotexe
8fb30f886a octoprint stop fix 2019-07-15 14:30:21 +02:00
NotaRobotexe
759d9f5a2e small text edits 2019-07-15 11:41:16 +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
Marek Bel
38ff944b03 Reorder EEPROM items to allow possible future grow for Sheets struct. 2019-07-10 21:03:30 +02:00
Marek Bel
8985d2e26c Fix fix EEPROM conflict. 2019-07-10 18:50:16 +02:00
Marek Bel
6ed146c37c Fix EEPROM conflict. 2019-07-10 18:41:12 +02:00
leptun
b8b167d1ca Merge branch 'MK3' into MK3_Enable_fan_waiting_cooldown 2019-07-10 19:26:43 +03:00
Marek Běl
d3dd0ad271
Merge pull request #1952 from NotaRobotexe/sound
new sound
2019-07-10 18:06:32 +02:00
Marek Bel
333ade9aee Remove non-existing function prototype. 2019-07-10 17:59:04 +02:00
Marek Bel
7189f44bcd Remove commented out defines. 2019-07-10 17:40:33 +02:00
Marek Bel
e0f46f128d Fix indentation. 2019-07-10 17:39:24 +02:00
Marek Bel
4e7de776cd Disable TMC2130 linarity correction for MK3 to save FLASH to enable compilation. Add symlink /Firmware/variants/printers.h to .gitignore. 2019-07-10 17:07:00 +02: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
DRracer
9585789288
Merge pull request #1976 from NotaRobotexe/MK3_3.7.2_PP
dont fire power panic at normal power off
2019-07-10 14:19:00 +02:00
Marek Běl
4e3bf276ec
Merge pull request #1984 from leptun/MK3_compile_error_fix_multiple_sheets_Windows
Fix compile error on Windows when multiple_sheets is merged
2019-07-09 19:28:35 +02:00
Marek Bel
712fb1cceb #undef EEPROM_SHEETS_BASE so this internal define for compile-time checking only is not used outside of eeprom.h 2019-07-09 19:19:59 +02:00
Marek Běl
fcfc9ca95c
Merge pull request #1979 from DRracer/heatbed_noise_suppression
Heatbed noise suppression
2019-07-09 18:33:27 +02:00
leptun
dbc603d5f6 Fix compile error on windows
addresses issue #1965
2019-07-09 18:38:24 +03:00
Marek Bel
898f6d9d8b Fix EEPROM_Sheets_base overlay of EEPROM_NOZZLE_DIAMETER_uM. 2019-07-09 13:41:18 +02:00
Marek Bel
cd1ea0a655 Move function declaration and structs declarations to top of eeprom.h file. 2019-07-09 13:38:58 +02:00
MRprusa3d
4d535f1217 ... incl. SupportMenu ;-P 2019-07-09 12:31:20 +02:00
MRprusa3d
8229a45187 pre-production version ;-) 2019-07-09 12:16:51 +02:00
Marek Bel
61566f7fb1 Move translated string MSG_V2_CALIBRATION from untranslated section to PROGMEM_I1, add missing ISTR macro. Revert _T(MSG_SELECT) and _T(MSG_RENAME) to _i("Select") and _i("Rename") as it is preferred macro for internationalized strings. Use MSG_V2_CALIBRATION in both occurrences. 2019-07-08 21:18:55 +02:00
DRracer
a16de83535 heatbed audible noise suppression using short fast PWM pulses with
variable duty
2019-07-08 16:42:21 +02:00
NotaRobotexe
9592460281 add old delay 2019-07-04 18:43:59 +02:00
NotaRobotexe
a1a8945bee more code editing 2019-07-04 15:31:44 +02:00
DRracer
1f9dce9513 next almost 200B down 2019-07-04 13:36:02 +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
MRprusa3d
4db4f19128 'variant files' update ;-((( 2019-07-03 18:14:48 +02:00
MRprusa3d
7e3cb98a1f & MK3S 2019-07-03 17:50:41 +02:00
MRprusa3d
a3a7f3106e print parameters checking 2019-07-03 17:21:11 +02:00
NotaRobotexe
ff3c9d1a7c dont fire power panic at normal power off 2019-06-28 11:25:56 +02:00
Marek Bel
a59e7090ea Increase version. 2019-06-27 17:32:40 +02:00
Marek Bel
d344e514c4 Rename functions and macro to match with naming convention - remove 'P' where there is no pointer to progmem. 2019-06-26 15:51:58 +02:00
Marek Bel
d879794922 Remove first parameter of macro menu_format_sheet_P_E, of function menu_format_sheet_P_E and menu_item_submenu_P as it was always called with the same parameter. Saves 66B of FLASH. 2019-06-26 15:47:06 +02:00
Marek Bel
53dbcdd852 Display sheet name when adjusting Z. Costs 130B of flash. 2019-06-26 15:33:54 +02:00
Marek Bel
4a16fe6902 Save z_offset, bed_temp and pinda_temp with sheet calibration. 2019-06-26 14:10:12 +02:00
Marek Bel
20dd1110f6 Remove unused parameters of function _lcd_babystep(int axis, chonst char *msg).
Saves 24B of flash memory.
2019-06-25 19:43:10 +02:00
Marek Bel
ebdeb99134 Add menu to show sheet live adjust Z value. 2019-06-25 18:55:25 +02:00
NotaRobotexe
4058cd144b add delay_keep_alive without updating lcd 2019-06-25 14:30:11 +02:00
NotaRobotexe
3e9dc91cef ifdef for mk2 2019-06-24 18:01:49 +02:00
NotaRobotexe
b5168bd6c2 fan error fix 2019-06-24 17:30:56 +02:00
Marek Bel
b67ec501b4 Add rename sheet menu. 2019-06-24 17:11:13 +02:00
Marek Bel
e6fbac08ed Move sheet selector to submenu. 2019-06-21 15:44:56 +02:00
Marek Bel
19a474eaa5 Fix compiler warnings. 2019-06-20 18:00:29 +02:00
Marek Bel
0a48082609 Add steel sheet profile selector. 2019-06-20 16:40:53 +02:00
Renzo Dani
9a904362e5 code only for TMC2130 2019-06-20 10:17:48 +02:00
Renzo
e54497d802 added new function belt test under calibration menu 2019-06-20 00:09:55 +02:00
Marek Bel
89b578c899 Merge branch 'MK3' into multiple_sheets 2019-06-19 18:40:09 +02:00
Marek Bel
524121141a Remove commented out code. This code is of unknown genesis and purpose. It was added in commit "3.0.10 sync" two years ago and it was already commented out in that moment. 2019-06-19 15:54:24 +02:00
Marek Bel
6a272d83b1 Add compile time check for EEPROM stored varibles size. 2019-06-19 15:09:07 +02:00
Marek Bel
64903e0ae8 Remove unused defines. 2019-06-19 14:27:02 +02:00
Marek Bel
8b6629ad58 Fix comment grammar. 2019-06-18 20:00:02 +02:00
Marek Bel
ae9ae95187 MMU: Filter IR sensor signal when detecting whether filament tip passes to heat break. Increase number of tries when loading filament to 3. 2019-06-18 19:15:16 +02:00
KDanielK
6cb85a455f Update mmu.cpp 2019-06-18 15:08:47 +02:00
Marek Bel
24cec4091b Merge branch 'MK3' into sound 2019-06-17 17:28:19 +02:00
Marek Běl
aff020a6d4
Merge pull request #1897 from NotaRobotexe/farm_mode
PFW-571 send PRN:4 instead PRN:1, PFW-874 new firmware version alert with 30s timeout
2019-06-14 20:05:30 +02:00
Marek Bel
b1df1fb1f1 Fix formatting. We are never using 2 space indentation. 4 spaces are preferred, tabulator is acceptable if surrounding code uses tabs. 2019-06-14 18:18:27 +02:00
Yuri D'Elia
367a28a5a8 Default to "Live Adjust Z" when longpressing during a print (closes #1604)
- Disable longpress action when homing or calibrating
- Default to Live Adjust during a print
- Retain "Move Z" otherwise
2019-06-14 11:44:06 +02:00
Voinea
d81970dd3d Merge branch 'MK3' into MK3_Enable_fan_waiting_cooldown 2019-06-14 11:07:08 +03:00
DRracer
c5d130e763
Merge pull request #1914 from prusa3d/MK3_3.7.2
Increase version.
2019-06-14 09:39:41 +02:00
Marek Bel
fee67d9451 Increase version. 2019-06-13 16:37:51 +02:00
DRracer
55dc78546b
Merge pull request #1913 from mkbel/fix_spelling
Fix spelling.
2019-06-13 15:12:30 +02:00
Marek Bel
25f0eb9a39 Fix spelling. 2019-06-13 15:01:54 +02:00
Marek Bel
72f5e87c61 Merge branch 'MK3' into use_enum_class_2 2019-06-12 19:17:35 +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
Marek Bel
0401490cc1 Use first letter capital camel case for enum class members. 2019-06-12 18:54:25 +02:00
Marek Bel
9ceba00426 Use first letter capital camel case for enum class members. Remove dependency of FanCheck values on TestError values as it is not used. 2019-06-12 18:53:09 +02:00
MRprusa3d
b7d3766ae2
Merge branch 'MK3' into PFW-790 2019-06-12 17:32:13 +02:00
Marek Bel
6dd085bcc5 Use first letter capital camel case for enum class members. 2019-06-12 16:44:07 +02:00
Marek Bel
e393d91b12 Use first letter capital camel case for enum class members. 2019-06-12 16:20:21 +02:00
Marek Bel
cc80bfa020 Merge branch 'MK3' into use_enum_class 2019-06-12 16:04:26 +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
8d388fa03a
Merge pull request #1911 from mkbel/layer1_cal_flash
Layer1 cal flash
2019-06-12 15:40:59 +02:00
Marek Bel
49f172a7b9 Convert uint8_t cycle control varibles changed in previous commit to uint_least8_t to be potentially more portable. 2019-06-12 15:01:57 +02:00
DRracer
b15bbaf177 for cycles' variables: int -> uint8_t where appropriate, part1 2019-06-12 14:58:15 +02:00
Marek Bel
7ac098a135 Refactor. Put constants needed in functions inside fuctions to limit its scope. 2019-06-12 14:20:20 +02:00
Marek Bel
2755a3733d Document. 2019-06-12 14:15:58 +02:00
Marek Bel
342954b88c Refactor. Make constants producing first layer calibration square more clear. Note layer height discrepancy. 2019-06-12 13:31:17 +02:00
DRracer
4f8ed7f123 for cycles' variables: int -> uint8_t where appropriate, part1 2019-06-12 10:31:09 +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
Marek Bel
d528a53526 Refactor. Move lcd_commands_func1() to first_lay_cal.cpp and rename it to lay1cal_square(). Remove its constant parameters. Move remaining G1 code to lay1cal_meander(). Saves 6B of FLASH memory. 2019-06-12 01:36:48 +02:00
Marek Bel
60cc3d58ec Use sprintf_P in first layer calibration. Save 30B of FLASH memory. 2019-06-11 20:00:49 +02:00
Marek Bel
47a183e96e Use loop to enquecommand_P() in first layer calibration. Save 126B of FLASH memory. 2019-06-11 19:49:56 +02:00
Marek Bel
21f4669600 Make count_e() constexpr. 2019-06-11 19:22:08 +02:00
Marek Bel
4effff9e99 Use loop to enquecommand_P() in first layer calibration. Save 10B FLASH memory. 2019-06-11 18:56:29 +02:00
Marek Bel
d21f256cd0 Remove duplicate calls of lcd_timeoutToStatus.start(), move !blocks_queued() && cmd_buffer_empty() condition to outer if, rewrite using switch statement. Save 487B of FLASH memory. 2019-06-11 18:26:59 +02:00
Marek Bel
97a5d6b5f4 Make constants const. 2019-06-11 17:30:37 +02:00
Marek Bel
9b1e3213ae Variable lcd_commands_step doesn't need to be global. 2019-06-11 17:30:19 +02:00
DRracer
58948cffcd Code size reduction - saved almost 2KB 2019-06-11 17:23:01 +02:00
Marek Bel
0c9121e99e Use loop to enquecommand_P() in first layer calibration. 2019-06-11 17:08:56 +02:00
DRracer
f20125a3e2 Code size reduction - saved almost 2KB 2019-06-11 16:24:40 +02:00
Marek Běl
cb6a3e7e12
Merge pull request #1907 from DRracer/fan_check_error_fix
Do not allow resume printing if fans are still not ok
2019-06-11 15:12:48 +02:00
DRracer
13c3ab14fa test fan check error only when enabled by #ifdef 2019-06-11 15:05:40 +02:00
DRracer
3e37150552 Do not allow resume printing if fans are still not ok 2019-06-11 14:53:10 +02:00
Marek Bel
27145204ed Use internationalized M117, but anyway the text is not shown. 2019-06-10 21:40:12 +02:00
Marek Bel
4be8fa701e Use loop to enquecommand_P() in first layer calibration. 2019-06-10 20:41:18 +02:00
NotaRobotexe
bb980e2fca sound edit, delete mute mode, add blind mode 2019-06-10 15:03:52 +02:00
Marek Běl
28e7772421
Merge pull request #1886 from leptun/MK3_fix_load_filament_5
Fix Load Filament 5 for MMU2
2019-06-10 14:45:55 +02:00
Marek Běl
327e6cd39b
Merge pull request #1889 from DRracer/fan_check_error_fix
Fan check error fix
2019-06-06 15:52:44 +02:00
DRracer
0cf6bc0677
Merge pull request #1903 from mkbel/filament_runout_mk3_2
Filament runout mk3 2
2019-06-06 15:51:35 +02:00
DRracer
83578c3389 documentation + minor code cleanup based on code review 2019-06-06 15:50:13 +02:00
MRprusa3d
1d8c24e8a9 "disable_z()" for Delta PSU IV
correction for (motor) mode switching
2019-06-05 19:22:04 +02:00
Marek Bel
19351df8a7 Extracted computation of z_shift for M600 into a separate function to
improve readability. Surprisingly, also the code got shorter.
2019-06-05 18:34:26 +02:00
Marek Bel
9c3bb14bae remove function forward decl: fsensor_restore_print_and_continue_IR
revert LCD_BL_PIN change
2019-06-05 18:34:10 +02:00
DRracer
aeed49a80e Fix filament runout on optical filament sensors
Reworked the IR variant accordingly
Some code-size optimization in related functions
2019-06-05 18:33:41 +02:00
DRracer
10247a28a3
Merge pull request #1896 from NotaRobotexe/power_panic
documentation for power panic
2019-06-05 16:10:04 +02:00
NotaRobotexe
0cab2284ea PFW-874 new firmware alert timeout 2019-06-05 15:48:10 +02:00
NotaRobotexe
14270ac1f6 power panic documentation 2019-06-05 15:10:51 +02:00
NotaRobotexe
d263728c37 documentation 2019-06-05 14:55:59 +02:00
DRracer
33b2aa5e58
Merge pull request #1894 from NotaRobotexe/power_panic
Power panic Z axis fix
2019-06-05 13:34:21 +02:00
NotaRobotexe
2c4e98dc27 power panic improvement 2019-06-05 13:12:08 +02:00
DRracer
5985c0608e Revert changes to pins_Einsy_1_0.h not related to the fan check error
fix
2019-06-03 09:02:27 +02:00
DRracer
09fee4e64d remove fan error simulation automaton 2019-05-31 11:30:30 +02:00
DRracer
6755791778 Fix repeated fan error checking 2019-05-31 11:29:11 +02:00
DRracer
adb5baa12b Merge remote-tracking branch 'upstream/MK3' into MK3 2019-05-31 11:05:24 +02:00
DRracer
ebfad55617
Merge pull request #1888 from mkbel/always_cut_independent
Always cut independent
2019-05-31 07:00:37 +02:00
Marek Bel
00da4640e2 Document. 2019-05-30 23:29:33 +02:00
Marek Bel
e79c203c96 Do not always cut if it is not enabled from menu. 2019-05-30 23:04:06 +02:00
Marek Bel
ccb649b1f6 Add always cut experimental / for testing feature. 2019-05-30 23:03:59 +02:00
Marek Bel
18122049a6 Fix cut filament menu item labels. 2019-05-30 19:36:10 +02:00
Voinea
878e866401 Fix Load Filament 5 for MMU2 2019-05-30 17:28:02 +03:00
NotaRobotexe
e9c870e7a0 fix of fixof power panic 2019-05-29 20:33:22 +02:00
NotaRobotexe
3b2cbc68d8 PFW-571 send PRN:4 instead PRN:1 while changing filament 2019-05-28 18:22:34 +02:00
DRracer
1c619133a3
Merge pull request #1880 from NotaRobotexe/power_panic
PFW-828  add uvlo tiny z positio back
2019-05-28 14:29:13 +02:00
NotaRobotexe
bcb6129c29 delete comment 2019-05-28 14:11:38 +02:00
NotaRobotexe
8842d16832 add back uvlo tiny z positio 2019-05-28 13:50:21 +02:00
DRracer
326c061d8c testing pin 5 2019-05-27 18:27:24 +02:00
DRracer
2f96badef4
Merge pull request #1870 from NotaRobotexe/power_panic
PFW-828 after power panic printer start print in the air
2019-05-27 17:13:08 +02:00
Marek Běl
9c3b93f900
Merge pull request #1869 from DRracer/fix_mintemp_and_fsensor
Fix MINTEMP errors and fsensor runout
2019-05-27 16:32:22 +02:00
DRracer
253087a4c5 Code cleanup 2019-05-27 16:18:21 +02:00
DRracer
4d020d99f6 Code cleanup 2019-05-27 14:57:02 +02:00
NotaRobotexe
f070a10904 edit 2019-05-27 10:10:24 +02:00
NotaRobotexe
55a2d588f1 PFW-828 printing in the air after power panic 2019-05-24 18:30:58 +02:00
NotaRobotexe
69455bfc75 PFW-828 fix printing in the air after power panic 2019-05-24 18:28:16 +02:00
DRracer
098c0979ba
Merge pull request #1848 from MRprusa3d/PFW-853
recovery from "Stop()"
2019-05-24 09:54:07 +02:00
DRracer
9cb0bc7bcf Fix MINTEMP errors and fsensor runout 2019-05-24 08:46:44 +02:00
NotaRobotexe
1399d7dcc8 support only for MK3/MK3S 2019-05-23 15:22:31 +02:00
Marek Běl
df02030fe0
Merge pull request #1863 from DRracer/lcd20190523
Fix. menu texts and formatting - issues PFW-877 and PFW-879
2019-05-23 14:31:51 +02:00
Ondrej Tuma
63235625ab pause printer by flag 2019-05-23 13:13:11 +02:00
DRracer
e17f3f8405 change language files accordingly 2019-05-23 11:14:26 +02:00
DRracer
da98977de3 Fix. menu texts and formatting - issues PFW-877 and PFW-879 2019-05-23 10:45:55 +02:00
MRprusa3d
a408f90659 recovery from "Stop()" 2019-05-18 21:28:59 +02:00
Marek Bel
15ba17f110 Fix translator columns hint for Adjusting Z: 2019-05-16 17:30:15 +02:00
Marek Bel
74d8c15b4f Fix documentation. 2019-05-16 17:23:54 +02:00
Marek Bel
dcfc6348ed Fix documentation. 2019-05-16 17:22:47 +02:00
DRracer
a453c6fc9d Save 236B by improving functions in menu.cpp. Beware - the label now has
to come with a ':' as its last character. Changed language files along
with this commit too.
2019-05-16 16:43:44 +02:00
Marek Bel
dad2065da6 Merge branch 'MK3' into rise_z 2019-05-15 16:37:17 +02:00
Marek Bel
1f3877b221 Extract duplicate code into function. Saves 4B of flash. 2019-05-15 16:31:10 +02:00
Marek Běl
fbc0c260b1
Merge pull request #1826 from ondratu/selftest_wizard
Selftest fan improvements
2019-05-15 13:43:48 +02:00
Ondrej Tuma
ebfc8c1c79 Fan autotest for swapping in Selftest 2019-05-15 10:10:46 +02:00
Ondrej Tuma
c851e158cc Manual fan check menu have default (selected) option 2019-05-15 10:10:46 +02:00
Marek Bel
1a78bd53ba Fix compiler warning
sketch/Marlin_main.cpp: In function 'void marlin_wait_for_click()':
sketch/Marlin_main.cpp:9646:12: warning: unused variable 'busy_state_backup' [-Wunused-variable]
2019-05-14 19:11:46 +02:00
Marek Bel
91e72a79f0 Fix compiler warning
sketch/Marlin_main.cpp:871:13: warning: unused variable 'ir_detected' [-Wunused-variable]
2019-05-14 19:07:50 +02:00
Marek Bel
acfcd59369 Fix compiler warning:
sketch/menu.cpp: In function 'int menu_draw_item_puts_P(char, const char*, char)':
sketch/menu.cpp:184:1: warning: no return statement in function returning non-void [-Wreturn-type]
2019-05-14 18:32:40 +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
Marek Bel
66d20f0297 Fix code formatting (indentation). 2019-05-14 16:45:15 +02:00
Marek Bel
4de93ca19c Fix eject filament menu items numbering. 2019-05-14 16:43:33 +02:00
Marek Bel
150787efbd Generate menu item texts Cut filament <nr.> during runtime to conserve flash. 2019-05-14 16:25:29 +02:00
Marek Bel
6495a8fa58 Decrease flash reserved for secondary language. 2019-05-14 16:10:04 +02:00
Marek Bel
7c4f66181f Generate menu item texts Load filament <nr.> and Eject filament <nr.> during runtime to conserve flash. 2019-05-14 15:47:25 +02:00
Marek Běl
dddc1b84e6
Merge pull request #1825 from prusa3d/MK3_3.7.1
Increase version 3.7.1 final.
2019-05-13 17:29:30 +02:00
Marek Běl
efa8e6e6ba
Merge pull request #1658 from Harpalyke/save-ustep-res-with-M500
Allow save of uStep resolution with M500
2019-05-13 17:08:34 +02:00
Marek Bel
e93f043fee Increase version 3.7.1 final. 2019-05-13 15:09:58 +02:00
Marek Běl
bbd1b60229
Merge pull request #1437 from craiglink/memory-overrun
set array size correctly to 4
2019-05-11 03:01:52 +02:00
Marek Běl
12b801fa1f
Merge pull request #1397 from jhoblitt/plumbing/sh-chmod
make all shell scripts executable
2019-05-11 02:37:09 +02:00
Marek Běl
0a343d4d66
Merge pull request #1806 from NotaRobotexe/fw_check
check if firmware is on right type of printer
2019-05-11 02:11:54 +02:00
Marek Běl
176b28bc83
Merge pull request #1813 from prusa3d/MK3_3.7.1
Enable watchdog for all variants.
2019-05-10 17:33:44 +00:00
Marek Bel
a9d6ae296b Enable watchdog for all variants. 2019-05-10 16:30:08 +02:00
Marek Běl
2a39fad400
Merge branch 'MK3' into bugfixes 2019-05-10 13:43:36 +00:00
Marek Běl
084c6f2700
Merge pull request #1805 from DRracer/MK3
PFW-844
2019-05-10 13:41:59 +00:00
Marek Bel
5707d4b85c Set all target hot ends to 0 deg. Celsius instead of just hotend nr. 0 to be more safe with custom modifications. 2019-05-10 15:27:25 +02:00
DRracer
dc4f30530d Fix a number overflow to last line of LCD when doing large extruder in
menu Settings -> Move axis -> Extruder
2019-05-09 13:44:35 +02:00
DRracer
714fb23de6 Merge remote-tracking branch 'upstream/MK3' into MK3 2019-05-09 13:40:28 +02:00
NotaRobotexe
e7dd5c60d3 check if firmware is on right type of printer 2019-05-07 18:10:44 +02:00
Marek Běl
8692565cf0
Merge pull request #1802 from XPila/MK3
Variable bed PWM resolution/frequency (adjusted to 5bits/32Hz)
2019-05-07 15:13:02 +00:00
DRracer
f431d24762 Merge branch 'MK3' of https://github.com/DRracer/Prusa-Firmware into MK3 2019-05-07 16:17:14 +02:00
DRracer
0124fbf9ee Fix: display target extruder temperature on the main screen when doing
PID calibration
2019-05-07 16:15:42 +02:00
Robert Pelnar
85806a0f38 variable bed pwm frequency fix (input value is 7bit, not 8bit) 2019-05-07 15:35:34 +02:00
Ondrej Tuma
b7fe43bf68 Deleted bad cols/rows definitions for translation. 2019-05-07 12:52:23 +02:00
Robert Pelnar
58683da2fb Variable bed PWM resolution/frequency (adjusted to 5bits/32Hz) 2019-05-06 18:07:42 +02:00
Marek Běl
e56be687bb
Merge pull request #1800 from XPila/MK3
return with exitcode 1 if any language not generated properly
2019-05-06 15:58:34 +00:00
Marek Bel
1a0370e1c7 Make macro ON_MENU_LEAVE() usage similar to macros MENU_ITEM_BACK_P() and MENU_ITEM_FUNCTION_P(). 2019-05-06 17:39:00 +02:00
Robert Pelnar
fa1bdd6ab1 Lang - decreased reserved space for secondary language (10496 bytes) 2019-05-06 17:29:47 +02:00
DRracer
ffbdb43881 Remove commented code 2019-05-06 17:26:42 +02:00
Robert Pelnar
41a827fa00 Removed unused texts, increased reserved space to 0x2e00 (11776 bytes) 2019-05-06 17:24:06 +02:00
DRracer
0794430208 Fix for linearity correction not being stored to EEPROM when doing MENU-
UP
2019-05-06 15:33:13 +02:00
Robert Pelnar
1c9d134c62 return with exitcode 1 if any language not generated properly
fix - include system_timer.h
2019-05-06 15:29:57 +02:00
DRracer
e5911c42da limit printed menu text to max 18 characters 2019-05-06 12:44:36 +02:00
Robert Pelnar
3852aa4275 Different secondary language reserved space for MK3 and MK25 2019-04-30 12:42:18 +02:00
Marek Běl
177c123b4d
Merge pull request #1780 from MRprusa3d/PFW-841
"stop" immediately after "pause" patch
2019-04-29 14:49:49 +00:00
Marek Bel
8fadbf1b44 Do not call watchdog reset from updateTemperaturesFromRawValues(). 2019-04-29 16:41:38 +02:00
MRprusa3d
b93f37ee02 "stop" immediately after "pause" patch 2019-04-29 14:39:19 +02:00
Robert Pelnar
18dec75b56 MK2.5 - watchdog enabled + test (command "D-1") 2019-04-29 13:19:59 +02:00
NotaRobotexe
f16bea26e5 raise the Z axis before filament loading to nozzle on MMU2S 2019-04-25 17:39:09 +02:00
XPila
238079fc95
Merge pull request #1763 from mkbel/save_flash_timer2
Do not compile timer02.c if not used. Saves 148B flash.
2019-04-24 16:07:17 +02:00
mkbel
e8e7fa907f
Change comment 2019-04-24 15:52:24 +02:00