Selaa lähdekoodia

Simple code cleanup. Rename "homeing" to homing.

Scott Lahteine 10 vuotta sitten
vanhempi
commit
f989bd5435

+ 0
- 1
Marlin/Configuration.h Näytä tiedosto

@@ -31,7 +31,6 @@
31 31
 #define SERIAL_PORT 0
32 32
 
33 33
 // This determines the communication speed of the printer
34
-// This determines the communication speed of the printer
35 34
 #define BAUDRATE 250000
36 35
 
37 36
 // This enables the serial port associated to the Bluetooth interface

+ 6
- 6
Marlin/ConfigurationStore.cpp Näytä tiedosto

@@ -65,7 +65,7 @@ void Config_StoreSettings()
65 65
   EEPROM_WRITE_VAR(i,max_xy_jerk);
66 66
   EEPROM_WRITE_VAR(i,max_z_jerk);
67 67
   EEPROM_WRITE_VAR(i,max_e_jerk);
68
-  EEPROM_WRITE_VAR(i,add_homeing);
68
+  EEPROM_WRITE_VAR(i,add_homing);
69 69
   #ifdef DELTA
70 70
   EEPROM_WRITE_VAR(i,endstop_adj);
71 71
   EEPROM_WRITE_VAR(i,delta_radius);
@@ -170,9 +170,9 @@ SERIAL_ECHOLNPGM("Scaling factors:");
170 170
     SERIAL_ECHO_START;
171 171
     SERIAL_ECHOLNPGM("Home offset (mm):");
172 172
     SERIAL_ECHO_START;
173
-    SERIAL_ECHOPAIR("  M206 X",add_homeing[0] );
174
-    SERIAL_ECHOPAIR(" Y" ,add_homeing[1] );
175
-    SERIAL_ECHOPAIR(" Z" ,add_homeing[2] );
173
+    SERIAL_ECHOPAIR("  M206 X",add_homing[0] );
174
+    SERIAL_ECHOPAIR(" Y" ,add_homing[1] );
175
+    SERIAL_ECHOPAIR(" Z" ,add_homing[2] );
176 176
     SERIAL_ECHOLN("");
177 177
 #ifdef DELTA
178 178
     SERIAL_ECHO_START;
@@ -229,7 +229,7 @@ void Config_RetrieveSettings()
229 229
         EEPROM_READ_VAR(i,max_xy_jerk);
230 230
         EEPROM_READ_VAR(i,max_z_jerk);
231 231
         EEPROM_READ_VAR(i,max_e_jerk);
232
-        EEPROM_READ_VAR(i,add_homeing);
232
+        EEPROM_READ_VAR(i,add_homing);
233 233
         #ifdef DELTA
234 234
 		EEPROM_READ_VAR(i,endstop_adj);
235 235
 		EEPROM_READ_VAR(i,delta_radius);
@@ -303,7 +303,7 @@ void Config_ResetDefault()
303 303
     max_xy_jerk=DEFAULT_XYJERK;
304 304
     max_z_jerk=DEFAULT_ZJERK;
305 305
     max_e_jerk=DEFAULT_EJERK;
306
-    add_homeing[0] = add_homeing[1] = add_homeing[2] = 0;
306
+    add_homing[0] = add_homing[1] = add_homing[2] = 0;
307 307
 #ifdef DELTA
308 308
 	endstop_adj[0] = endstop_adj[1] = endstop_adj[2] = 0;
309 309
 	delta_radius= DELTA_RADIUS;

+ 1
- 1
Marlin/Marlin.h Näytä tiedosto

@@ -211,7 +211,7 @@ extern int extrudemultiply; // Sets extrude multiply factor (in percent) for all
211 211
 extern int extruder_multiply[EXTRUDERS]; // sets extrude multiply factor (in percent) for each extruder individually
212 212
 extern float volumetric_multiplier[EXTRUDERS]; // reciprocal of cross-sectional area of filament (in square millimeters), stored this way to reduce computational burden in planner
213 213
 extern float current_position[NUM_AXIS] ;
214
-extern float add_homeing[3];
214
+extern float add_homing[3];
215 215
 #ifdef DELTA
216 216
 extern float endstop_adj[3];
217 217
 extern float delta_radius;

+ 1
- 1
Marlin/MarlinSerial.cpp Näytä tiedosto

@@ -73,7 +73,7 @@ void MarlinSerial::begin(long baud)
73 73
   bool useU2X = true;
