浏览代码

Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h

Also cosmetic comment changes and spelling corrections in printed
messages
Scott Lahteine 12 年前
父节点
当前提交
a200521eab

+ 1
- 1
ArduinoAddons/Arduino_0.xx/Gen6/bootloaders/atmega644p/ATmegaBOOT.c 查看文件

168
     WDTCSR = 0;
168
     WDTCSR = 0;
169
 
169
 
170
     // Check if the WDT was used to reset, in which case we dont bootload and skip straight to the code. woot.
170
     // Check if the WDT was used to reset, in which case we dont bootload and skip straight to the code. woot.
171
-    if (! (ch &  _BV(EXTRF))) // if its a not an external reset...
171
+    if (! (ch &  _BV(EXTRF))) // if it's a not an external reset...
172
       app_start();  // skip bootloader
172
       app_start();  // skip bootloader
173
 #endif
173
 #endif
174
 
174
 

+ 1
- 1
ArduinoAddons/Arduino_0.xx/Sanguino/bootloaders/atmega644p/ATmegaBOOT.c 查看文件

168
     WDTCSR = 0;
168
     WDTCSR = 0;
169
 
169
 
170
     // Check if the WDT was used to reset, in which case we dont bootload and skip straight to the code. woot.
170
     // Check if the WDT was used to reset, in which case we dont bootload and skip straight to the code. woot.
171
-    if (! (ch &  _BV(EXTRF))) // if its a not an external reset...
171
+    if (! (ch &  _BV(EXTRF))) // if it's a not an external reset...
172
       app_start();  // skip bootloader
172
       app_start();  // skip bootloader
173
 #endif
173
 #endif
174
 
174
 

+ 1
- 1
ArduinoAddons/Arduino_0.xx/libraries/LiquidCrystal/LiquidCrystal.cpp 查看文件

21
 //    S = 0; No shift 
21
 //    S = 0; No shift 
22
 //
22
 //
23
 // Note, however, that resetting the Arduino doesn't reset the LCD, so we
23
 // Note, however, that resetting the Arduino doesn't reset the LCD, so we
24
-// can't assume that its in that state when a sketch starts (and the
24
+// can't assume that it's in that state when a sketch starts (and the
25
 // LiquidCrystal constructor is called).
25
 // LiquidCrystal constructor is called).
26
 
26
 
27
 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
27
 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,

+ 1
- 1
ArduinoAddons/Arduino_0.xx/libraries/U8glib/utility/chessengine.c 查看文件

72
 	- Castling: Need to check for fields under attack
72
 	- Castling: Need to check for fields under attack
73
 	    --> done
73
 	    --> done
74
 	
74
 	
75
-	- Check for WIN / LOOSE situation, perhaps call ce_Eval() once on the top-level board setup
75
+	- Check for WIN / LOSE situation, perhaps call ce_Eval() once on the top-level board setup
76
 	    just after the real move
76
 	    just after the real move
77
 	- cleanup cu_Move
77
 	- cleanup cu_Move
78
 	    --> almost done
78
 	    --> almost done

+ 1
- 1
ArduinoAddons/Arduino_1.x.x/libraries/LiquidCrystal/LiquidCrystal.cpp 查看文件

21
 //    S = 0; No shift 
21
 //    S = 0; No shift 
22
 //
22
 //
23
 // Note, however, that resetting the Arduino doesn't reset the LCD, so we
23
 // Note, however, that resetting the Arduino doesn't reset the LCD, so we
24
-// can't assume that its in that state when a sketch starts (and the
24
+// can't assume that it's in that state when a sketch starts (and the
25
 // LiquidCrystal constructor is called).
25
 // LiquidCrystal constructor is called).
26
 
26
 
27
 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
27
 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,

+ 1
- 1
ArduinoAddons/Arduino_1.x.x/libraries/U8glib/utility/chessengine.c 查看文件

72
 	- Castling: Need to check for fields under attack
72
 	- Castling: Need to check for fields under attack
73
 	    --> done
73
 	    --> done
74
 	
74
 	
75
-	- Check for WIN / LOOSE situation, perhaps call ce_Eval() once on the top-level board setup
75
+	- Check for WIN / LOSE situation, perhaps call ce_Eval() once on the top-level board setup
76
 	    just after the real move
76
 	    just after the real move
77
 	- cleanup cu_Move
77
 	- cleanup cu_Move
78
 	    --> almost done
78
 	    --> almost done

+ 1
- 1
ArduinoAddons/Arduino_1.x.x/sanguino/bootloaders/atmega/ATmegaBOOT_168.c 查看文件

301
 	WDTCSR = 0;
301
 	WDTCSR = 0;
302
 
302
 
303
 	// Check if the WDT was used to reset, in which case we dont bootload and skip straight to the code. woot.
303
 	// Check if the WDT was used to reset, in which case we dont bootload and skip straight to the code. woot.
304
-	if (! (ch &  _BV(EXTRF))) // if its a not an external reset...
304
+	if (! (ch &  _BV(EXTRF))) // if it's a not an external reset...
305
 		app_start();  // skip bootloader
305
 		app_start();  // skip bootloader
306
 #else
306
 #else
307
 	asm volatile("nop\n\t");
307
 	asm volatile("nop\n\t");

+ 1
- 1
ArduinoAddons/Arduino_1.x.x/sanguino/bootloaders/atmega644p/ATmegaBOOT.c 查看文件

172
     WDTCSR = 0;
172
     WDTCSR = 0;
173
 
173
 
174
     // Check if the WDT was used to reset, in which case we dont bootload and skip straight to the code. woot.
