Selaa lähdekoodia

Added a structure that will allow easy translations/modifications to the LCD menu.

Signed-off-by: Blair Thompson <mail@justblair.co.uk>
Blair Thompson 13 vuotta sitten
vanhempi
commit
fe940a142d

+ 60
- 0
Marlin/.Marlin.vsarduino.h Näytä tiedosto

1
+#define __AVR_ATmega2560__
2
+#define __cplusplus
3
+#define __builtin_va_list int
4
+#define __attribute__(x)
5
+#define __inline__
6
+#define __asm__(x)
7
+#define ARDUINO 100
8
+extern "C" void __cxa_pure_virtual() {}
9
+#include "C:\arduino-1.0\libraries\LiquidCrystal\LiquidCrystal.h"
10
+#include "C:\arduino-1.0\libraries\LiquidCrystal\LiquidCrystal.cpp"
11
+void enquecommand(const char *cmd);
12
+void setup_photpin();
13
+void setup_powerhold();
14
+void suicide();
15
+void setup();
16
+void loop();
17
+void get_command();
18
+float code_value();
19
+long code_value_long();
20
+bool code_seen(char code_string[]);
21
+bool code_seen(char code);
22
+void process_commands();
23
+void process_commands();
24
+void FlushSerialRequestResend();
25
+void ClearToSend();
26
+void get_coordinates();
27
+void get_arc_coordinates();
28
+void prepare_move();
29
+void prepare_arc_move(char isclockwise);
30
+void manage_inactivity(byte debug);
31
+void kill();
32
+char *createFilename(char *buffer,const dir_t &p);
33
+void lcdProgMemprint(const char *str);
34
+int intround(const float &x);
35
+void lcd_status(const char* message);
36
+void lcd_statuspgm(const char* message);
37
+FORCE_INLINE void clear();
38
+void lcd_init();
39
+void beep();
40
+void beepshort();
41
+void lcd_status();
42
+void buttons_init();
43
+void buttons_check();
44
+char *ftostr3(const float &x);
45
+char *itostr2(const uint8_t &x);
46
+char *ftostr31(const float &x);
47
+char *ftostr32(const float &x);
48
+char *itostr31(const int &xx);
49
+char *itostr3(const int &xx);
50
+char *itostr4(const int &xx);
51
+char *ftostr51(const float &x);
52
+void wd_init();
53
+void wd_reset();
54
+
55
+#include "C:\arduino-1.0\hardware\arduino\variants\mega\pins_arduino.h" 
56
+#include "C:\arduino-1.0\hardware\arduino\cores\arduino\Arduino.h"
57
+#include "C:\Users\Blair\Desktop\Marlin_v1\Marlin\Marlin.pde" 
58
+#include "C:\Users\Blair\Desktop\Marlin_v1\Marlin\cardreader.pde"
59
+#include "C:\Users\Blair\Desktop\Marlin_v1\Marlin\ultralcd.pde"
60
+#include "C:\Users\Blair\Desktop\Marlin_v1\Marlin\watchdog.pde"

BIN
Marlin/Debug/CL.read.1.tlog Näytä tiedosto


BIN
Marlin/Debug/CL.write.1.tlog Näytä tiedosto


+ 2
- 0
Marlin/Debug/Marlin.lastbuildstate Näytä tiedosto

1
+#v4.0:v100
2
+Debug|Win32|C:\Users\Blair\Desktop\Marlin_v1\Marlin\|

+ 1042
- 0
Marlin/Debug/Marlin.log
File diff suppressed because it is too large
Näytä tiedosto


+ 0
- 0
Marlin/Debug/Marlin.unsuccessfulbuild Näytä tiedosto


BIN
Marlin/Debug/cl.command.1.tlog Näytä tiedosto


BIN
Marlin/Debug/vc100.idb Näytä tiedosto


BIN
Marlin/Debug/vc100.pdb Näytä tiedosto


+ 1
- 0
Marlin/Marlin.pde Näytä tiedosto

35
 #include "cardreader.h"
35
 #include "cardreader.h"
36
 #include "watchdog.h"
36
 #include "watchdog.h"
37
 #include "EEPROMwrite.h"
37
 #include "EEPROMwrite.h"
38
+#include "language.h"
38
 
39
 
39
 #define VERSION_STRING  "1.0.0 RC1"
40
 #define VERSION_STRING  "1.0.0 RC1"
40
 
41
 

BIN
Marlin/Marlin.sdf Näytä tiedosto


+ 20
- 0
Marlin/Marlin.sln Näytä tiedosto

1
+
2
+Microsoft Visual Studio Solution File, Format Version 11.00
3
+# Visual Studio 2010
4
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Marlin", "Marlin.vcxproj", "{510EF280-9617-4F04-86F4-19F7E48C6FC1}"
5
+EndProject
6
+Global
7
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
8
+		Debug|Win32 = Debug|Win32
9
+		Release|Win32 = Release|Win32
10
+	EndGlobalSection
11
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
12
+		{510EF280-9617-4F04-86F4-19F7E48C6FC1}.Debug|Win32.ActiveCfg = Debug|Win32
13
+		{510EF280-9617-4F04-86F4-19F7E48C6FC1}.Debug|Win32.Build.0 = Debug|Win32
14
+		{510EF280-9617-4F04-86F4-19F7E48C6FC1}.Release|Win32.ActiveCfg = Release|Win32
15
+		{510EF280-9617-4F04-86F4-19F7E48C6FC1}.Release|Win32.Build.0 = Release|Win32
16
+	EndGlobalSection
17
+	GlobalSection(SolutionProperties) = preSolution
18
+		HideSolutionNode = FALSE
19
+	EndGlobalSection
20
+EndGlobal

BIN
Marlin/Marlin.suo Näytä tiedosto


+ 118
- 0
Marlin/Marlin.vcxproj Näytä tiedosto