74 74
 
75 75
 #if F_CPU == 16000000UL && SERIAL_PORT == 0
76
-  // hard coded exception for compatibility with the bootloader shipped
76
+  // hard-coded exception for compatibility with the bootloader shipped
77 77
   // with the Duemilanove and previous boards and the firmware on the 8U2
78 78
   // on the Uno and Mega 2560.
79 79
   if (baud == 57600) {

+ 28
- 28
Marlin/Marlin_main.cpp Näytä tiedosto

@@ -220,7 +220,7 @@ float volumetric_multiplier[EXTRUDERS] = {1.0
220 220
   #endif
221 221
 };
222 222
 float current_position[NUM_AXIS] = { 0.0, 0.0, 0.0, 0.0 };
223
-float add_homeing[3]={0,0,0};
223
+float add_homing[3]={0,0,0};
224 224
 #ifdef DELTA
225 225
 float endstop_adj[3]={0,0,0};
226 226
 #endif
@@ -852,7 +852,7 @@ static int dual_x_carriage_mode = DEFAULT_DUAL_X_CARRIAGE_MODE;
852 852
 
853 853
 static float x_home_pos(int extruder) {
854 854
   if (extruder == 0)
855
-    return base_home_pos(X_AXIS) + add_homeing[X_AXIS];
855
+    return base_home_pos(X_AXIS) + add_homing[X_AXIS];
856 856
   else
857 857
     // In dual carriage mode the extruder offset provides an override of the
858 858
     // second X-carriage offset when homed - otherwise X2_HOME_POS is used.
@@ -884,9 +884,9 @@ static void axis_is_at_home(int axis) {
884 884
       return;
885 885
     }
886 886
     else if (dual_x_carriage_mode == DXC_DUPLICATION_MODE && active_extruder == 0) {
887
-      current_position[X_AXIS] = base_home_pos(X_AXIS) + add_homeing[X_AXIS];
888
-      min_pos[X_AXIS] =          base_min_pos(X_AXIS) + add_homeing[X_AXIS];
889
-      max_pos[X_AXIS] =          min(base_max_pos(X_AXIS) + add_homeing[X_AXIS],
887
+      current_position[X_AXIS] = base_home_pos(X_AXIS) + add_homing[X_AXIS];
888
+      min_pos[X_AXIS] =          base_min_pos(X_AXIS) + add_homing[X_AXIS];
889
+      max_pos[X_AXIS] =          min(base_max_pos(X_AXIS) + add_homing[X_AXIS],
890 890
                                   max(extruder_offset[X_AXIS][1], X2_MAX_POS) - duplicate_extruder_x_offset);
891 891
       return;
892 892
     }
@@ -914,11 +914,11 @@ static void axis_is_at_home(int axis) {
914 914
      
915 915
      for (i=0; i<2; i++)
916 916
      {
917
-        delta[i] -= add_homeing[i];
917
+        delta[i] -= add_homing[i];
918 918
      } 
919 919
      
920
-    // SERIAL_ECHOPGM("addhome X="); SERIAL_ECHO(add_homeing[X_AXIS]);
921
-	// SERIAL_ECHOPGM(" addhome Y="); SERIAL_ECHO(add_homeing[Y_AXIS]);
920
+    // SERIAL_ECHOPGM("addhome X="); SERIAL_ECHO(add_homing[X_AXIS]);
921
+	// SERIAL_ECHOPGM(" addhome Y="); SERIAL_ECHO(add_homing[Y_AXIS]);
922 922
     // SERIAL_ECHOPGM(" addhome Theta="); SERIAL_ECHO(delta[X_AXIS]);
923 923
     // SERIAL_ECHOPGM(" addhome Psi+Theta="); SERIAL_ECHOLN(delta[Y_AXIS]);
924 924
       
@@ -936,14 +936,14 @@ static void axis_is_at_home(int axis) {
936 936
    } 
937 937
    else
938 938
    {
939
-      current_position[axis] = base_home_pos(axis) + add_homeing[axis];
940
-      min_pos[axis] =          base_min_pos(axis) + add_homeing[axis];
941
-      max_pos[axis] =          base_max_pos(axis) + add_homeing[axis];
939
+      current_position[axis] = base_home_pos(axis) + add_homing[axis];
940
+      min_pos[axis] =          base_min_pos(axis) + add_homing[axis];
941
+      max_pos[axis] =          base_max_pos(axis) + add_homing[axis];
942 942
    }
943 943
 #else
944
-  current_position[axis] = base_home_pos(axis) + add_homeing[axis];
945
-  min_pos[axis] =          base_min_pos(axis) + add_homeing[axis];
946
-  max_pos[axis] =          base_max_pos(axis) + add_homeing[axis];
944
+  current_position[axis] = base_home_pos(axis) + add_homing[axis];
945
+  min_pos[axis] =          base_min_pos(axis) + add_homing[axis];
946
+  max_pos[axis] =          base_max_pos(axis) + add_homing[axis];
947 947
 #endif
948 948
 }
949 949
 
@@ -1432,12 +1432,12 @@ void process_commands()
1432 1432
           HOMEAXIS(Z);
1433 1433
 
1434 1434
           calculate_delta(current_position);
1435
-          plan_set_position(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], current_position[E_AXIS]);		  
1436
-		  
1435
+          plan_set_position(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], current_position[E_AXIS]);
1436
+
1437 1437
 #else // NOT DELTA
1438 1438
 
1439 1439
       home_all_axis = !((code_seen(axis_codes[X_AXIS])) || (code_seen(axis_codes[Y_AXIS])) || (code_seen(axis_codes[Z_AXIS])));
1440
-	  
1440
+
1441 1441
       #if Z_HOME_DIR > 0                      // If homing away from BED do Z first
1442 1442
       if((home_all_axis) || (code_seen(axis_codes[Z_AXIS]))) {
1443 1443
         HOMEAXIS(Z);
@@ -1516,7 +1516,7 @@ void process_commands()
1516 1516
 		#ifdef SCARA
1517 1517
 		   current_position[X_AXIS]=code_value();
1518 1518
 		#else
1519
-		   current_position[X_AXIS]=code_value()+add_homeing[0];
1519
+		   current_position[X_AXIS]=code_value()+add_homing[0];
1520 1520
 		#endif
1521 1521
         }
1522 1522
       }
