3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #303 from XPila/MK3

Browse Source 
Mk3
This commit is contained in:
XPila 2017-12-11 00:04:27 +01:00 committed by GitHub
commit bad82452cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14900 additions and 14875 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Configuration.h
View File

@ -9,7 +9,7 @@
// Firmware version // Firmware version
#define FW_version "3.1.1-RC1" #define FW_version "3.1.1-RC1"
#define FW_build 127 #define FW_build 128
//#define FW_build --BUILD-NUMBER-- //#define FW_build --BUILD-NUMBER--
#define FW_version_build FW_version " b" STR(FW_build) #define FW_version_build FW_version " b" STR(FW_build)

29768
Firmware/Firmware.ino.rambo.hex
View File

File diff suppressed because it is too large Load Diff

5
Firmware/ultralcd.cpp
View File

@ -1544,9 +1544,12 @@ static void lcd_menu_fails_stats()
} }
extern uint16_t SP_min; extern uint16_t SP_min;
extern char* __malloc_heap_start;
extern char* __malloc_heap_end;
static void lcd_menu_debug() static void lcd_menu_debug()
{ {
fprintf_P(lcdout, PSTR(ESC_H(1,1)"SP_min: 0x%04x"), SP_min); fprintf_P(lcdout, PSTR(ESC_H(1,1)"RAM statistics"ESC_H(5,1)"SP_min: 0x%04x"ESC_H(1,2)"heap_start: 0x%04x"ESC_H(3,3)"heap_end: 0x%04x"), SP_min, __malloc_heap_start, __malloc_heap_end);
if (lcd_clicked()) if (lcd_clicked())
{ {