174
     // Check if the WDT was used to reset, in which case we dont bootload and skip straight to the code. woot.
175
-    if (! (ch &  _BV(EXTRF))) // if its a not an external reset...
175
+    if (! (ch &  _BV(EXTRF))) // if it's a not an external reset...
176
       app_start();  // skip bootloader
176
       app_start();  // skip bootloader
177
 #endif
177
 #endif
178
 
178
 

+ 1
- 1
ArduinoAddons/Arduino_1.x.x/sanguino/bootloaders/atmega644p/ATmegaBOOT.c.tst 查看文件

172
     WDTCSR = 0;
172
     WDTCSR = 0;
173
 
173
 
174
     // Check if the WDT was used to reset, in which case we dont bootload and skip straight to the code. woot.
174
     // Check if the WDT was used to reset, in which case we dont bootload and skip straight to the code. woot.
175
-    if (! (ch &  _BV(EXTRF))) // if its a not an external reset...
175
+    if (! (ch &  _BV(EXTRF))) // if it's a not an external reset...
176
       app_start();  // skip bootloader
176
       app_start();  // skip bootloader
177
 #endif
177
 #endif
178
 
178
 

+ 22
- 19
Marlin/Configuration.h 查看文件

1
 #ifndef CONFIGURATION_H
1
 #ifndef CONFIGURATION_H
2
 #define CONFIGURATION_H
2
 #define CONFIGURATION_H
3
 
3
 
4
-// This configurtion file contains the basic settings.
5
-// Advanced settings can be found in Configuration_adv.h 
4
+// This configuration file contains the basic settings.
5
+// Advanced settings can be found in Configuration_adv.h
6
 // BASIC SETTINGS: select your board type, temperature sensor type, axis scaling, and endstop configuration
6
 // BASIC SETTINGS: select your board type, temperature sensor type, axis scaling, and endstop configuration
7
 
7
 
8
-//User specified version info of this build to display in [Pronterface, etc] terminal window during startup.
9
-//Implementation of an idea by Prof Braino to inform user that any changes made
10
-//to this build by the user have been successfully uploaded into firmware.
8
+// User-specified version info of this build to display in [Pronterface, etc] terminal window during
9
+// startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
10
+// build by the user have been successfully uploaded into firmware.
11
 #define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time
11
 #define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time
12
-#define STRING_CONFIG_H_AUTHOR "(none, default config)" //Who made the changes.
12
+#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
13
 
13
 
14
 // SERIAL_PORT selects which serial port should be used for communication with the host.
14
 // SERIAL_PORT selects which serial port should be used for communication with the host.
15
 // This allows the connection of wireless adapters (for instance) to non-default port pins.
15
 // This allows the connection of wireless adapters (for instance) to non-default port pins.
51
 #define MOTHERBOARD 7
51
 #define MOTHERBOARD 7
52
 #endif
52
 #endif
53
 
53
 
54
+// Define this to set a custom name for your generic Mendel,
55
+// #define CUSTOM_MENDEL_NAME "This Mendel"
56
+
54
 //// The following define selects which power supply you have. Please choose the one that matches your setup
57
 //// The following define selects which power supply you have. Please choose the one that matches your setup
55
 // 1 = ATX
58
 // 1 = ATX
56
 // 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
59
 // 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
92
 // Actual temperature must be close to target for this long before M109 returns success
95
 // Actual temperature must be close to target for this long before M109 returns success
93
 #define TEMP_RESIDENCY_TIME 10	// (seconds)
96
 #define TEMP_RESIDENCY_TIME 10	// (seconds)
94
 #define TEMP_HYSTERESIS 3       // (degC) range of +/- temperatures considered "close" to the target one
97
 #define TEMP_HYSTERESIS 3       // (degC) range of +/- temperatures considered "close" to the target one
95
-#define TEMP_WINDOW     1       // (degC) Window around target to start the recidency timer x degC early.
98
+#define TEMP_WINDOW     1       // (degC) Window around target to start the residency timer x degC early.
96
 
99
 
97
 // The minimal temperature defines the temperature below which the heater will not be enabled It is used
100
 // The minimal temperature defines the temperature below which the heater will not be enabled It is used
98
 // to check that the wiring to the thermistor is not broken. 
101
 // to check that the wiring to the thermistor is not broken. 
126
   #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
129
   #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
127
                                   // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
130
                                   // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
128
   #define PID_INTEGRAL_DRIVE_MAX 255  //limit for the integral term
131
   #define PID_INTEGRAL_DRIVE_MAX 255  //limit for the integral term
129
-  #define K1 0.95 //smoothing factor withing the PID
132
+  #define K1 0.95 //smoothing factor within the PID
130
   #define PID_dT ((16.0 * 8.0)/(F_CPU / 64.0 / 256.0)) //sampling period of the temperature routine
133
   #define PID_dT ((16.0 * 8.0)/(F_CPU / 64.0 / 256.0)) //sampling period of the temperature routine
131
 
134
 
132
 // If you are using a preconfigured hotend then you can use one of the value sets by uncommenting it
135
 // If you are using a preconfigured hotend then you can use one of the value sets by uncommenting it
147
 #endif // PIDTEMP
150
 #endif // PIDTEMP
148
 
151
 
149
 // Bed Temperature Control
152
 // Bed Temperature Control
150
-// Select PID or bang-bang with PIDTEMPBED.  If bang-bang, BED_LIMIT_SWITCHING will enable hysteresis
153
+// Select PID or bang-bang with PIDTEMPBED. If bang-bang, BED_LIMIT_SWITCHING will enable hysteresis
151
 //
154
 //
