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

2337 Commits

Author SHA1 Message Date
Marek Kühn
94e79806bc Updated doxygen docs to work better with confluence. 2019-07-19 13:51:55 +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
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
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