bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge branch 'Marlin_v1' of https://github.com/BorisLandoni/Marlin into BorisLandoni-Marlin_v1

Browse Source 
Conflicts:
	Marlin/Configuration.h
	Marlin/language.h
	Marlin/pins.h
This commit is contained in:
Erik van der Zalm
2013-06-09 22:57:40 +02:00
parent bd96d22bfb 15b1b896e8
commit 408169aef4
3 changed files with 146 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/language.h
View File

@ -29,6 +29,9 @@
#elif MOTHERBOARD == 80
#define MACHINE_NAME "Rumba"
#define FIRMWARE_URL "https://github.com/ErikZalm/Marlin/"
#elif MOTHERBOARD == 77
#define MACHINE_NAME "3Drag"
#define FIRMWARE_URL "http://3dprint.elettronicain.it/"
#else
#ifdef CUSTOM_MENDEL_NAME
#define MACHINE_NAME CUSTOM_MENDEL_NAME
@ -1004,7 +1007,7 @@
#if LANGUAGE_CHOICE == 7
// LCD Menu Messages
#define WELCOME_MSG MACHINE_NAME " Pronto."
#define WELCOME_MSG MACHINE_NAME " Pronta"
#define MSG_SD_INSERTED "SD Card inserita"
#define MSG_SD_REMOVED "SD Card rimossa"
#define MSG_MAIN "Menu principale"
@ -1016,7 +1019,7 @@
#define MSG_PREHEAT_PLA_SETTINGS "Preris. PLA Conf"
#define MSG_PREHEAT_ABS "Preriscalda ABS"
#define MSG_PREHEAT_ABS_SETTINGS "Preris. ABS Conf"
#define MSG_COOLDOWN "Rafredda"
#define MSG_COOLDOWN "Raffredda"
#define MSG_EXTRUDE "Estrudi"
#define MSG_RETRACT "Ritrai"
#define MSG_MOVE_AXIS "Muovi Asse"