1
+<?xml version="1.0" encoding="utf-8"?>
2
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
+  <ItemGroup Label="ProjectConfigurations">
4
+    <ProjectConfiguration Include="Debug|Win32">
5
+      <Configuration>Debug</Configuration>
6
+      <Platform>Win32</Platform>
7
+    </ProjectConfiguration>
8
+    <ProjectConfiguration Include="Release|Win32">
9
+      <Configuration>Release</Configuration>
10
+      <Platform>Win32</Platform>
11
+    </ProjectConfiguration>
12
+  </ItemGroup>
13
+  <PropertyGroup Label="Globals">
14
+    <ProjectGuid>{510EF280-9617-4F04-86F4-19F7E48C6FC1}</ProjectGuid>
15
+    <RootNamespace>Marlin</RootNamespace>
16
+  </PropertyGroup>
17
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
18
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
19
+    <ConfigurationType>Application</ConfigurationType>
20
+    <UseDebugLibraries>true</UseDebugLibraries>
21
+    <CharacterSet>MultiByte</CharacterSet>
22
+  </PropertyGroup>
23
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
24
+    <ConfigurationType>Application</ConfigurationType>
25
+    <UseDebugLibraries>false</UseDebugLibraries>
26
+    <WholeProgramOptimization>true</WholeProgramOptimization>
27
+    <CharacterSet>MultiByte</CharacterSet>
28
+  </PropertyGroup>
29
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
30
+  <ImportGroup Label="ExtensionSettings">
31
+  </ImportGroup>
32
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
33
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
34
+  </ImportGroup>
35
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
36
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
37
+  </ImportGroup>
38
+  <PropertyGroup Label="UserMacros" />
39
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
40
+    <IncludePath>C:\arduino-1.0\hardware\arduino\cores\arduino;C:\arduino-1.0\hardware\arduino\variants\mega;c:\arduino-1.0\hardware\tools\avr\avr\include\;c:\arduino-1.0\hardware\tools\avr\avr\include\avr\;c:\arduino-1.0\hardware\tools\avr\avr\;c:\arduino-1.0\hardware\tools\avr\lib\gcc\avr\4.3.2\include\;C:\arduino-1.0\libraries\LiquidCrystal;C:\arduino-1.0\libraries\LiquidCrystal\utility;</IncludePath>
41
+  </PropertyGroup>
42
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
43
+    <IncludePath>C:\arduino-1.0\hardware\arduino\cores\arduino;C:\arduino-1.0\hardware\arduino\variants\mega;c:\arduino-1.0\hardware\tools\avr\avr\include\;c:\arduino-1.0\hardware\tools\avr\avr\include\avr\;c:\arduino-1.0\hardware\tools\avr\avr\;c:\arduino-1.0\hardware\tools\avr\lib\gcc\avr\4.3.2\include\;C:\arduino-1.0\libraries\LiquidCrystal;C:\arduino-1.0\libraries\LiquidCrystal\utility;</IncludePath>
44
+  </PropertyGroup>
45
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
46
+    <ClCompile>
47
+      <WarningLevel>Level3</WarningLevel>
48
+      <Optimization>Disabled</Optimization>
49
+    </ClCompile>
50
+    <Link>
51
+      <GenerateDebugInformation>true</GenerateDebugInformation>
52
+    </Link>
53
+  </ItemDefinitionGroup>
54
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
55
+    <ClCompile>
56
+      <WarningLevel>Level3</WarningLevel>
57
+      <Optimization>MaxSpeed</Optimization>
58
+      <FunctionLevelLinking>true</FunctionLevelLinking>
59
+      <IntrinsicFunctions>true</IntrinsicFunctions>
60
+    </ClCompile>
61
+    <Link>
62
+      <GenerateDebugInformation>true</GenerateDebugInformation>
63
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
64
+      <OptimizeReferences>true</OptimizeReferences>
65
+    </Link>
66
+  </ItemDefinitionGroup>
67
+  <ItemGroup>
68
+    <None Include="cardreader.pde" />
69
+    <None Include="Marlin.pde" />
70
+    <None Include="ultralcd.pde" />
71
+    <None Include="watchdog.pde" />
72
+  </ItemGroup>
73
+  <ItemGroup>
74
+    <ClInclude Include=".Marlin.vsarduino.h" />
75
+    <ClInclude Include="cardreader.h" />
76
+    <ClInclude Include="Configuration.h" />
77
+    <ClInclude Include="Configuration_adv.h" />
78
+    <ClInclude Include="EEPROMwrite.h" />
79
+    <ClInclude Include="fastio.h" />
80
+    <ClInclude Include="language.h" />
81
+    <ClInclude Include="Marlin.h" />
82
+    <ClInclude Include="MarlinSerial.h" />
83
+    <ClInclude Include="motion_control.h" />
84
+    <ClInclude Include="pins.h" />
85
+    <ClInclude Include="planner.h" />
86
+    <ClInclude Include="Sd2Card.h" />
87
+    <ClInclude Include="Sd2PinMap.h" />
88
+    <ClInclude Include="SdBaseFile.h" />
89
+    <ClInclude Include="SdFatConfig.h" />
90
+    <ClInclude Include="SdFatStructs.h" />
91
+    <ClInclude Include="SdFatUtil.h" />
92
+    <ClInclude Include="SdFile.h" />
93
+    <ClInclude Include="SdInfo.h" />
94
+    <ClInclude Include="SdVolume.h" />
95
+    <ClInclude Include="speed_lookuptable.h" />
96
+    <ClInclude Include="stepper.h" />
97
+    <ClInclude Include="temperature.h" />
98
+    <ClInclude Include="thermistortables.h" />
99
+    <ClInclude Include="ultralcd.h" />
100
+    <ClInclude Include="watchdog.h" />
101
+    <ClInclude Include="wiring.h" />
102
+  </ItemGroup>
103
+  <ItemGroup>
104
+    <ClCompile Include="MarlinSerial.cpp" />
105
+    <ClCompile Include="motion_control.cpp" />
106
+    <ClCompile Include="planner.cpp" />
107
+    <ClCompile Include="Sd2Card.cpp" />
108
+    <ClCompile Include="SdBaseFile.cpp" />
109
+    <ClCompile Include="SdFatUtil.cpp" />
110
+    <ClCompile Include="SdFile.cpp" />
111
+    <ClCompile Include="SdVolume.cpp" />
112
+    <ClCompile Include="stepper.cpp" />
113
+    <ClCompile Include="temperature.cpp" />
114
+  </ItemGroup>
115
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
116
+  <ImportGroup Label="ExtensionTargets">
117
+  </ImportGroup>
118
+</Project>

+ 141
- 0
Marlin/Marlin.vcxproj.filters Näytä tiedosto

1
+<?xml version="1.0" encoding="utf-8"?>
2
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
+  <ItemGroup>
4
+    <Filter Include="Source Files">
5
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7
+    </Filter>
8
+    <Filter Include="Header Files">
9
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
11
+    </Filter>
12
+    <Filter Include="Resource Files">
13
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15
+    </Filter>
16
+  </ItemGroup>
17
+  <ItemGroup>
18
+    <None Include="Marlin.pde" />
19
+    <None Include="cardreader.pde" />
20
+    <None Include="ultralcd.pde" />
21
+    <None Include="watchdog.pde" />
22
+  </ItemGroup>
23
+  <ItemGroup>
24
+    <ClInclude Include=".Marlin.vsarduino.h">
25
+      <Filter>Header Files</Filter>
26
+    </ClInclude>
27
+    <ClInclude Include="cardreader.h">
28
+      <Filter>Header Files</Filter>
29
+    </ClInclude>
30
+    <ClInclude Include="Configuration.h">
31
+      <Filter>Header Files</Filter>
32
+    </ClInclude>
33
+    <ClInclude Include="Configuration_adv.h">
34
+      <Filter>Header Files</Filter>
35
+    </ClInclude>
36
+    <ClInclude Include="EEPROMwrite.h">
37
+      <Filter>Header Files</Filter>
38
+    </ClInclude>
39
+    <ClInclude Include="fastio.h">
40
+      <Filter>Header Files</Filter>
41
+    </ClInclude>
42
+    <ClInclude Include="Marlin.h">
43
+      <Filter>Header Files</Filter>
44
+    </ClInclude>
45
+    <ClInclude Include="MarlinSerial.h">
46
+      <Filter>Header Files</Filter>
47
+    </ClInclude>
48
+    <ClInclude Include="motion_control.h">
49
+      <Filter>Header Files</Filter>
50
+    </ClInclude>
51
+    <ClInclude Include="pins.h">
52
+      <Filter>Header Files</Filter>
53
+    </ClInclude>
54
+    <ClInclude Include="planner.h">
55
+      <Filter>Header Files</Filter>
56
+    </ClInclude>
57
+    <ClInclude Include="Sd2Card.h">
58
+      <Filter>Header Files</Filter>
59
+    </ClInclude>
60
+    <ClInclude Include="Sd2PinMap.h">
61
+      <Filter>Header Files</Filter>
62
+    </ClInclude>
63
+    <ClInclude Include="SdBaseFile.h">
64
+      <Filter>Header Files</Filter>
65
+    </ClInclude>
66
+    <ClInclude Include="SdFatConfig.h">
67
+      <Filter>Header Files</Filter>
68
+    </ClInclude>
69
+    <ClInclude Include="SdFatStructs.h">
70
+      <Filter>Header Files</Filter>
71
+    </ClInclude>
72
+    <ClInclude Include="SdFatUtil.h">
73
+      <Filter>Header Files</Filter>
74
+    </ClInclude>
75
+    <ClInclude Include="SdFile.h">
76
+      <Filter>Header Files</Filter>
77
+    </ClInclude>
78
+    <ClInclude Include="SdInfo.h">
79
+      <Filter>Header Files</Filter>
80
+    </ClInclude>
81
+    <ClInclude Include="SdVolume.h">
82
+      <Filter>Header Files</Filter>
83
+    </ClInclude>
84
+    <ClInclude Include="speed_lookuptable.h">
85
+      <Filter>Header Files</Filter>
86
+    </ClInclude>
87
+    <ClInclude Include="stepper.h">
88
+      <Filter>Header Files</Filter>
89
+    </ClInclude>
90
+    <ClInclude Include="temperature.h">
91
+      <Filter>Header Files</Filter>
92
+    </ClInclude>
93
+    <ClInclude Include="thermistortables.h">
94
+      <Filter>Header Files</Filter>
95
+    </ClInclude>
96
+    <ClInclude Include="ultralcd.h">
97
+      <Filter>Header Files</Filter>
98
+    </ClInclude>
99
+    <ClInclude Include="watchdog.h">
100
+      <Filter>Header Files</Filter>
101
+    </ClInclude>
102
+    <ClInclude Include="wiring.h">
103
+      <Filter>Header Files</Filter>
104
+    </ClInclude>
105
+    <ClInclude Include="language.h">
106
+      <Filter>Header Files</Filter>
107
+    </ClInclude>
108
+  </ItemGroup>
109
+  <ItemGroup>
110
+    <ClCompile Include="MarlinSerial.cpp">
111
+      <Filter>Source Files</Filter>
112
+    </ClCompile>
113
+    <ClCompile Include="motion_control.cpp">
114
+      <Filter>Source Files</Filter>
115
+    </ClCompile>
116
+    <ClCompile Include="planner.cpp">
117
+      <Filter>Source Files</Filter>
118
+    </ClCompile>
119
+    <ClCompile Include="Sd2Card.cpp">
120
+      <Filter>Source Files</Filter>
121
+    </ClCompile>
122
+    <ClCompile Include="SdBaseFile.cpp">
123
+      <Filter>Source Files</Filter>
124
+    </ClCompile>
125
+    <ClCompile Include="SdFatUtil.cpp">
126
+      <Filter>Source Files</Filter>
127
+    </ClCompile>
128
+    <ClCompile Include="SdFile.cpp">
129
+      <Filter>Source Files</Filter>
130
+    </ClCompile>
131
+    <ClCompile Include="SdVolume.cpp">
132
+      <Filter>Source Files</Filter>
133
+    </ClCompile>
134
+    <ClCompile Include="stepper.cpp">
135
+      <Filter>Source Files</Filter>
136
+    </ClCompile>
137
+    <ClCompile Include="temperature.cpp">
138
+      <Filter>Source Files</Filter>
139
+    </ClCompile>
140
+  </ItemGroup>
141
+</Project>