152
-// uncomment this to enable PID on the bed.   It uses the same ferquency PWM as the extruder. 
155
+// Uncomment this to enable PID on the bed. It uses the same frequency PWM as the extruder.
153
 // If your PID_dT above is the default, and correct for your hardware/configuration, that means 7.689Hz,
156
 // If your PID_dT above is the default, and correct for your hardware/configuration, that means 7.689Hz,
154
 // which is fine for driving a square wave into a resistive load and does not significantly impact you FET heating.
157
 // which is fine for driving a square wave into a resistive load and does not significantly impact you FET heating.
155
 // This also works fine on a Fotek SSR-10DA Solid State Relay into a 250W heater. 
158
 // This also works fine on a Fotek SSR-10DA Solid State Relay into a 250W heater. 
156
-// If your configuration is significantly different than this and you don't understand the issues involved, you proabaly 
159
+// If your configuration is significantly different than this and you don't understand the issues involved, you probably 
157
 // shouldn't use bed PID until someone else verifies your hardware works.
160
 // shouldn't use bed PID until someone else verifies your hardware works.
158
 // If this is enabled, find your own PID constants below.
161
 // If this is enabled, find your own PID constants below.
159
 //#define PIDTEMPBED
162
 //#define PIDTEMPBED
160
 //
163
 //
161
 //#define BED_LIMIT_SWITCHING
164
 //#define BED_LIMIT_SWITCHING
162
 
165
 
163
-// This sets the max power delived to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
166
+// This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option.
164
 // all forms of bed control obey this (PID, bang-bang, bang-bang with hysteresis)
167
 // all forms of bed control obey this (PID, bang-bang, bang-bang with hysteresis)
165
 // setting this to anything other than 256 enables a form of PWM to the bed just like HEATER_BED_DUTY_CYCLE_DIVIDER did,
168
 // setting this to anything other than 256 enables a form of PWM to the bed just like HEATER_BED_DUTY_CYCLE_DIVIDER did,
166
 // so you shouldn't use it unless you are OK with PWM on your bed.  (see the comment on enabling PIDTEMPBED)
169
 // so you shouldn't use it unless you are OK with PWM on your bed.  (see the comment on enabling PIDTEMPBED)
168
 
171
 
169
 #ifdef PIDTEMPBED
172
 #ifdef PIDTEMPBED
170
 //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
173
 //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
171
-//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, argressive factor of .15 (vs .1, 1, 10)
174
+//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
172
     #define  DEFAULT_bedKp 10.00
175
     #define  DEFAULT_bedKp 10.00
173
     #define  DEFAULT_bedKi .023
176
     #define  DEFAULT_bedKi .023
174
     #define  DEFAULT_bedKd 305.4
177
     #define  DEFAULT_bedKd 305.4
200
 // Uncomment the following line to enable CoreXY kinematics
203
 // Uncomment the following line to enable CoreXY kinematics
201
 // #define COREXY
204
 // #define COREXY
202
 
205
 
203
-// corse Endstop Settings
206
+// coarse Endstop Settings
204
 #define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
207
 #define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
205
 
208
 
206
 #ifndef ENDSTOPPULLUPS
209
 #ifndef ENDSTOPPULLUPS
207
-  // fine Enstop settings: Individual Pullups. will be ignord if ENDSTOPPULLUPS is defined
210
+  // fine Enstop settings: Individual Pullups. will be ignored if ENDSTOPPULLUPS is defined
208
   #define ENDSTOPPULLUP_XMAX
211
   #define ENDSTOPPULLUP_XMAX
209
   #define ENDSTOPPULLUP_YMAX
212
   #define ENDSTOPPULLUP_YMAX
210
   #define ENDSTOPPULLUP_ZMAX
213
   #define ENDSTOPPULLUP_ZMAX
253
 #define Y_HOME_DIR -1
256
 #define Y_HOME_DIR -1
254
 #define Z_HOME_DIR -1
257
 #define Z_HOME_DIR -1
255
 
258
 
256
-#define min_software_endstops true //If true, axis won't move to coordinates less than HOME_POS.
257
-#define max_software_endstops true  //If true, axis won't move to coordinates greater than the defined lengths below.
259
+#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
260
+#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
258
 // Travel limits after homing
261
 // Travel limits after homing
259
 #define X_MAX_POS 205
262
 #define X_MAX_POS 205
260
 #define X_MIN_POS 0
263
 #define X_MIN_POS 0
282
 
285
 
283
 // default settings 
286
 // default settings 
284
 
287
 
285
-#define DEFAULT_AXIS_STEPS_PER_UNIT   {78.7402,78.7402,200*8/3,760*1.1}  // default steps per unit for ultimaker 
288
+#define DEFAULT_AXIS_STEPS_PER_UNIT   {78.7402,78.7402,200*8/3,760*1.1}  // default steps per unit for Ultimaker
286
 #define DEFAULT_MAX_FEEDRATE          {500, 500, 5, 25}    // (mm/sec)    
289
 #define DEFAULT_MAX_FEEDRATE          {500, 500, 5, 25}    // (mm/sec)    
287
 #define DEFAULT_MAX_ACCELERATION      {9000,9000,100,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
290
 #define DEFAULT_MAX_ACCELERATION      {9000,9000,100,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
288
 
291
 
289
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E max acceleration in mm/s^2 for printing moves 
292
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E max acceleration in mm/s^2 for printing moves 
290
-#define DEFAULT_RETRACT_ACCELERATION  3000   // X, Y, Z and E max acceleration in mm/s^2 for r retracts
293
+#define DEFAULT_RETRACT_ACCELERATION  3000   // X, Y, Z and E max acceleration in mm/s^2 for retracts
291
 