@@ -1526,7 +1526,7 @@ void process_commands()
1526 1526
          #ifdef SCARA
1527 1527
 		   current_position[Y_AXIS]=code_value();
1528 1528
 		#else
1529
-		   current_position[Y_AXIS]=code_value()+add_homeing[1];
1529
+		   current_position[Y_AXIS]=code_value()+add_homing[1];
1530 1530
 		#endif
1531 1531
         }
1532 1532
       }
@@ -1591,7 +1591,7 @@ void process_commands()
1591 1591
 
1592 1592
       if(code_seen(axis_codes[Z_AXIS])) {
1593 1593
         if(code_value_long() != 0) {
1594
-          current_position[Z_AXIS]=code_value()+add_homeing[2];
1594
+          current_position[Z_AXIS]=code_value()+add_homing[2];
1595 1595
         }
1596 1596
       }
1597 1597
       #ifdef ENABLE_AUTO_BED_LEVELING
@@ -1820,10 +1820,10 @@ void process_commands()
1820 1820
                 	current_position[i] = code_value();  
1821 1821
 		}
1822 1822
 		else {
1823
-                current_position[i] = code_value()+add_homeing[i];  
1823
+                current_position[i] = code_value()+add_homing[i];  
1824 1824
             	}  
1825 1825
 #else
1826
-		current_position[i] = code_value()+add_homeing[i];
1826
+		current_position[i] = code_value()+add_homing[i];
1827 1827
 #endif
1828 1828
             plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
1829 1829
            }
@@ -2700,9 +2700,9 @@ Sigma_Exit:
2700 2700
       SERIAL_PROTOCOLLN("");
2701 2701
       
2702 2702
       SERIAL_PROTOCOLPGM("SCARA Cal - Theta:");
2703
-      SERIAL_PROTOCOL(delta[X_AXIS]+add_homeing[0]);
2703
+      SERIAL_PROTOCOL(delta[X_AXIS]+add_homing[0]);
2704 2704
       SERIAL_PROTOCOLPGM("   Psi+Theta (90):");
2705
-      SERIAL_PROTOCOL(delta[Y_AXIS]-delta[X_AXIS]-90+add_homeing[1]);
2705
+      SERIAL_PROTOCOL(delta[Y_AXIS]-delta[X_AXIS]-90+add_homing[1]);
2706 2706
       SERIAL_PROTOCOLLN("");
2707 2707
       
2708 2708
       SERIAL_PROTOCOLPGM("SCARA step Cal - Theta:");