+ 3
- 0
Marlin/Marlin.vcxproj.user Näytä tiedosto

1
+<?xml version="1.0" encoding="utf-8"?>
2
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
+</Project>

BIN
Marlin/ipch/marlin-7ce658c4/marlin-4b8a948f.ipch Näytä tiedosto


+ 318
- 0
Marlin/language.h Näytä tiedosto

1
+#ifndef LANGUAGE_H
2
+#define LANGUAGE_H
3
+
4
+// Languages
5
+// 1  Custom (For you to add your own messages)
6
+// 2  English 
7
+// 3  French	(Waiting translation)
8
+// 4  German	(Waiting translation)
9
+// 5  Etc
10
+
11
+#define LANGUAGE_CHOICE 1  // Pick your language from the list above
12
+
13
+#if LANGUAGE_CHOICE == 1
14
+
15
+// LCD Menu Messages
16
+
17
+	#define WELCOME_MSG "RepRap Ready."
18
+	#define MSG_SD_INSERTED "Card Ready"
19
+	#define MSG_SD_REMOVED "Card Initiate"
20
+	#define MSG_MAIN " Main \003"
21
+	#define MSG_AUTOSTART " Autostart"
22
+	#define MSG_DISABLE_STEPPERS " Disable Steppers"
23
+	#define MSG_AUTO_HOME " Auto Home"
24
+	#define MSG_SET_ORIGIN " Set Origin"
25
+	#define MSG_PREHEAT " Preheat"
26
+	#define MSG_COOLDOWN " Cooldown"
27
+	#define MSG_EXTRUDE " Extrude"
28
+	#define MSG_SPEED " Speed:"
29
+	#define MSG_NOZZLE " \002Nozzle:"
30
+	#define MSG_BED " \002Bed:"
31
+	#define MSG_FAN_SPEED " Fan speed:"
32
+	#define MSG_FLOW " Flow:"
33
+	#define MSG_CONTROL " Control \003"
34
+	#define MSG_MIN " \002 Min:"
35
+	#define MSG_MAX " \002 Max:"
36
+	#define MSG_FACTOR " \002 Fact:"
37
+	#define MSG_AUTOTEMP " Autotemp:"
38
+	#define MSG_ON "On "
39
+	#define MSG_OFF "Off"
40
+	#define MSG_PID_P " PID-P: "
41
+	#define MSG_PID_I " PID-I: "
42
+	#define MSG_PID_D " PID-D: "
43
+	#define MSG_PID_C " PID-C: "
44
+	#define MSG_ACC  " Acc:"
45
+	#define MSG_VXY_JERK " Vxy-jerk: "
46
+	#define MSG_VMAX " Vmax "
47
+	#define MSG_X "x:"
48
+	#define MSG_Y "y:"
49
+	#define MSG_Z "z:"
50
+	#define MSG_E "e:"
51
+	#define MSG_VMIN " Vmin:"
52
+	#define MSG_VTRAV_MIN " VTrav min:"
53
+	#define MSG_AMAX " Amax "
54
+	#define MSG_A_RETRACT " A-retract:"
55
+	#define MSG_ESTEPS " Esteps/mm:"
56
+	#define MSG_MAIN_WIDE " Main        \003"
57
+	#define MSG_TEMPERATURE_WIDE " Temperature \x7E"
58
+	#define MSG_MOTION_WIDE " Motion      \x7E"
59
+	#define MSG_STORE_EPROM " Store EPROM"
60
+	#define MSG_LOAD_EPROM " Load EPROM"
61
+	#define MSG_RESTORE_FAILSAFE " Restore Failsafe"
62
+	#define MSG_REFRESH "\004Refresh"
63
+	#define MSG_WATCH " Watch   \003"
64
+	#define MSG_PREPARE " Prepare \x7E"
65
+	#define MSG_CONTROL_ARROW " Control \x7E"
66
+	#define MSG_TUNE " Tune    \x7E"
67
+	#define MSG_STOP_PRINT " Stop Print   \x7E"
68
+	#define MSG_CARD_MENU " Card Menu    \x7E"
69
+	#define MSG_NO_CARD " No Card"
70
+	#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Something is wrong in the MenuStructure."
71
+
72
+#endif
73
+
74
+#if LANGUAGE_CHOICE == 2
75
+
76
+// LCD Menu Messages
77
+
78
+	#define WELCOME_MSG "UltiMARLIN Ready."
79
+	#define MSG_SD_INSERTED "Card inserted"
80
+	#define MSG_SD_REMOVED "Card removed"
81
+	#define MSG_MAIN " Main \003"
82
+	#define MSG_AUTOSTART " Autostart"
83
+	#define MSG_DISABLE_STEPPERS " Disable Steppers"
84
+	#define MSG_AUTO_HOME " Auto Home"
85
+	#define MSG_SET_ORIGIN " Set Origin"
86
+	#define MSG_PREHEAT " Preheat"
87
+	#define MSG_COOLDOWN " Cooldown"
88
+	#define MSG_EXTRUDE " Extrude"
89
+	#define MSG_SPEED " Speed:"
90
+	#define MSG_NOZZLE " \002Nozzle:"
91
+	#define MSG_BED " \002Bed:"
92
+	#define MSG_FAN_SPEED " Fan speed:"
93
+	#define MSG_FLOW " Flow:"
94
+	#define MSG_CONTROL " Control \003"
95
+	#define MSG_MIN " \002 Min:"
96
+	#define MSG_MAX " \002 Max:"
97
+	#define MSG_FACTOR " \002 Fact:"
98
+	#define MSG_AUTOTEMP " Autotemp:"
99
+	#define MSG_ON "On "
100
+	#define MSG_OFF "Off"
101
+	#define MSG_PID_P " PID-P: "
102
+	#define MSG_PID_I " PID-I: "
103
+	#define MSG_PID_D " PID-D: "
104
+	#define MSG_PID_C " PID-C: "
105
+	#define MSG_ACC  " Acc:"
106
+	#define MSG_VXY_JERK " Vxy-jerk: "
107
+	#define MSG_VMAX " Vmax "
108
+	#define MSG_X "x:"
109
+	#define MSG_Y "y:"
110
+	#define MSG_Z "z:"
111
+	#define MSG_E "e:"
112
+	#define MSG_VMIN " Vmin:"
113
+	#define MSG_VTRAV_MIN " VTrav min:"
114
+	#define MSG_AMAX " Amax "
115
+	#define MSG_A_RETRACT " A-retract:"
116
+	#define MSG_ESTEPS " Esteps/mm:"
117
+	#define MSG_MAIN_WIDE " Main        \003"
118
+	#define MSG_TEMPERATURE_WIDE " Temperature \x7E"
119
+	#define MSG_MOTION_WIDE " Motion      \x7E"
120
+	#define MSG_STORE_EPROM " Store EPROM"
121
+	#define MSG_LOAD_EPROM " Load EPROM"
122
+	#define MSG_RESTORE_FAILSAFE " Restore Failsafe"
123
+	#define MSG_REFRESH "\004Refresh"
124
+	#define MSG_WATCH " Watch   \003"
125
+	#define MSG_PREPARE " Prepare \x7E"
126
+	#define MSG_CONTROL_ARROW " Control \x7E"
127
+	#define MSG_TUNE " Tune    \x7E"
128
+	#define MSG_STOP_PRINT " Stop Print   \x7E"
129
+	#define MSG_CARD_MENU " Card Menu    \x7E"
130
+	#define MSG_NO_CARD " No Card"
131
+	#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Something is wrong in the MenuStructure."
132
+
133
+#endif
134
+
135
+#if LANGUAGE_CHOICE == 3
136
+
137
+// LCD Menu Messages
138
+
139
+	#define WELCOME_MSG "RepRap Ready."
140
+	#define MSG_SD_INSERTED "Card Ready"
141
+	#define MSG_SD_REMOVED "Card Initiate"
142
+	#define MSG_MAIN " Main \003"
143
+	#define MSG_AUTOSTART " Autostart"
144
+	#define MSG_DISABLE_STEPPERS " Disable Steppers"
145
+	#define MSG_AUTO_HOME " Auto Home"
146
+	#define MSG_SET_ORIGIN " Set Origin"
147
+	#define MSG_PREHEAT " Preheat"
148
+	#define MSG_COOLDOWN " Cooldown"
149
+	#define MSG_EXTRUDE " Extrude"
150
+	#define MSG_SPEED " Speed:"
151
+	#define MSG_NOZZLE " \002Nozzle:"
152
+	#define MSG_BED " \002Bed:"
153
+	#define MSG_FAN_SPEED " Fan speed:"
154
+	#define MSG_FLOW " Flow:"
155
+	#define MSG_CONTROL " Control \003"
156
+	#define MSG_MIN " \002 Min:"
157
+	#define MSG_MAX " \002 Max:"
158
+	#define MSG_FACTOR " \002 Fact:"
159
+	#define MSG_AUTOTEMP " Autotemp:"
160
+	#define MSG_ON "On "
161
+	#define MSG_OFF "Off"
162
+	#define MSG_PID_P " PID-P: "
163
+	#define MSG_PID_I " PID-I: "
164
+	#define MSG_PID_D " PID-D: "
165
+	#define MSG_PID_C " PID-C: "
166
+	#define MSG_ACC  " Acc:"
167
+	#define MSG_VXY_JERK " Vxy-jerk: "
168
+	#define MSG_VMAX " Vmax "
169
+	#define MSG_X "x:"
170
+	#define MSG_Y "y:"
171
+	#define MSG_Z "z:"
172
+	#define MSG_E "e:"
173
+	#define MSG_VMIN " Vmin:"
174
+	#define MSG_VTRAV_MIN " VTrav min:"
175
+	#define MSG_AMAX " Amax "
176
+	#define MSG_A_RETRACT " A-retract:"
177
+	#define MSG_ESTEPS " Esteps/mm:"
178
+	#define MSG_MAIN_WIDE " Main        \003"
179
+	#define MSG_TEMPERATURE_WIDE " Temperature \x7E"
180
+	#define MSG_MOTION_WIDE " Motion      \x7E"
181
+	#define MSG_STORE_EPROM " Store EPROM"
182
+	#define MSG_LOAD_EPROM " Load EPROM"
183
+	#define MSG_RESTORE_FAILSAFE " Restore Failsafe"
184
+	#define MSG_REFRESH "\004Refresh"
185
+	#define MSG_WATCH " Watch   \003"
186
+	#define MSG_PREPARE " Prepare \x7E"
187
+	#define MSG_CONTROL_ARROW " Control \x7E"
188
+	#define MSG_TUNE " Tune    \x7E"
189
+	#define MSG_STOP_PRINT " Stop Print   \x7E"
190
+	#define MSG_CARD_MENU " Card Menu    \x7E"
191
+	#define MSG_NO_CARD " No Card"
192
+	#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Something is wrong in the MenuStructure."
193
+
194
+#endif
195
+
196
+#if LANGUAGE_CHOICE == 4
197
+
198
+// LCD Menu Messages
199
+
200
+	#define WELCOME_MSG "RepRap Ready."
201
+	#define MSG_SD_INSERTED "Card Ready"
202
+	#define MSG_SD_REMOVED "Card Initiate"
203
+	#define MSG_MAIN " Main \003"
204
+	#define MSG_AUTOSTART " Autostart"
205
+	#define MSG_DISABLE_STEPPERS " Disable Steppers"
206
+	#define MSG_AUTO_HOME " Auto Home"
207
+	#define MSG_SET_ORIGIN " Set Origin"
208
+	#define MSG_PREHEAT " Preheat"
209
+	#define MSG_COOLDOWN " Cooldown"
210
+	#define MSG_EXTRUDE " Extrude"
211
+	#define MSG_SPEED " Speed:"
212
+	#define MSG_NOZZLE " \002Nozzle:"
213
+	#define MSG_BED " \002Bed:"
214
+	#define MSG_FAN_SPEED " Fan speed:"
215
+	#define MSG_FLOW " Flow:"
216
+	#define MSG_CONTROL " Control \003"
217
+	#define MSG_MIN " \002 Min:"
218
+	#define MSG_MAX " \002 Max:"
219
+	#define MSG_FACTOR " \002 Fact:"
220
+	#define MSG_AUTOTEMP " Autotemp:"
221
+	#define MSG_ON "On "
222
+	#define MSG_OFF "Off"
223
+	#define MSG_PID_P " PID-P: "
224
+	#define MSG_PID_I " PID-I: "
225
+	#define MSG_PID_D " PID-D: "
226
+	#define MSG_PID_C " PID-C: "
227
+	#define MSG_ACC  " Acc:"
228
+	#define MSG_VXY_JERK " Vxy-jerk: "
229
+	#define MSG_VMAX " Vmax "
230
+	#define MSG_X "x:"
231
+	#define MSG_Y "y:"
232
+	#define MSG_Z "z:"
233
+	#define MSG_E "e:"
234
+	#define MSG_VMIN " Vmin:"
235
+	#define MSG_VTRAV_MIN " VTrav min:"
236
+	#define MSG_AMAX " Amax "
237
+	#define MSG_A_RETRACT " A-retract:"
238
+	#define MSG_ESTEPS " Esteps/mm:"
239
+	#define MSG_MAIN_WIDE " Main        \003"
240
+	#define MSG_TEMPERATURE_WIDE " Temperature \x7E"
241
+	#define MSG_MOTION_WIDE " Motion      \x7E"
242
+	#define MSG_STORE_EPROM " Store EPROM"
243
+	#define MSG_LOAD_EPROM " Load EPROM"
244
+	#define MSG_RESTORE_FAILSAFE " Restore Failsafe"
245
+	#define MSG_REFRESH "\004Refresh"
246
+	#define MSG_WATCH " Watch   \003"
247
+	#define MSG_PREPARE " Prepare \x7E"
248
+	#define MSG_CONTROL_ARROW " Control \x7E"
249
+	#define MSG_TUNE " Tune    \x7E"
250
+	#define MSG_STOP_PRINT " Stop Print   \x7E"
251
+	#define MSG_CARD_MENU " Card Menu    \x7E"
252
+	#define MSG_NO_CARD " No Card"
253
+	#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Something is wrong in the MenuStructure."
254
+
255
+#endif
256
+
257
+#if LANGUAGE_CHOICE == 5
258
+
259
+// LCD Menu Messages
260
+
261
+	#define WELCOME_MSG "RepRap Ready."
262
+	#define MSG_SD_INSERTED "Card Ready"
263
+	#define MSG_SD_REMOVED "Card Initiate"
264
+	#define MSG_MAIN " Main \003"
265
+	#define MSG_AUTOSTART " Autostart"
266
+	#define MSG_DISABLE_STEPPERS " Disable Steppers"
267
+	#define MSG_AUTO_HOME " Auto Home"
268
+	#define MSG_SET_ORIGIN " Set Origin"
269
+	#define MSG_PREHEAT " Preheat"
270
+	#define MSG_COOLDOWN " Cooldown"
271
+	#define MSG_EXTRUDE " Extrude"
272
+	#define MSG_SPEED " Speed:"
273
+	#define MSG_NOZZLE " \002Nozzle:"
274
+	#define MSG_BED " \002Bed:"
275
+	#define MSG_FAN_SPEED " Fan speed:"
276
+	#define MSG_FLOW " Flow:"
277
+	#define MSG_CONTROL " Control \003"
278
+	#define MSG_MIN " \002 Min:"
279
+	#define MSG_MAX " \002 Max:"
280
+	#define MSG_FACTOR " \002 Fact:"
281
+	#define MSG_AUTOTEMP " Autotemp:"
282
+	#define MSG_ON "On "
283
+	#define MSG_OFF "Off"
284
+	#define MSG_PID_P " PID-P: "
285
+	#define MSG_PID_I " PID-I: "
286
+	#define MSG_PID_D " PID-D: "
287
+	#define MSG_PID_C " PID-C: "
288
+	#define MSG_ACC  " Acc:"
289
+	#define MSG_VXY_JERK " Vxy-jerk: "
290
+	#define MSG_VMAX " Vmax "
291
+	#define MSG_X "x:"
292
+	#define MSG_Y "y:"
293
+	#define MSG_Z "z:"
294
+	#define MSG_E "e:"
295
+	#define MSG_VMIN " Vmin:"
296
+	#define MSG_VTRAV_MIN " VTrav min:"
297
+	#define MSG_AMAX " Amax "
298
+	#define MSG_A_RETRACT " A-retract:"
299
+	#define MSG_ESTEPS " Esteps/mm:"
300
+	#define MSG_MAIN_WIDE " Main        \003"
301
+	#define MSG_TEMPERATURE_WIDE " Temperature \x7E"
302
+	#define MSG_MOTION_WIDE " Motion      \x7E"
303
+	#define MSG_STORE_EPROM " Store EPROM"
304
+	#define MSG_LOAD_EPROM " Load EPROM"
305
+	#define MSG_RESTORE_FAILSAFE " Restore Failsafe"
306
+	#define MSG_REFRESH "\004Refresh"
307
+	#define MSG_WATCH " Watch   \003"
308
+	#define MSG_PREPARE " Prepare \x7E"
309
+	#define MSG_CONTROL_ARROW " Control \x7E"
310
+	#define MSG_TUNE " Tune    \x7E"
311
+	#define MSG_STOP_PRINT " Stop Print   \x7E"
312
+	#define MSG_CARD_MENU " Card Menu    \x7E"
313
+	#define MSG_NO_CARD " No Card"
314
+	#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Something is wrong in the MenuStructure."
315
+
316
+#endif
317
+
318
+#endif // ifndef LANGUAGE_H