294
 
292
 // Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
295
 // Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
293
 // The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
296
 // The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).

+ 1
- 1
Marlin/LiquidCrystalRus.cpp 查看文件

36
 //    S = 0; No shift 
36
 //    S = 0; No shift 
37
 //
37
 //
38
 // Note, however, that resetting the Arduino doesn't reset the LCD, so we
38
 // Note, however, that resetting the Arduino doesn't reset the LCD, so we
39
-// can't assume that its in that state when a sketch starts (and the
39
+// can't assume that it's in that state when a sketch starts (and the
40
 // LiquidCrystal constructor is called).
40
 // LiquidCrystal constructor is called).
41
 // 
41
 // 
42
 // modified 27 Jul 2011
42
 // modified 27 Jul 2011

+ 37
- 33
Marlin/language.h 查看文件

3
 
3
 
4
 // NOTE: IF YOU CHANGE THIS FILE / MERGE THIS FILE WITH CHANGES
4
 // NOTE: IF YOU CHANGE THIS FILE / MERGE THIS FILE WITH CHANGES
5
 //
5
 //
6
-//   ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h" 
7
-//   ==> ALSO TRY ALL AVAILABLE "LANGUAGE_CHOICE" OPTIONS
6
+//   ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h" 
7
+//   ==> ALSO TRY ALL AVAILABLE "LANGUAGE_CHOICE" OPTIONS
8
 
8
 
9
 // Languages
9
 // Languages
10
 // 1  English
10
 // 1  English
30
 	#define MACHINE_NAME "Rumba"
30
 	#define MACHINE_NAME "Rumba"
31
 	#define FIRMWARE_URL "https://github.com/ErikZalm/Marlin/"
31
 	#define FIRMWARE_URL "https://github.com/ErikZalm/Marlin/"
32
 #else
32
 #else
33
-	#define MACHINE_NAME "Mendel"
33
+	#ifdef CUSTOM_MENDEL_NAME
34
+		#define MACHINE_NAME CUSTOM_MENDEL_NAME
35
+	#else
36
+		#define MACHINE_NAME "Mendel"
37
+	#endif
34
 	#define FIRMWARE_URL "http://www.mendel-parts.com"
38
 	#define FIRMWARE_URL "http://www.mendel-parts.com"
35
 #endif
39
 #endif
36
 
40
 
75
 	#define MSG_PID_D "PID-D"
79
 	#define MSG_PID_D "PID-D"
76
 	#define MSG_PID_C "PID-C"
80
 	#define MSG_PID_C "PID-C"
77
 	#define MSG_ACC  "Accel"
81
 	#define MSG_ACC  "Accel"
78
-	#define MSG_VXY_JERK "Vxy-jerk"
79
-	#define MSG_VZ_JERK "Vz-jerk"
80
-	#define MSG_VE_JERK "Ve-jerk"
82
+	#define MSG_VXY_JERK "Vxy-jerk"
83
+	#define MSG_VZ_JERK "Vz-jerk"
84
+	#define MSG_VE_JERK "Ve-jerk"
81
 	#define MSG_VMAX "Vmax "
85
 	#define MSG_VMAX "Vmax "
82
 	#define MSG_X "x"
86
 	#define MSG_X "x"
83
 	#define MSG_Y "y"
87
 	#define MSG_Y "y"
188
 	#define MSG_SD_ERR_WRITE_TO_FILE "error writing to file"
192
 	#define MSG_SD_ERR_WRITE_TO_FILE "error writing to file"
189
 	#define MSG_SD_CANT_ENTER_SUBDIR "Cannot enter subdir: "
193
 	#define MSG_SD_CANT_ENTER_SUBDIR "Cannot enter subdir: "
190
 
194
 
191
-	#define MSG_STEPPER_TO_HIGH "Steprate to high: "
195
+	#define MSG_STEPPER_TOO_HIGH "Steprate too high: "
192
 	#define MSG_ENDSTOPS_HIT "endstops hit: "
196
 	#define MSG_ENDSTOPS_HIT "endstops hit: "
193
 	#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
197
 	#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
194
 	#define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented"
198
 	#define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented"
235
 	#define MSG_PID_C "PID-C"
239
 	#define MSG_PID_C "PID-C"
236
 	#define MSG_ACC  "Acc"
240
 	#define MSG_ACC  "Acc"
237
 	#define MSG_VXY_JERK "Zryw Vxy"
241
 	#define MSG_VXY_JERK "Zryw Vxy"
238
-	#define MSG_VZ_JERK "Zryw Vz"
239
-	#define MSG_VE_JERK "Zryw Ve"
242
+	#define MSG_VZ_JERK "Zryw Vz"
243
+	#define MSG_VE_JERK "Zryw Ve"
240
 	#define MSG_VMAX "Vmax"
244
 	#define MSG_VMAX "Vmax"
241
 	#define MSG_X "x"
245
 	#define MSG_X "x"
242
 	#define MSG_Y "y"
246
 	#define MSG_Y "y"
348
 	#define MSG_SD_ERR_WRITE_TO_FILE "blad podczas zapisu do pliku"
352
 	#define MSG_SD_ERR_WRITE_TO_FILE "blad podczas zapisu do pliku"
349
 	#define MSG_SD_CANT_ENTER_SUBDIR "Nie mozna odczytac podkatalogu: "
353
 	#define MSG_SD_CANT_ENTER_SUBDIR "Nie mozna odczytac podkatalogu: "
350
 
354
 
