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

3045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
NotaRobotexe
5021fadd5d multiple sheets - menu switching bug 2019-07-24 11:20:27 +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
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
45f3f1439b
Merge pull request #2029 from DRracer/code_size_optimization 
Code size optimization
 2019-07-22 19:12:05 +02:00
DRracer
00d3f0b297
Merge pull request #2030 from kuhnmarek/update_readme 
Updated linux build manual
 2019-07-22 18:50:47 +02:00
Marek Kühn
23ed612efe Updated linux build manual 2019-07-22 18:45:41 +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
254dd7463b fix tests 2019-07-22 17:08:10 +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
DRracer
1a5478f7ed
Merge pull request #2021 from kuhnmarek/bugfix/PFW-917_saving_live_z 
PFW-917 Adjust Z value persists across update to v3.8
 2019-07-22 12:47:08 +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
DRracer
498141b9fc
Merge pull request #2010 from mkbel/fix_warnings 
Fix warnings
 2019-07-16 18:24:00 +02: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
976b6b15ed
Merge pull request #1 from kuhnmarek/testing_3.8.0 
Unit test for prusa_statistics
 2019-07-16 17:01:31 +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
Marek Kuhn
1f4542fe8b Added unit test for prusa_statistics 2019-07-16 15:41:28 +02:00
DRracer
d65b333664
Merge pull request #2003 from mkbel/heat_hysteresis 
Heat hysteresis
 2019-07-16 13:10:47 +02:00
leptun
0481db87d6 Fix missing commas 2019-07-16 12:12:09 +03: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
DRracer
2d47bf06c8
Merge pull request #2004 from mkbel/save_flash 
Document
 2019-07-16 08:41:19 +02:00