@@ -2828,19 +2828,19 @@ Sigma_Exit:
2828 2828
       if(code_seen('E')) max_e_jerk = code_value() ;
2829 2829
     }
2830 2830
     break;
2831
-    case 206: // M206 additional homeing offset
2831
+    case 206: // M206 additional homing offset
2832 2832
       for(int8_t i=0; i < 3; i++)
2833 2833
       {
2834
-        if(code_seen(axis_codes[i])) add_homeing[i] = code_value();
2834
+        if(code_seen(axis_codes[i])) add_homing[i] = code_value();
2835 2835
       }
2836 2836
 	  #ifdef SCARA
2837 2837
 	   if(code_seen('T'))       // Theta
2838 2838
       {
2839
-        add_homeing[0] = code_value() ;
2839
+        add_homing[0] = code_value() ;
2840 2840
       }
2841 2841
       if(code_seen('P'))       // Psi
2842 2842
       {
2843
-        add_homeing[1] = code_value() ;
2843
+        add_homing[1] = code_value() ;
2844 2844
       }
2845 2845
 	  #endif
2846 2846
       break;

+ 30
- 21
Marlin/example_configurations/delta/Configuration.h Näytä tiedosto

@@ -8,7 +8,7 @@
8 8
 //===========================================================================
9 9
 //============================= DELTA Printer ===============================
10 10
 //===========================================================================
11
-// For a Delta printer rplace the configuration files wilth the files in the
11
+// For a Delta printer replace the configuration files with the files in the
12 12
 // example_configurations/delta directory.
13 13
 //
14 14
 
@@ -66,7 +66,7 @@
66 66
 // 702= Minitronics v1.0
67 67
 // 90 = Alpha OMCA board
68 68
 // 91 = Final OMCA board
69
-// 301 = Rambo
69
+// 301= Rambo
70 70
 // 21 = Elefu Ra Board (v3)
71 71
 
72 72
 #ifndef MOTHERBOARD
@@ -89,7 +89,7 @@
89 89
 
90 90
 #define POWER_SUPPLY 1
91 91
 
92
-// Define this to have the electronics keep the powersupply off on startup. If you don't know what this is leave it.
92
+// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
93 93
 // #define PS_DEFAULT_OFF
94 94
 
95 95
 //===========================================================================
@@ -103,7 +103,7 @@
103 103
 // and processor overload (too many expensive sqrt calls).
104 104
 #define DELTA_SEGMENTS_PER_SECOND 200
105 105
 
106
-// NOTE NB all values for DELTA_* values MOUST be floating point, so always have a decimal point in them
106
+// NOTE NB all values for DELTA_* values MUST be floating point, so always have a decimal point in them
107 107
 
108 108
 // Center-to-center distance of the holes in the diagonal push rods.
109 109
 #define DELTA_DIAGONAL_ROD 250.0 // mm
@@ -132,7 +132,7 @@
132 132
 // 0 is not used
133 133
 // 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
134 134
 // 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
135
-// 3 is mendel-parts thermistor (4.7k pullup)
135
+// 3 is Mendel-parts thermistor (4.7k pullup)
136 136
 // 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
137 137
 // 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)
138 138
 // 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
@@ -141,13 +141,18 @@
141 141
 // 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
142 142
 // 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
143 143
 // 10 is 100k RS thermistor 198-961 (4.7k pullup)
144
-// 60 is 100k Maker's Tool Works Kapton Bed Thermister
144
+// 60 is 100k Maker's Tool Works Kapton Bed Thermistor
145 145
 //
146 146
 //    1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
147 147
 //                          (but gives greater accuracy and more stable PID)
148 148
 // 51 is 100k thermistor - EPCOS (1k pullup)
149 149
 // 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
150 150
 // 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
151
+//
152
+// 1047 is Pt1000 with 4k7 pullup
153
+// 1010 is Pt1000 with 1k pullup (non standard)
154
+// 147 is Pt100 with 4k7 pullup
155
+// 110 is Pt100 with 1k pullup (non standard)
151 156
 
152 157
 #define TEMP_SENSOR_0 -1
153 158
 #define TEMP_SENSOR_1 -1
@@ -184,6 +189,10 @@
184 189
 // HEATER_BED_DUTY_CYCLE_DIVIDER intervals.
185 190
 //#define HEATER_BED_DUTY_CYCLE_DIVIDER 4
186 191
 