351
-	#define MSG_STEPPER_TO_HIGH "Za duza czestotliwosc krokow: "
355
+	#define MSG_STEPPER_TOO_HIGH "Za duza czestotliwosc krokow: "
352
 	#define MSG_ENDSTOPS_HIT "Wylacznik krancowy zostal wyzwolony na pozycji: "
356
 	#define MSG_ENDSTOPS_HIT "Wylacznik krancowy zostal wyzwolony na pozycji: "
353
 	#define MSG_ERR_COLD_EXTRUDE_STOP " uniemozliwiono zimna ekstruzje"
357
 	#define MSG_ERR_COLD_EXTRUDE_STOP " uniemozliwiono zimna ekstruzje"
354
 	#define MSG_ERR_LONG_EXTRUDE_STOP " uniemozliwiono zbyt dluga ekstruzje"
358
 	#define MSG_ERR_LONG_EXTRUDE_STOP " uniemozliwiono zbyt dluga ekstruzje"
396
 #define MSG_PID_C " PID-C: "
400
 #define MSG_PID_C " PID-C: "
397
 #define MSG_ACC " Acc:"
401
 #define MSG_ACC " Acc:"
398
 #define MSG_VXY_JERK "Vxy-jerk"
402
 #define MSG_VXY_JERK "Vxy-jerk"
399
-#define MSG_VZ_JERK "Vz-jerk"
400
-#define MSG_VE_JERK "Ve-jerk"
403
+#define MSG_VZ_JERK "Vz-jerk"
404
+#define MSG_VE_JERK "Ve-jerk"
401
 #define MSG_VMAX " Vmax "
405
 #define MSG_VMAX " Vmax "
402
 #define MSG_X "x:"
406
 #define MSG_X "x:"
403
 #define MSG_Y "y:"
407
 #define MSG_Y "y:"
512
 #define MSG_SD_ERR_WRITE_TO_FILE "Erreur d'ecriture dans le fichier"
516
 #define MSG_SD_ERR_WRITE_TO_FILE "Erreur d'ecriture dans le fichier"
513
 #define MSG_SD_CANT_ENTER_SUBDIR "Impossible d'entrer dans le sous-repertoire: "
517
 #define MSG_SD_CANT_ENTER_SUBDIR "Impossible d'entrer dans le sous-repertoire: "
514
 
518
 
515
-#define MSG_STEPPER_TO_HIGH "Steprate trop eleve: "
519
+#define MSG_STEPPER_TOO_HIGH "Steprate trop eleve: "
516
 #define MSG_ENDSTOPS_HIT "Fin de course atteint: "
520
 #define MSG_ENDSTOPS_HIT "Fin de course atteint: "
517
 #define MSG_ERR_COLD_EXTRUDE_STOP " Extrusion a froid evitee"
521
 #define MSG_ERR_COLD_EXTRUDE_STOP " Extrusion a froid evitee"
518
 #define MSG_ERR_LONG_EXTRUDE_STOP " Extrusion longue evitee"
522
 #define MSG_ERR_LONG_EXTRUDE_STOP " Extrusion longue evitee"
561
 	#define MSG_PID_C            "PID-C"
565
 	#define MSG_PID_C            "PID-C"
562
 	#define MSG_ACC              "Acc"
566
 	#define MSG_ACC              "Acc"
563
 	#define MSG_VXY_JERK         "Vxy-jerk"
567
 	#define MSG_VXY_JERK         "Vxy-jerk"
564
-	#define MSG_VZ_JERK          "Vz-jerk"
565
-	#define MSG_VE_JERK          "Ve-jerk"
568
+	#define MSG_VZ_JERK          "Vz-jerk"
569
+	#define MSG_VE_JERK          "Ve-jerk"
566
 	#define MSG_VMAX             "Vmax "
570
 	#define MSG_VMAX             "Vmax "
567
 	#define MSG_X                "x"
571
 	#define MSG_X                "x"
568
 	#define MSG_Y                "y"
572
 	#define MSG_Y                "y"
674
 	#define MSG_SD_ERR_WRITE_TO_FILE "error writing to file"
678
 	#define MSG_SD_ERR_WRITE_TO_FILE "error writing to file"
675
 	#define MSG_SD_CANT_ENTER_SUBDIR "Cannot enter subdir:"
679
 	#define MSG_SD_CANT_ENTER_SUBDIR "Cannot enter subdir:"
676
 
680
 
677
-	#define MSG_STEPPER_TO_HIGH "Steprate to high : "
681
+	#define MSG_STEPPER_TOO_HIGH "Steprate too high : "
678
 	#define MSG_ENDSTOPS_HIT "endstops hit: "
682
 	#define MSG_ENDSTOPS_HIT "endstops hit: "
679
 	#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
683
 	#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
680
 	#define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented"
684
 	#define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented"
721
 #define MSG_PID_C " PID-C: "
725
 #define MSG_PID_C " PID-C: "
722
 #define MSG_ACC  " Acc:"
726
 #define MSG_ACC  " Acc:"
723
 #define MSG_VXY_JERK " Vxy-jerk: "
727
 #define MSG_VXY_JERK " Vxy-jerk: "
724
-#define MSG_VZ_JERK "Vz-jerk"
725
-#define MSG_VE_JERK "Ve-jerk"
728
+#define MSG_VZ_JERK "Vz-jerk"
729
+#define MSG_VE_JERK "Ve-jerk"
726
 #define MSG_VMAX " Vmax "
730
 #define MSG_VMAX " Vmax "
727
 #define MSG_X "x:"
731
 #define MSG_X "x:"
728
 #define MSG_Y "y:"
732
 #define MSG_Y "y:"
835
 #define MSG_SD_ERR_WRITE_TO_FILE "Error al escribir en el archivo"
