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

Merge remote-tracking branch 'refs/remotes/prusa3d/MK2' into MK2 

# Conflicts:
#	Firmware/Configuration.h
#	Firmware/language_all.cpp
#	Firmware/language_all.h
#	Firmware/language_en.h
#	Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h
This commit is contained in:
3d-gussner 2017-05-01 12:16:33 +02:00
parent ee4a887554 361e472c50
commit 5a84ab596f
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Configuration.h
View File

@ -69,7 +69,7 @@
//#define STRING_VERSION "1.0.2"
#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time
#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
#define STRING_CONFIG_H_AUTHOR "(3D-gussner, Test version)" // Who made the changes.
// SERIAL_PORT selects which serial port should be used for communication with the host.
// This allows the connection of wireless adapters (for instance) to non-default port pins.

1
Firmware/language_en.h
View File

@ -287,3 +287,4 @@
#define(length=20, lines=1) MSG_TEMP_CALIBRATION_ON "PINDA T.cal. [ON]"
#define(length=20, lines=1) MSG_TEMP_CALIBRATION_OFF "PINDA T.cal.[OFF]"

1
Firmware/ultralcd.cpp
View File

@ -1022,6 +1022,7 @@ static void lcd_support_menu()
MENU_ITEM(back, PSTR("------------"), lcd_main_menu);
MENU_ITEM(back, PSTR("Date: "), lcd_main_menu);
MENU_ITEM(back, PSTR(__DATE__), lcd_main_menu);
MENU_ITEM(back, PSTR(STRING_CONFIG_H_AUTHOR), lcd_main_menu);
// Show the FlashAir IP address, if the card is available.
if (menuData.supportMenu.is_flash_air) {

1
Firmware/ultralcd.h
View File

@ -243,4 +243,5 @@ char reset_menu();
void lcd_pinda_calibration_menu();
void lcd_calibrate_pinda();
void lcd_temp_calibration_set();
#endif //ULTRALCD_H