192
+// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS
193
+//#define EXTRUDER_WATTS (12.0*12.0/6.7) //  P=I^2/R
194
+//#define BED_WATTS (12.0*12.0/1.1)      // P=I^2/R
195
+
187 196
 // PID settings:
188 197
 // Comment the following line to disable PID and enable bang-bang.
189 198
 #define PIDTEMP
@@ -198,13 +207,13 @@
198 207
   #define K1 0.95 //smoothing factor within the PID
199 208
   #define PID_dT ((16.0 * 8.0)/(F_CPU / 64.0 / 256.0)) //sampling period of the temperature routine
200 209
 
201
-// If you are using a preconfigured hotend then you can use one of the value sets by uncommenting it
210
+// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
202 211
 // Ultimaker
203 212
     #define  DEFAULT_Kp 22.2
204 213
     #define  DEFAULT_Ki 1.08
205 214
     #define  DEFAULT_Kd 114
206 215
 
207
-// Makergear
216
+// MakerGear
208 217
 //    #define  DEFAULT_Kp 7.0
209 218
 //    #define  DEFAULT_Ki 0.1
210 219
 //    #define  DEFAULT_Kd 12
@@ -273,7 +282,7 @@
273 282
 #define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
274 283
 
275 284
 #ifndef ENDSTOPPULLUPS
276
-  // fine Enstop settings: Individual Pullups. will be ignored if ENDSTOPPULLUPS is defined
285
+  // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
277 286
   // #define ENDSTOPPULLUP_XMAX
278 287
   // #define ENDSTOPPULLUP_YMAX
279 288
   // #define ENDSTOPPULLUP_ZMAX
@@ -359,7 +368,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
359 368
   #define BACK_PROBE_BED_POSITION 180
360 369
   #define FRONT_PROBE_BED_POSITION 20
361 370
 
362
-  // these are the offsets to the prob relative to the extruder tip (Hotend - Probe)
371
+  // these are the offsets to the probe relative to the extruder tip (Hotend - Probe)
363 372
   #define X_PROBE_OFFSET_FROM_EXTRUDER -25
364 373
   #define Y_PROBE_OFFSET_FROM_EXTRUDER -29
365 374
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35
@@ -380,7 +389,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
380 389
 //  #define PROBE_SERVO_DEACTIVATION_DELAY 300
381 390
 
382 391
 
383
-//If you have enabled the Bed Auto Levelling and are using the same Z Probe for Z Homing,
392
+//If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing,
384 393
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
385 394
 
386 395
   #define Z_SAFE_HOMING   // This feature is meant to avoid Z homing with probe outside the bed area.
@@ -407,7 +416,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
407 416
 //Manual homing switch locations:
408 417
 
409 418
 #define MANUAL_HOME_POSITIONS  // MANUAL_*_HOME_POS below will be used
410
-// For deltabots this means top and center of the cartesian print volume.
419
+// For deltabots this means top and center of the Cartesian print volume.
411 420
 #define MANUAL_X_HOME_POS 0
412 421
 #define MANUAL_Y_HOME_POS 0
413 422
 #define MANUAL_Z_HOME_POS 250 // For delta: Distance between nozzle and print surface after homing.
@@ -443,11 +452,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
443 452
 //===========================================================================
444 453
 
445 454
 // EEPROM
446
-// the microcontroller can store settings in the EEPROM, e.g. max velocity...
447
-// M500 - stores paramters in EEPROM
455
+// The microcontroller can store settings in the EEPROM, e.g. max velocity...
456
+// M500 - stores parameters in EEPROM
448 457
 // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
449 458
 // M502 - reverts to the default "factory settings".  You still need to store them in EEPROM afterwards if you want to.
450
-//define this to enable eeprom support
459
+//define this to enable EEPROM support
451 460
 //#define EEPROM_SETTINGS
452 461
 //to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
453 462
 // please keep turned on if you can.
@@ -463,14 +472,14 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
463 472
 #define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
464 473
 
465 474
 //LCD and SD support
466
-//#define ULTRA_LCD  //general lcd support, also 16x2
475
+//#define ULTRA_LCD  //general LCD support, also 16x2
467 476
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
468 477
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
469 478
 //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
470 479
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
471 480
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking
472
-//#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
473
-//#define ULTIPANEL  //the ultipanel as on thingiverse
481
+//#define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
482
+//#define ULTIPANEL  //the UltiPanel as on Thingiverse
474 483
 