839
 #define MSG_SD_ERR_WRITE_TO_FILE "Error al escribir en el archivo"
836
 #define MSG_SD_CANT_ENTER_SUBDIR "No se puede abrir la carpeta:"
840
 #define MSG_SD_CANT_ENTER_SUBDIR "No se puede abrir la carpeta:"
837
 
841
 
838
-#define MSG_STEPPER_TO_HIGH "Steprate demasiado alto : "
842
+#define MSG_STEPPER_TOO_HIGH "Steprate demasiado alto : "
839
 #define MSG_ENDSTOPS_HIT "Se ha tocado el fin de carril: "
843
 #define MSG_ENDSTOPS_HIT "Se ha tocado el fin de carril: "
840
 #define MSG_ERR_COLD_EXTRUDE_STOP " extrusion fria evitada"
844
 #define MSG_ERR_COLD_EXTRUDE_STOP " extrusion fria evitada"
841
 #define MSG_ERR_LONG_EXTRUDE_STOP " extrusion demasiado larga evitada"
845
 #define MSG_ERR_LONG_EXTRUDE_STOP " extrusion demasiado larga evitada"
881
 #define MSG_PID_C							" PID-C: "
885
 #define MSG_PID_C							" PID-C: "
882
 #define MSG_ACC								" Acc:"
886
 #define MSG_ACC								" Acc:"
883
 #define MSG_VXY_JERK						" Vxy-jerk: "
887
 #define MSG_VXY_JERK						" Vxy-jerk: "
884
-#define MSG_VZ_JERK                         "Vz-jerk"
885
-#define MSG_VE_JERK                         "Ve-jerk"
888
+#define MSG_VZ_JERK                         "Vz-jerk"
889
+#define MSG_VE_JERK                         "Ve-jerk"
886
 #define MSG_VMAX							" Vmax "
890
 #define MSG_VMAX							" Vmax "
887
 #define MSG_X								"x:"
891
 #define MSG_X								"x:"
888
 #define MSG_Y								"y:"
892
 #define MSG_Y								"y:"
989
 #define MSG_SD_NOT_PRINTING					"нет SD печати"
993
 #define MSG_SD_NOT_PRINTING					"нет SD печати"
990
 #define MSG_SD_ERR_WRITE_TO_FILE			"ошибка записи в файл"
994
 #define MSG_SD_ERR_WRITE_TO_FILE			"ошибка записи в файл"
991
 #define MSG_SD_CANT_ENTER_SUBDIR			"Не зайти в папку:"
995
 #define MSG_SD_CANT_ENTER_SUBDIR			"Не зайти в папку:"
992
-#define MSG_STEPPER_TO_HIGH					"Частота шагов очень высока : "
996
+#define MSG_STEPPER_TOO_HIGH				"Частота шагов очень высока : "
993
 #define MSG_ENDSTOPS_HIT					"концевик сработал: "
997
 #define MSG_ENDSTOPS_HIT					"концевик сработал: "
994
 #define MSG_ERR_COLD_EXTRUDE_STOP			" защита холодной экструзии"
998
 #define MSG_ERR_COLD_EXTRUDE_STOP			" защита холодной экструзии"
995
 #define MSG_ERR_LONG_EXTRUDE_STOP			" защита превышения длинны экструзии"
999
 #define MSG_ERR_LONG_EXTRUDE_STOP			" защита превышения длинны экструзии"
1036
 	#define MSG_PID_C                "PID-C"
1040
 	#define MSG_PID_C                "PID-C"
1037
 	#define MSG_ACC                  "Accel"
1041
 	#define MSG_ACC                  "Accel"
1038
 	#define MSG_VXY_JERK             "Vxy-jerk"
1042
 	#define MSG_VXY_JERK             "Vxy-jerk"
1039
-	#define MSG_VZ_JERK              "Vz-jerk"
1040
-	#define MSG_VE_JERK              "Ve-jerk"
1043
+	#define MSG_VZ_JERK              "Vz-jerk"
1044
+	#define MSG_VE_JERK              "Ve-jerk"
1041
 	#define MSG_VMAX                 "Vmax"
1045
 	#define MSG_VMAX                 "Vmax"
1042
 	#define MSG_X                    "x"
1046
 	#define MSG_X                    "x"
1043
 	#define MSG_Y                    "y"
1047
 	#define MSG_Y                    "y"
1149
 	#define MSG_SD_ERR_WRITE_TO_FILE "Errore nella scrittura su file"
1153
 	#define MSG_SD_ERR_WRITE_TO_FILE "Errore nella scrittura su file"
1150
 	#define MSG_SD_CANT_ENTER_SUBDIR "Impossibile entrare nella sottocartella: "
1154
 	#define MSG_SD_CANT_ENTER_SUBDIR "Impossibile entrare nella sottocartella: "
1151
 
1155
 
1152
-	#define MSG_STEPPER_TO_HIGH      "Steprate troppo alto: "
1156
+	#define MSG_STEPPER_TOO_HIGH     "Steprate troppo alto: "
1153
 	#define MSG_ENDSTOPS_HIT         "Raggiunto il fondo carrello: "
1157
 	#define MSG_ENDSTOPS_HIT         "Raggiunto il fondo carrello: "
1154
 	#define MSG_ERR_COLD_EXTRUDE_STOP " prevenuta estrusione fredda"
1158
 	#define MSG_ERR_COLD_EXTRUDE_STOP " prevenuta estrusione fredda"
1155
 	#define MSG_ERR_LONG_EXTRUDE_STOP " prevenuta estrusione troppo lunga"