+ 61
- 61
Marlin/ultralcd.pde Näytä tiedosto

122
   lcd.createChar(3,uplevel);
122
   lcd.createChar(3,uplevel);
123
   lcd.createChar(4,refresh);
123
   lcd.createChar(4,refresh);
124
   lcd.createChar(5,folder);
124
   lcd.createChar(5,folder);
125
-  LCD_MESSAGEPGM("UltiMarlin ready.");
125
+  LCD_MESSAGEPGM(WELCOME_MSG);
126
 }
126
 }
127
 
127
 
128
 
128
 
464
   switch(i)
464
   switch(i)
465
   {
465
   {
466
     case ItemP_exit:
466
     case ItemP_exit:
467
-      MENUITEM(  lcdprintPGM(" Main \003")  ,  BLOCK;status=Main_Menu;beepshort(); ) ;
467
+      MENUITEM(  lcdprintPGM(MSG_MAIN)  ,  BLOCK;status=Main_Menu;beepshort(); ) ;
468
       break;
468
       break;
469
     case ItemP_autostart:
469
     case ItemP_autostart:
470
-      MENUITEM(  lcdprintPGM(" Autostart")  ,  BLOCK;card.lastnr=0;card.setroot();card.checkautostart(true);beepshort(); ) ;
470
+      MENUITEM(  lcdprintPGM(MSG_AUTOSTART)  ,  BLOCK;card.lastnr=0;card.setroot();card.checkautostart(true);beepshort(); ) ;
471
       break;
471
       break;
472
     case ItemP_disstep:
472
     case ItemP_disstep:
473
-      MENUITEM(  lcdprintPGM(" Disable Steppers")  ,  BLOCK;enquecommand("M84");beepshort(); ) ;
473
+      MENUITEM(  lcdprintPGM(MSG_DISABLE_STEPPERS)  ,  BLOCK;enquecommand("M84");beepshort(); ) ;
474
       break;
474
       break;
475
     case ItemP_home:
475
     case ItemP_home:
476
-      MENUITEM(  lcdprintPGM(" Auto Home")  ,  BLOCK;enquecommand("G28 X-105 Y-105 Z0");beepshort(); ) ;
476
+      MENUITEM(  lcdprintPGM(MSG_AUTO_HOME)  ,  BLOCK;enquecommand("G28 X-105 Y-105 Z0");beepshort(); ) ;
477
       break;
477
       break;
478
     case ItemP_origin:
478
     case ItemP_origin:
479
-      MENUITEM(  lcdprintPGM(" Set Origin")  ,  BLOCK;enquecommand("G92 X0 Y0 Z0");beepshort(); ) ;
479
+      MENUITEM(  lcdprintPGM(MSG_SET_ORIGIN)  ,  BLOCK;enquecommand("G92 X0 Y0 Z0");beepshort(); ) ;
480
       break;
480
       break;
481
     case ItemP_preheat:
481
     case ItemP_preheat:
482
-      MENUITEM(  lcdprintPGM(" Preheat")  ,  BLOCK;setTargetHotend0(170);setTargetBed(70);beepshort(); ) ;
482
+      MENUITEM(  lcdprintPGM(MSG_PREHEAT)  ,  BLOCK;setTargetHotend0(170);setTargetBed(70);beepshort(); ) ;
483
       break;
483
       break;
484
     case ItemP_cooldown:
484
     case ItemP_cooldown:
485
-      MENUITEM(  lcdprintPGM(" Cooldown")  ,  BLOCK;setTargetHotend0(0);setTargetBed(0);beepshort(); ) ;
485
+      MENUITEM(  lcdprintPGM(MSG_COOLDOWN)  ,  BLOCK;setTargetHotend0(0);setTargetBed(0);beepshort(); ) ;
486
       break;
486
       break;
487
     case ItemP_extrude:
487
     case ItemP_extrude:
488
       MENUITEM(  lcdprintPGM(" Extrude")  ,  BLOCK;enquecommand("G92 E0");enquecommand("G1 F700 E50");beepshort(); ) ;
488
       MENUITEM(  lcdprintPGM(" Extrude")  ,  BLOCK;enquecommand("G92 E0");enquecommand("G1 F700 E50");beepshort(); ) ;
513
   switch(i)
513
   switch(i)
514
   {
514
   {
515
   case ItemT_exit:
515
   case ItemT_exit:
516
-      MENUITEM(  lcdprintPGM(" Main \003")  ,  BLOCK;status=Main_Menu;beepshort(); ) ;
516
+      MENUITEM(  lcdprintPGM(MSG_MAIN)  ,  BLOCK;status=Main_Menu;beepshort(); ) ;
517
       break;
517
       break;
518
   case ItemT_speed:
518
   case ItemT_speed:
519
     {
519
     {
520
       if(force_lcd_update)
520
       if(force_lcd_update)
521
       {
521
       {
522
-        lcd.setCursor(0,line);lcdprintPGM(" Speed:");
522
+        lcd.setCursor(0,line);lcdprintPGM(MSG_SPEED);
523
         lcd.setCursor(13,line);lcd.print(ftostr3(feedmultiply));
523
         lcd.setCursor(13,line);lcd.print(ftostr3(feedmultiply));
524
       }
524
       }
525
       
525
       
554
       {
554
       {
555
         if(force_lcd_update)
555
         if(force_lcd_update)
556
         {
556
         {
557
-          lcd.setCursor(0,line);lcdprintPGM(" \002Nozzle:");
557
+          lcd.setCursor(0,line);lcdprintPGM(MSG_NOZZLE);
558
           lcd.setCursor(13,line);lcd.print(ftostr3(intround(degTargetHotend0())));
558
           lcd.setCursor(13,line);lcd.print(ftostr3(intround(degTargetHotend0())));
559
         }
559
         }
560
         
560
         
588
       {
588
       {
589
         if(force_lcd_update)
589
         if(force_lcd_update)
590
         {
590
         {
591
-          lcd.setCursor(0,line);lcdprintPGM(" \002Bed:");
591
+          lcd.setCursor(0,line);lcdprintPGM(MSG_BED);
592
           lcd.setCursor(13,line);lcd.print(ftostr3(intround(degTargetBed())));
592
           lcd.setCursor(13,line);lcd.print(ftostr3(intround(degTargetBed())));
593
         }
593
         }
594
         
594
         
659
          {
659
          {
660
       if(force_lcd_update)
660
       if(force_lcd_update)
661
         {
661
         {
662
-          lcd.setCursor(0,line);lcdprintPGM(" Flow:");
662
+          lcd.setCursor(0,line);lcdprintPGM(MSG_FLOW);
663
           lcd.setCursor(13,line);lcd.print(itostr4(axis_steps_per_unit[3]));
663
           lcd.setCursor(13,line);lcd.print(itostr4(axis_steps_per_unit[3]));
664
         }
664
         }
665
         
665
         
740
   switch(i)
740
   switch(i)
741
   {
741
   {
742
     case ItemCT_exit:
742
     case ItemCT_exit:
743
-      MENUITEM(  lcdprintPGM(" Control \003")  ,  BLOCK;status=Main_Control;beepshort(); ) ;
743
+      MENUITEM(  lcdprintPGM(MSG_CONTROL)  ,  BLOCK;status=Main_Control;beepshort(); ) ;
744
       break;
744
       break;
745
     case ItemCT_nozzle:
745
     case ItemCT_nozzle:
746
       {
746
       {
747
         if(force_lcd_update)
747
         if(force_lcd_update)
748
         {
748
         {
749
-          lcd.setCursor(0,line);lcdprintPGM(" \002Nozzle:");
749
+          lcd.setCursor(0,line);lcdprintPGM(MSG_NOZZLE);
750
           lcd.setCursor(13,line);lcd.print(ftostr3(intround(degTargetHotend0())));
750
           lcd.setCursor(13,line);lcd.print(ftostr3(intround(degTargetHotend0())));
751
         }
751
         }
752
         
752
         
781
       {
781
       {
782
         if(force_lcd_update)
782
         if(force_lcd_update)
783
         {
783
         {
784
-          lcd.setCursor(0,line);lcdprintPGM(" \002 Min:");
784
+          lcd.setCursor(0,line);lcdprintPGM(MSG_MIN);
785
           lcd.setCursor(13,line);lcd.print(ftostr3(autotemp_min));
785
           lcd.setCursor(13,line);lcd.print(ftostr3(autotemp_min));
786
         }
786
         }
787
         
787
         
815
       {
815
       {
816
         if(force_lcd_update)
816
         if(force_lcd_update)
817
         {
817
         {
818
-          lcd.setCursor(0,line);lcdprintPGM(" \002 Max:");
818
+          lcd.setCursor(0,line);lcdprintPGM(MSG_MAX);
819
           lcd.setCursor(13,line);lcd.print(ftostr3(autotemp_max));
819
           lcd.setCursor(13,line);lcd.print(ftostr3(autotemp_max));
820
         }
820
         }
821
         
821
         
849
       {
849
       {
850
         if(force_lcd_update)
850
         if(force_lcd_update)
851
         {
851
         {
852
-          lcd.setCursor(0,line);lcdprintPGM(" \002 Fact:");
852
+          lcd.setCursor(0,line);lcdprintPGM(MSG_FACTOR);
853
           lcd.setCursor(13,line);lcd.print(ftostr32(autotemp_factor));
853
           lcd.setCursor(13,line);lcd.print(ftostr32(autotemp_factor));
854
         }
854
         }
855
         
855
         
883
       {
883
       {
884
         if(force_lcd_update)
884
         if(force_lcd_update)
885
         {
885
         {
886
-          lcd.setCursor(0,line);lcdprintPGM(" Autotemp:");
886
+          lcd.setCursor(0,line);lcdprintPGM(MSG_AUTOTEMP);
887
           lcd.setCursor(13,line);
887
           lcd.setCursor(13,line);
888
           if(autotemp_enabled)
888
           if(autotemp_enabled)
889
-            lcdprintPGM("On");
889
+            lcdprintPGM(MSG_ON);
890
           else
890
           else
891
-            lcdprintPGM("Off");
891
+            lcdprintPGM(MSG_OFF);
892
         }
892
         }
893
         
893
         
894
         if((activeline!=line) )
894
         if((activeline!=line) )
899
           autotemp_enabled=!autotemp_enabled;
899
           autotemp_enabled=!autotemp_enabled;
900
           lcd.setCursor(13,line);
900
           lcd.setCursor(13,line);
901
           if(autotemp_enabled)
901
           if(autotemp_enabled)
902
-            lcdprintPGM("On ");
902
+            lcdprintPGM(MSG_ON);
903
           else
903
           else
904
-            lcdprintPGM("Off");
904
+            lcdprintPGM(MSG_OFF);
905
           BLOCK;
905
           BLOCK;
906
         }
906
         }
907
         
907
         
912
       {
912
       {
913
         if(force_lcd_update)
913
         if(force_lcd_update)
914
         {
914
         {
915
-          lcd.setCursor(0,line);lcdprintPGM(" \002Bed:");
915
+          lcd.setCursor(0,line);lcdprintPGM(MSG_BED);
916
           lcd.setCursor(13,line);lcd.print(ftostr3(intround(degTargetBed())));
916
           lcd.setCursor(13,line);lcd.print(ftostr3(intround(degTargetBed())));
917
         }
917
         }
918
         
918
         
946
       {
946
       {
947
         if(force_lcd_update)
947
         if(force_lcd_update)
948
         {
948
         {
949
-          lcd.setCursor(0,line);lcdprintPGM(" Fan speed:");
949
+          lcd.setCursor(0,line);lcdprintPGM(MSG_FAN_SPEED);
950
           lcd.setCursor(13,line);lcd.print(ftostr3(fanpwm));
950
           lcd.setCursor(13,line);lcd.print(ftostr3(fanpwm));
951
         }
951
         }
952
         
952
         
1016
       {
1016
       {
1017
       if(force_lcd_update)
1017
       if(force_lcd_update)
1018
         {
1018
         {
1019
-          lcd.setCursor(0,line);lcdprintPGM(" PID-I: ");
1019
+          lcd.setCursor(0,line);lcdprintPGM(MSG_PID_I);
1020
           lcd.setCursor(13,line);lcd.print(ftostr51(Ki/PID_dT));
1020
           lcd.setCursor(13,line);lcd.print(ftostr51(Ki/PID_dT));
1021
         }
1021
         }
1022
         
1022
         
1051
       {
1051
       {
1052
       if(force_lcd_update)
1052
       if(force_lcd_update)
1053
         {
1053
         {
1054
-          lcd.setCursor(0,line);lcdprintPGM(" PID-D: ");
1054
+          lcd.setCursor(0,line);lcdprintPGM(MSG_PID_D);
1055
           lcd.setCursor(13,line);lcd.print(itostr4(Kd*PID_dT));
1055
           lcd.setCursor(13,line);lcd.print(itostr4(Kd*PID_dT));
1056
         }
1056
         }
1057
         
1057
         
1088
       {
1088
       {
1089
       if(force_lcd_update)
1089
       if(force_lcd_update)
1090
         {
1090
         {
1091
-          lcd.setCursor(0,line);lcdprintPGM(" PID-C: ");
1091
+          lcd.setCursor(0,line);lcdprintPGM(MSG_PID_C);
1092
           lcd.setCursor(13,line);lcd.print(itostr3(Kc));
1092
           lcd.setCursor(13,line);lcd.print(itostr3(Kc));
1093
         }
1093
         }
1094
         
1094
         
1154
   switch(i)
1154
   switch(i)
1155
   {
1155
   {
1156
     case ItemCM_exit:
1156
     case ItemCM_exit:
1157
-      MENUITEM(  lcdprintPGM(" Control \003")  ,  BLOCK;status=Main_Control;beepshort(); ) ;
1157
+      MENUITEM(  lcdprintPGM(MSG_CONTROL)  ,  BLOCK;status=Main_Control;beepshort(); ) ;
1158
       break;
1158
       break;
1159
     case ItemCM_acc:
1159
     case ItemCM_acc:
1160
     {
1160
     {
1161
       if(force_lcd_update)
1161
       if(force_lcd_update)
1162
         {
1162
         {
1163
-          lcd.setCursor(0,line);lcdprintPGM(" Acc:");
1163
+          lcd.setCursor(0,line);lcdprintPGM(MSG_ACC);
1164
           lcd.setCursor(13,line);lcd.print(itostr3(acceleration/100));lcdprintPGM("00");
1164
           lcd.setCursor(13,line);lcd.print(itostr3(acceleration/100));lcdprintPGM("00");
1165
         }
1165
         }
1166
         
1166
         
1194
       {
1194
       {
1195
       if(force_lcd_update)
1195
       if(force_lcd_update)
1196
         {
1196
         {
1197
-          lcd.setCursor(0,line);lcdprintPGM(" Vxy-jerk: ");
1197
+          lcd.setCursor(0,line);lcdprintPGM(MSG_VXY_JERK);
1198
           lcd.setCursor(13,line);lcd.print(itostr3(max_xy_jerk));
1198
           lcd.setCursor(13,line);lcd.print(itostr3(max_xy_jerk));
1199
         }
1199
         }
1200
         
1200
         
1233
       {
1233
       {
1234
       if(force_lcd_update)
1234
       if(force_lcd_update)
1235
         {
1235
         {
1236
-          lcd.setCursor(0,line);lcdprintPGM(" Vmax ");
1237
-          if(i==ItemCM_vmaxx)lcdprintPGM("x:");
1238
-          if(i==ItemCM_vmaxy)lcdprintPGM("y:");
1239
-          if(i==ItemCM_vmaxz)lcdprintPGM("z:");
1240
-          if(i==ItemCM_vmaxe)lcdprintPGM("e:");
1236
+          lcd.setCursor(0,line);lcdprintPGM(MSG_VMAX);
1237
+          if(i==ItemCM_vmaxx)lcdprintPGM(MSG_X);
1238
+          if(i==ItemCM_vmaxy)lcdprintPGM(MSG_Y);
1239
+          if(i==ItemCM_vmaxz)lcdprintPGM(MSG_Z);
1240
+          if(i==ItemCM_vmaxe)lcdprintPGM(MSG_E);
1241
           lcd.setCursor(13,line);lcd.print(itostr3(max_feedrate[i-ItemCM_vmaxx]));
1241
           lcd.setCursor(13,line);lcd.print(itostr3(max_feedrate[i-ItemCM_vmaxx]));
1242
         }
1242
         }
1243
         
1243
         
1273
     {
1273
     {
1274
       if(force_lcd_update)
1274
       if(force_lcd_update)
1275
         {
1275
         {
1276
-          lcd.setCursor(0,line);lcdprintPGM(" Vmin:");
1276
+          lcd.setCursor(0,line);lcdprintPGM(MSG_VMIN);
1277
           lcd.setCursor(13,line);lcd.print(itostr3(minimumfeedrate));
1277
           lcd.setCursor(13,line);lcd.print(itostr3(minimumfeedrate));
1278
         }
1278
         }
1279
         
1279
         
1308
     {
1308
     {
1309
       if(force_lcd_update)
1309
       if(force_lcd_update)
1310
         {
1310
         {
1311
-          lcd.setCursor(0,line);lcdprintPGM(" VTrav min:");
1311
+          lcd.setCursor(0,line);lcdprintPGM(MSG_VTRAV_MIN);
1312
           lcd.setCursor(13,line);lcd.print(itostr3(mintravelfeedrate));
1312
           lcd.setCursor(13,line);lcd.print(itostr3(mintravelfeedrate));
1313
         }
1313
         }
1314
         
1314
         
1348
       if(force_lcd_update)
1348
       if(force_lcd_update)
1349
         {
1349
         {
1350
           lcd.setCursor(0,line);lcdprintPGM(" Amax ");
1350
           lcd.setCursor(0,line);lcdprintPGM(" Amax ");
1351
-          if(i==ItemCM_amaxx)lcdprintPGM("x:");
1352
-          if(i==ItemCM_amaxy)lcdprintPGM("y:");
1353
-          if(i==ItemCM_amaxz)lcdprintPGM("z:");
1354
-          if(i==ItemCM_amaxe)lcdprintPGM("e:");
1351
+          if(i==ItemCM_amaxx)lcdprintPGM(MSG_X);
1352
+          if(i==ItemCM_amaxy)lcdprintPGM(MSG_Y);
1353
+          if(i==ItemCM_amaxz)lcdprintPGM(MSG_Z);
1354
+          if(i==ItemCM_amaxe)lcdprintPGM(MSG_E);
1355
           lcd.setCursor(13,line);lcd.print(itostr3(max_acceleration_units_per_sq_second[i-ItemCM_amaxx]/100));lcdprintPGM("00");
1355
           lcd.setCursor(13,line);lcd.print(itostr3(max_acceleration_units_per_sq_second[i-ItemCM_amaxx]/100));lcdprintPGM("00");
1356
         }
1356
         }
1357
         
1357
         
1385
     {
1385
     {
1386
         if(force_lcd_update)
1386
         if(force_lcd_update)
1387
         {
1387
         {
1388
-          lcd.setCursor(0,line);lcdprintPGM(" A-retract:");
1388
+          lcd.setCursor(0,line);lcdprintPGM(MSG_A_RETRACT);
1389
           lcd.setCursor(13,line);lcd.print(ftostr3(retract_acceleration/100));lcdprintPGM("00");
1389
           lcd.setCursor(13,line);lcd.print(ftostr3(retract_acceleration/100));lcdprintPGM("00");
1390
         }
1390
         }
1391
         
1391
         
1420
          {
1420
          {
1421
       if(force_lcd_update)
1421
       if(force_lcd_update)
1422
         {
1422
         {
1423
-          lcd.setCursor(0,line);lcdprintPGM(" Esteps/mm:");
1423
+          lcd.setCursor(0,line);lcdprintPGM(MSG_ESTEPS);
1424
           lcd.setCursor(13,line);lcd.print(itostr4(axis_steps_per_unit[3]));
1424
           lcd.setCursor(13,line);lcd.print(itostr4(axis_steps_per_unit[3]));
1425
         }
1425
         }
1426
         
1426
         
1477
   switch(i)
1477
   switch(i)
1478
   {
1478
   {
1479
     case ItemC_exit:
1479
     case ItemC_exit:
1480
-      MENUITEM(  lcdprintPGM(" Main        \003")  ,  BLOCK;status=Main_Menu;beepshort(); ) ;
1480
+      MENUITEM(  lcdprintPGM(MSG_MAIN_WIDE)  ,  BLOCK;status=Main_Menu;beepshort(); ) ;
1481
       break;
1481
       break;
1482
     case ItemC_temp:
1482
     case ItemC_temp:
1483
-      MENUITEM(  lcdprintPGM(" Temperature \x7E")  ,  BLOCK;status=Sub_TempControl;beepshort(); ) ;
1483
+      MENUITEM(  lcdprintPGM(MSG_TEMPERATURE_WIDE)  ,  BLOCK;status=Sub_TempControl;beepshort(); ) ;
1484
       break;
1484
       break;
1485
    case ItemC_move:
1485
    case ItemC_move:
1486
-      MENUITEM(  lcdprintPGM(" Motion      \x7E")  ,  BLOCK;status=Sub_MotionControl;beepshort(); ) ;
1486
+      MENUITEM(  lcdprintPGM(MSG_MOTION_WIDE)  ,  BLOCK;status=Sub_MotionControl;beepshort(); ) ;
1487
       break;
1487
       break;
1488
     case ItemC_store:
1488
     case ItemC_store:
1489
     {
1489
     {
1490
       if(force_lcd_update)
1490
       if(force_lcd_update)
1491
       {
1491
       {
1492
-        lcd.setCursor(0,line);lcdprintPGM(" Store EPROM");
1492
+        lcd.setCursor(0,line);lcdprintPGM(MSG_STORE_EPROM);
1493
       }
1493
       }
1494
       if((activeline==line) && CLICKED)
1494
       if((activeline==line) && CLICKED)
1495
       {
1495
       {
1503
     {
1503
     {
1504
       if(force_lcd_update)
1504
       if(force_lcd_update)
1505
       {
1505
       {
1506
-        lcd.setCursor(0,line);lcdprintPGM(" Load EPROM");
1506
+        lcd.setCursor(0,line);lcdprintPGM(MSG_LOAD_EPROM);
1507
       }
1507
       }
1508
       if((activeline==line) && CLICKED)
1508
       if((activeline==line) && CLICKED)
1509
       {
1509
       {
1517
     {
1517
     {
1518
       if(force_lcd_update)
1518
       if(force_lcd_update)
1519
       {
1519
       {
1520
-        lcd.setCursor(0,line);lcdprintPGM(" Restore Failsafe");
1520
+        lcd.setCursor(0,line);lcdprintPGM(MSG_RESTORE_FAILSAFE);
1521
       }
1521
       }
1522
       if((activeline==line) && CLICKED)
1522
       if((activeline==line) && CLICKED)
1523
       {
1523
       {
1564
   switch(i)
1564
   switch(i)
1565
   {
1565
   {
1566
     case 0:
1566
     case 0:
1567
-      MENUITEM(  lcdprintPGM(" Main \003")  ,  BLOCK;status=Main_Menu;beepshort(); ) ;
1567
+      MENUITEM(  lcdprintPGM(MSG_MAIN)  ,  BLOCK;status=Main_Menu;beepshort(); ) ;
1568
       break;
1568
       break;
1569
 //     case 1:
1569
 //     case 1:
1570
 //       {
1570
 //       {
1595
 //         }
1595
 //         }
1596
 //       }break;
1596
 //       }break;
1597
     case 1:
1597
     case 1:
1598
-      MENUITEM(  lcd.print(" ");card.getWorkDirName();if(card.filename[0]=='/') lcdprintPGM("\004Refresh");else {lcd.print("\005");lcd.print(card.filename);lcd.print("/..");}  ,  BLOCK;card.updir();enforceupdate=true;lineoffset=0;beepshort(); ) ;
1598
+      MENUITEM(  lcd.print(" ");card.getWorkDirName();if(card.filename[0]=='/') lcdprintPGM(MSG_REFRESH);else {lcd.print("\005");lcd.print(card.filename);lcd.print("/..");}  ,  BLOCK;card.updir();enforceupdate=true;lineoffset=0;beepshort(); ) ;
1599
       
1599
       
1600
       break;
1600
       break;
1601
     default:
1601
     default:
1682
     switch(line)
1682
     switch(line)
1683
     { 
1683
     { 
1684
       case ItemM_watch:
1684
       case ItemM_watch:
1685
-        MENUITEM(  lcdprintPGM(" Watch   \003")  ,  BLOCK;status=Main_Status;beepshort(); ) ;
1685
+        MENUITEM(  lcdprintPGM(MSG_WATCH)  ,  BLOCK;status=Main_Status;beepshort(); ) ;
1686
        break;
1686
        break;
1687
       case ItemM_prepare:
1687
       case ItemM_prepare:
1688
-        MENUITEM(  if(!tune) lcdprintPGM(" Prepare \x7E");else  lcdprintPGM(" Tune    \x7E"); ,  BLOCK;status=Main_Prepare;beepshort(); ) ;
1688
+        MENUITEM(  if(!tune) lcdprintPGM(MSG_PREPARE);else  lcdprintPGM(MSG_TUNE); ,  BLOCK;status=Main_Prepare;beepshort(); ) ;
1689
       break;
1689
       break;
1690
        
1690
        
1691
       case ItemM_control:
1691
       case ItemM_control:
1692
-        MENUITEM(  lcdprintPGM(" Control \x7E")  ,  BLOCK;status=Main_Control;beepshort(); ) ;
1692
+        MENUITEM(  lcdprintPGM(MSG_CONTROL_ARROW)  ,  BLOCK;status=Main_Control;beepshort(); ) ;
1693
       break;
1693
       break;
1694
       #ifdef SDSUPPORT
1694
       #ifdef SDSUPPORT
1695
       case ItemM_file:    
1695
       case ItemM_file:    
1704
           #endif
1704
           #endif
1705
           {
1705
           {
1706
             if(card.sdprinting)
1706
             if(card.sdprinting)
1707
-              lcdprintPGM(" Stop Print   \x7E");
1707
+              lcdprintPGM(MSG_STOP_PRINT);
1708
             else
1708
             else
1709
-              lcdprintPGM(" Card Menu    \x7E");
1709
+              lcdprintPGM(MSG_CARD_MENU);
1710
           }
1710
           }
1711
           else
1711
           else
1712
           {
1712
           {
1713
-           lcdprintPGM(" No Card"); 
1713
+           lcdprintPGM(MSG_NO_CARD); 
1714
           }
1714
           }
1715
         }
1715
         }
1716
         #ifdef CARDINSERTED
1716
         #ifdef CARDINSERTED
1730
       #endif
1730
       #endif
1731
       default: 
1731
       default: 
1732
         SERIAL_ERROR_START;
1732
         SERIAL_ERROR_START;
1733
-        SERIAL_ERRORLNPGM("Something is wrong in the MenuStructure.");
1733
+        SERIAL_ERRORLNPGM(MSG_SERIAL_ERROR_MENU_STRUCTURE);
1734
       break;
1734
       break;
1735
     }
1735
     }
1736
   }
1736
   }
1751
       if(CARDINSERTED)
1751
       if(CARDINSERTED)
1752
       {
1752
       {
1753
         card.initsd();
1753
         card.initsd();
1754
-        LCD_MESSAGEPGM("Card inserted");
1754
+        LCD_MESSAGEPGM(MSG_SD_INSERTED);
1755
       }
1755
       }
1756
       else
1756
       else
1757
       {
1757
       {
1758
         card.release();
1758
         card.release();
1759
-        LCD_MESSAGEPGM("Card removed");
1759
+        LCD_MESSAGEPGM(MSG_SD_REMOVED);
1760
       }
1760
       }
1761
     }
1761
     }
1762
   #endif
1762
   #endif

Loading…
Peruuta
Tallenna