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

2440 Commits

Author SHA1 Message Date
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
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
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
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
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
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