1159
 	#define MSG_ERR_LONG_EXTRUDE_STOP " prevenuta estrusione troppo lunga"
1198
 	#define MSG_PID_C " PID-C: "
1202
 	#define MSG_PID_C " PID-C: "
1199
 	#define MSG_ACC  " Acc:"
1203
 	#define MSG_ACC  " Acc:"
1200
 	#define MSG_VXY_JERK " Vxy-jerk: "
1204
 	#define MSG_VXY_JERK " Vxy-jerk: "
1201
-	#define MSG_VZ_JERK "Vz-jerk"
1202
-	#define MSG_VE_JERK "Ve-jerk"
1205
+	#define MSG_VZ_JERK "Vz-jerk"
1206
+	#define MSG_VE_JERK "Ve-jerk"
1203
 	#define MSG_VMAX " Vmax "
1207
 	#define MSG_VMAX " Vmax "
1204
 	#define MSG_X "x:"
1208
 	#define MSG_X "x:"
1205
 	#define MSG_Y "y:"
1209
 	#define MSG_Y "y:"
1246
 	#define MSG_CONTROL_RETRACT_RECOVER " DesRet +mm:"
1250
 	#define MSG_CONTROL_RETRACT_RECOVER " DesRet +mm:"
1247
 	#define MSG_CONTROL_RETRACT_RECOVERF " DesRet  F:"
1251
 	#define MSG_CONTROL_RETRACT_RECOVERF " DesRet  F:"
1248
 	#define MSG_AUTORETRACT " AutoRetr.:"
1252
 	#define MSG_AUTORETRACT " AutoRetr.:"
1249
-        #define MSG_SERIAL_ERROR_MENU_STRUCTURE "Algo esta errado na estrutura do Menu."
1250
-        #define MSG_FILAMENTCHANGE "Change filament"
1253
+	#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Algo esta errado na estrutura do Menu."
1254
+	#define MSG_FILAMENTCHANGE "Change filament"
1251
 
1255
 
1252
 // Serial Console Messages
1256
 // Serial Console Messages
1253
 
1257
 
1315
 	#define MSG_SD_ERR_WRITE_TO_FILE "Erro ao escrever no arquivo"
1319
 	#define MSG_SD_ERR_WRITE_TO_FILE "Erro ao escrever no arquivo"
1316
 	#define MSG_SD_CANT_ENTER_SUBDIR "Nao pode abrir o sub diretorio:"
1320
 	#define MSG_SD_CANT_ENTER_SUBDIR "Nao pode abrir o sub diretorio:"
1317
 
1321
 
1318
-	#define MSG_STEPPER_TO_HIGH "Steprate muito alto : "
1322
+	#define MSG_STEPPER_TOO_HIGH "Steprate muito alto : "
1319
 	#define MSG_ENDSTOPS_HIT "O ponto final foi tocado: "
1323
 	#define MSG_ENDSTOPS_HIT "O ponto final foi tocado: "
1320
 	#define MSG_ERR_COLD_EXTRUDE_STOP " Extrusao a frio evitada"
1324
 	#define MSG_ERR_COLD_EXTRUDE_STOP " Extrusao a frio evitada"
1321
 	#define MSG_ERR_LONG_EXTRUDE_STOP " Extrusao muito larga evitada"
1325
 	#define MSG_ERR_LONG_EXTRUDE_STOP " Extrusao muito larga evitada"
1366
 	#define MSG_PID_C "PID-C"
1370
 	#define MSG_PID_C "PID-C"
1367
 	#define MSG_ACC  "Kiihtyv"
1371
 	#define MSG_ACC  "Kiihtyv"
1368
 	#define MSG_VXY_JERK "Vxy-jerk"
1372
 	#define MSG_VXY_JERK "Vxy-jerk"
1369
-	#define MSG_VZ_JERK "Vz-jerk"
1370
-	#define MSG_VE_JERK "Ve-jerk"
1373
+	#define MSG_VZ_JERK "Vz-jerk"
1374
+	#define MSG_VE_JERK "Ve-jerk"
1371
 	#define MSG_VMAX "Vmax "
1375
 	#define MSG_VMAX "Vmax "
1372
 	#define MSG_X "x"
1376
 	#define MSG_X "x"
1373
 	#define MSG_Y "y"
1377
 	#define MSG_Y "y"
1476
 	#define MSG_SD_ERR_WRITE_TO_FILE "virhe kirjoitettaessa tiedostoon"
1480
 	#define MSG_SD_ERR_WRITE_TO_FILE "virhe kirjoitettaessa tiedostoon"
1477
 	#define MSG_SD_CANT_ENTER_SUBDIR "Alihakemistoon ei voitu siirtya: "
1481
 	#define MSG_SD_CANT_ENTER_SUBDIR "Alihakemistoon ei voitu siirtya: "
1478
 
1482
 
1479
-	#define MSG_STEPPER_TO_HIGH "Askellustaajuus liian suuri: "
1483
+	#define MSG_STEPPER_TOO_HIGH "Askellustaajuus liian suuri: "
1480
 	#define MSG_ENDSTOPS_HIT "paatyrajat aktivoitu: "
1484
 	#define MSG_ENDSTOPS_HIT "paatyrajat aktivoitu: "
1481
 	#define MSG_ERR_COLD_EXTRUDE_STOP " kylmana pursotus estetty"
1485
 	#define MSG_ERR_COLD_EXTRUDE_STOP " kylmana pursotus estetty"
1482
 	#define MSG_ERR_LONG_EXTRUDE_STOP " liian pitka pursotus estetty"
1486
 	#define MSG_ERR_LONG_EXTRUDE_STOP " liian pitka pursotus estetty"

