3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-08-08 22:34:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merged fetched files from Marlin_v1 branch

Browse source 
Pull requests: #414 #433 #432 #428
This commit is contained in:
Dirk Eichel 2013-03-26 21:43:04 +01:00
commit 4e448b700a
6 changed files with 268 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Marlin/language.h
View file

@ -26,6 +26,9 @@
#if MOTHERBOARD == 7 || MOTHERBOARD == 71
#define MACHINE_NAME "Ultimaker"
#define FIRMWARE_URL "http://firmware.ultimaker.com"
#elif MOTHERBOARD == 80
#define MACHINE_NAME "Rumba"
#define FIRMWARE_URL "https://github.com/ErikZalm/Marlin/"
#else
#define MACHINE_NAME "Mendel"
#define FIRMWARE_URL "http://www.mendel-parts.com"
@ -1461,5 +1464,9 @@
#define MSG_ERR_LONG_EXTRUDE_STOP " liian pitka pursotus estetty"
#endif
<<<<<<< HEAD
#endif // ifndef LANGUAGE_H
=======
#endif // ifndef LANGUAGE_H
>>>>>>> origin/Marlin_v1