475 484
 // The MaKr3d Makr-Panel with graphic controller and SD support
476 485
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
@@ -594,7 +603,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
594 603
     #define LCD_WIDTH 20
595 604
     #define LCD_HEIGHT 4
596 605
   #endif
597
-#else //no panel but just lcd
606
+#else //no panel but just LCD
598 607
   #ifdef ULTRA_LCD
599 608
   #ifdef DOGLCD // Change number of lines to match the 128x64 graphics display
600 609
     #define LCD_WIDTH 20
@@ -616,8 +625,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
616 625
 // Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
617 626
 //#define FAST_PWM_FAN
618 627
 
619
-// Temperature status leds that display the hotend and bet temperature.
620
-// If alle hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
628
+// Temperature status LEDs that display the hotend and bet temperature.
629
+// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on.
621 630
 // Otherwise the RED led is on. There is 1C hysteresis.
622 631
 //#define TEMP_STAT_LEDS
623 632
 

+ 3
- 3
Marlin/language.h Näytä tiedosto

@@ -409,7 +409,7 @@
409 409
 	#define MSG_SET_ORIGIN "Regler origine"
410 410
 	#define MSG_PREHEAT_PLA " Prechauffage PLA"
411 411
 	#define MSG_PREHEAT_PLA0 "Prechauff. PLA 1"
412
-        #define MSG_PREHEAT_PLA1 "Prechauff. PLA 2"
412
+    #define MSG_PREHEAT_PLA1 "Prechauff. PLA 2"
413 413
 	#define MSG_PREHEAT_PLA2 "Prechauff. PLA 3"
414 414
 	#define MSG_PREHEAT_PLA012 "Prech. PLA Tout"
415 415
 	#define MSG_PREHEAT_PLA_BEDONLY "Prech. PLA Plateau"
@@ -885,11 +885,11 @@
885 885
 	#define MSG_KILLED							"УБИТО."
886 886
 	#define MSG_STOPPED							"ОСТАНОВЛЕНО."
887 887
 	#define MSG_CONTROL_RETRACT					"Откат mm:"
888
-	#define MSG_CONTROL_RETRACT_SWAP				"своп Откат mm:"
888
+	#define MSG_CONTROL_RETRACT_SWAP			"своп Откат mm:"
889 889
 	#define MSG_CONTROL_RETRACTF				"Откат  V:"
890 890
 	#define MSG_CONTROL_RETRACT_ZLIFT			"Прыжок mm:"
891 891
 	#define MSG_CONTROL_RETRACT_RECOVER			"Возврат +mm:"
892
-	#define MSG_CONTROL_RETRACT_RECOVER_SWAP		"своп Возврат +mm:"
892
+	#define MSG_CONTROL_RETRACT_RECOVER_SWAP	"своп Возврат +mm:"
893 893
 	#define MSG_CONTROL_RETRACT_RECOVERF		"Возврат  V:"
894 894
 	#define MSG_AUTORETRACT						"АвтоОткат:"
895 895
 	#define MSG_FILAMENTCHANGE 					"Change filament"

+ 2
- 2
Marlin/pins.h Näytä tiedosto

@@ -2078,8 +2078,8 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
2078 2078
 #define Z_DIR_PIN          28
2079 2079
 #define Z_STOP_PIN         30
2080 2080
 
2081
-#define E0_STEP_PIN         17
2082
-#define E0_DIR_PIN          21
2081
+#define E0_STEP_PIN        17
2082
+#define E0_DIR_PIN         21
2083 2083
 
2084 2084
 #define LED_PIN            -1
2085 2085
 

+ 1
- 1
Marlin/stepper.cpp Näytä tiedosto

@@ -1241,7 +1241,7 @@ void microstep_init()
1241 1241
   pinMode(Y_MS1_PIN,OUTPUT);
1242 1242
   pinMode(Y_MS2_PIN,OUTPUT);
1243 1243
   pinMode(Z_MS1_PIN,OUTPUT);
1244
-  pinMode(Z_MS2_PIN,OUTPUT);  
1244
+  pinMode(Z_MS2_PIN,OUTPUT);
1245 1245
   pinMode(E0_MS1_PIN,OUTPUT);
1246 1246
   pinMode(E0_MS2_PIN,OUTPUT);
1247 1247
   for(int i=0;i<=4;i++) microstep_mode(i,microstep_modes[i]);

Loading…
Peruuta
Tallenna