+ 1
- 1
Marlin/pins.h 查看文件

429
 
429
 
430
   #else //old style panel with shift register
430
   #else //old style panel with shift register
431
     //arduino pin witch triggers an piezzo beeper
431
     //arduino pin witch triggers an piezzo beeper
432
-    #define BEEPER 33		No Beeper added
432
+    #define BEEPER 33		// No Beeper added
433
 
433
 
434
     //buttons are attached to a shift register
434
     //buttons are attached to a shift register
435
 	// Not wired this yet
435
 	// Not wired this yet

+ 11
- 11
Marlin/stepper.cpp 查看文件

69
 static volatile bool endstop_x_hit=false;
69
 static volatile bool endstop_x_hit=false;
70
 static volatile bool endstop_y_hit=false;
70
 static volatile bool endstop_y_hit=false;
71
 static volatile bool endstop_z_hit=false;
71
 static volatile bool endstop_z_hit=false;
72
-#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
73
-bool abort_on_endstop_hit = false;
74
-#endif
72
+#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
73
+bool abort_on_endstop_hit = false;
74
+#endif
75
 
75
 
76
 static bool old_x_min_endstop=false;
76
 static bool old_x_min_endstop=false;
77
 static bool old_x_max_endstop=false;
77
 static bool old_x_max_endstop=false;
184
      SERIAL_ECHOPAIR(" Z:",(float)endstops_trigsteps[Z_AXIS]/axis_steps_per_unit[Z_AXIS]);
184
      SERIAL_ECHOPAIR(" Z:",(float)endstops_trigsteps[Z_AXIS]/axis_steps_per_unit[Z_AXIS]);
185
      LCD_MESSAGEPGM(MSG_ENDSTOPS_HIT "Z");
185
      LCD_MESSAGEPGM(MSG_ENDSTOPS_HIT "Z");
186
    }
186
    }
187
-   SERIAL_ECHOLN("");
187
+   SERIAL_ECHOLN("");
188
    endstop_x_hit=false;
188
    endstop_x_hit=false;
189
    endstop_y_hit=false;
189
    endstop_y_hit=false;
190
-   endstop_z_hit=false;
191
-#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
192
-   if (abort_on_endstop_hit)
193
-   {
190
+   endstop_z_hit=false;
191
+#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
192
+   if (abort_on_endstop_hit)
193
+   {
194
      card.sdprinting = false;
194
      card.sdprinting = false;
195
      card.closefile();
195
      card.closefile();
196
-     quickStop();
196
+     quickStop();
197
      setTargetHotend0(0);
197
      setTargetHotend0(0);
198
      setTargetHotend1(0);
198
      setTargetHotend1(0);
199
      setTargetHotend2(0);
199
      setTargetHotend2(0);
200
-   }
200
+   }
201
 #endif
201
 #endif
202
  }
202
  }
203
 }
203
 }
272
     timer = (unsigned short)pgm_read_word_near(table_address);
272
     timer = (unsigned short)pgm_read_word_near(table_address);
273
     timer -= (((unsigned short)pgm_read_word_near(table_address+2) * (unsigned char)(step_rate & 0x0007))>>3);
273
     timer -= (((unsigned short)pgm_read_word_near(table_address+2) * (unsigned char)(step_rate & 0x0007))>>3);
274
   }
274
   }
275
-  if(timer < 100) { timer = 100; MYSERIAL.print(MSG_STEPPER_TO_HIGH); MYSERIAL.println(step_rate); }//(20kHz this should never happen)
275
+  if(timer < 100) { timer = 100; MYSERIAL.print(MSG_STEPPER_TOO_HIGH); MYSERIAL.println(step_rate); }//(20kHz this should never happen)
276
   return timer;
276
   return timer;
277
 }
277
 }
278
 
278
 

+ 3
- 3
Marlin/temperature.cpp 查看文件

257
       } 
257
       } 
258
     }
258
     }
259
     if(input > (temp + 20)) {
259
     if(input > (temp + 20)) {
260
-      SERIAL_PROTOCOLLNPGM("PID Autotune failed! Temperature to high");
260
+      SERIAL_PROTOCOLLNPGM("PID Autotune failed! Temperature too high");
261
       return;
261
       return;
262
     }
262
     }
263
     if(millis() - temp_millis > 2000) {
263
     if(millis() - temp_millis > 2000) {
281
       return;
281
       return;
282
     }
282
     }
283
     if(cycles > ncycles) {
283
     if(cycles > ncycles) {
284
-      SERIAL_PROTOCOLLNPGM("PID Autotune finished ! Place the Kp, Ki and Kd constants in the configuration.h");
284
+      SERIAL_PROTOCOLLNPGM("PID Autotune finished! Put the Kp, Ki and Kd constants into Configuration.h");
285
       return;
285
       return;
286
     }
286
     }
287
     lcd_update();
287
     lcd_update();
904
 // Timer 0 is shared with millies
904
 // Timer 0 is shared with millies
905
 ISR(TIMER0_COMPB_vect)
905
 ISR(TIMER0_COMPB_vect)
906
 {
906
 {
907
-  //these variables are only accesible from the ISR, but static, so they don't loose their value
907
+  //these variables are only accesible from the ISR, but static, so they don't lose their value
908
   static unsigned char temp_count = 0;
908
   static unsigned char temp_count = 0;
909
   static unsigned long raw_temp_0_value = 0;
909
   static unsigned long raw_temp_0_value = 0;
910
   static unsigned long raw_temp_1_value = 0;
910
   static unsigned long raw_temp_1_value = 0;

正在加载...
取消
保存