Browse Source

Merge remote-tracking branch 'upstream/Development' into Development

CONSULitAS 10 years ago
parent
commit
2b1ddc0413

+ 5
- 0
Marlin/Configuration.h View File

@@ -398,6 +398,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
398 398
 
399 399
   #ifdef AUTO_BED_LEVELING_GRID
400 400
 
401
+    // Use one of these defines to specify the origin
402
+    // for a topographical map to be printed for your bed.
403
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
404
+    #define TOPO_ORIGIN OriginFrontLeft
405
+
401 406
     // The edges of the rectangle in which to probe
402 407
     #define LEFT_PROBE_BED_POSITION 15
403 408
     #define RIGHT_PROBE_BED_POSITION 170

+ 1
- 1
Marlin/Marlin.h View File

@@ -33,7 +33,7 @@
33 33
 #endif
34 34
 
35 35
 #define BIT(b) (1<<(b))
36
-#define TEST(n,b) ((n)&BIT(b)!=0)
36
+#define TEST(n,b) (((n)&BIT(b))!=0)
37 37
 
38 38
 // Arduino < 1.0.0 does not define this, so we need to do it ourselves
39 39
 #ifndef analogInputToDigitalPin

+ 0
- 6
Marlin/Marlin_main.cpp View File

@@ -1854,12 +1854,6 @@ inline void gcode_G28() {
1854 1854
    *     Usage: "G29 E" or "G29 e"
1855 1855
    *
1856 1856
    */
1857
-
1858
-  // Use one of these defines to specify the origin
1859
-  // for a topographical map to be printed for your bed.
1860
-  enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
1861
-  #define TOPO_ORIGIN OriginFrontLeft
1862
-
1863 1857
   inline void gcode_G29() {
1864 1858
 
1865 1859
     // Prevent user from running a G29 without first homing in X and Y

+ 5
- 0
Marlin/configurator/config/Configuration.h View File

@@ -438,6 +438,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
438 438
 
439 439
   #ifdef AUTO_BED_LEVELING_GRID
440 440
 
441
+    // Use one of these defines to specify the origin
442
+    // for a topographical map to be printed for your bed.
443
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
444
+    #define TOPO_ORIGIN OriginFrontLeft
445
+
441 446
     // The edges of the rectangle in which to probe
442 447
     #define LEFT_PROBE_BED_POSITION 15
443 448
     #define RIGHT_PROBE_BED_POSITION 170

+ 5
- 0
Marlin/example_configurations/Felix/Configuration.h View File

@@ -384,6 +384,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
384 384
   // Note: this feature occupies 10'206 byte
385 385
   #ifdef AUTO_BED_LEVELING_GRID
386 386
 
387
+    // Use one of these defines to specify the origin
388
+    // for a topographical map to be printed for your bed.
389
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
390
+    #define TOPO_ORIGIN OriginFrontLeft
391
+
387 392
     // set the rectangle in which to probe
388 393
     #define LEFT_PROBE_BED_POSITION 15
389 394
     #define RIGHT_PROBE_BED_POSITION 170

+ 5
- 0
Marlin/example_configurations/Felix/Configuration_DUAL.h View File

@@ -384,6 +384,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
384 384
   // Note: this feature occupies 10'206 byte
385 385
   #ifdef AUTO_BED_LEVELING_GRID
386 386
 
387
+    // Use one of these defines to specify the origin
388
+    // for a topographical map to be printed for your bed.
389
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
390
+    #define TOPO_ORIGIN OriginFrontLeft
391
+
387 392
     // set the rectangle in which to probe
388 393
     #define LEFT_PROBE_BED_POSITION 15
389 394
     #define RIGHT_PROBE_BED_POSITION 170

+ 5
- 0
Marlin/example_configurations/Hephestos/Configuration.h View File

@@ -408,6 +408,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
408 408
 
409 409
   #ifdef AUTO_BED_LEVELING_GRID
410 410
 
411
+    // Use one of these defines to specify the origin
412
+    // for a topographical map to be printed for your bed.
413
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
414
+    #define TOPO_ORIGIN OriginFrontLeft
415
+
411 416
     // The edges of the rectangle in which to probe
412 417
     #define LEFT_PROBE_BED_POSITION 15
413 418
     #define RIGHT_PROBE_BED_POSITION 170

+ 5
- 0
Marlin/example_configurations/K8200/Configuration.h View File

@@ -413,6 +413,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
413 413
 
414 414
   #ifdef AUTO_BED_LEVELING_GRID
415 415
 
416
+    // Use one of these defines to specify the origin
417
+    // for a topographical map to be printed for your bed.
418
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
419
+    #define TOPO_ORIGIN OriginFrontLeft
420
+
416 421
     // The edges of the rectangle in which to probe
417 422
     #define LEFT_PROBE_BED_POSITION 15
418 423
     #define RIGHT_PROBE_BED_POSITION 170

+ 5
- 0
Marlin/example_configurations/SCARA/Configuration.h View File

@@ -437,6 +437,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
437 437
 
438 438
   #ifdef AUTO_BED_LEVELING_GRID
439 439
 
440
+    // Use one of these defines to specify the origin
441
+    // for a topographical map to be printed for your bed.
442
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
443
+    #define TOPO_ORIGIN OriginFrontLeft
444
+
440 445
     // The edges of the rectangle in which to probe
441 446
     #define LEFT_PROBE_BED_POSITION 15
442 447
     #define RIGHT_PROBE_BED_POSITION 170

+ 5
- 0
Marlin/example_configurations/WITBOX/Configuration.h View File

@@ -407,6 +407,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
407 407
 
408 408
   #ifdef AUTO_BED_LEVELING_GRID
409 409
 
410
+    // Use one of these defines to specify the origin
411
+    // for a topographical map to be printed for your bed.
412
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
413
+    #define TOPO_ORIGIN OriginFrontLeft
414
+
410 415
     // The edges of the rectangle in which to probe
411 416
     #define LEFT_PROBE_BED_POSITION 15
412 417
     #define RIGHT_PROBE_BED_POSITION 170

+ 5
- 0
Marlin/example_configurations/makibox/Configuration.h View File

@@ -405,6 +405,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
405 405
 
406 406
   #ifdef AUTO_BED_LEVELING_GRID
407 407
 
408
+    // Use one of these defines to specify the origin
409
+    // for a topographical map to be printed for your bed.
410
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
411
+    #define TOPO_ORIGIN OriginFrontLeft
412
+
408 413
     // The edges of the rectangle in which to probe
409 414
     #define LEFT_PROBE_BED_POSITION 15
410 415
     #define RIGHT_PROBE_BED_POSITION 170

+ 5
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

@@ -407,6 +407,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
407 407
 
408 408
   #ifdef AUTO_BED_LEVELING_GRID
409 409
 
410
+    // Use one of these defines to specify the origin
411
+    // for a topographical map to be printed for your bed.
412
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
413
+    #define TOPO_ORIGIN OriginFrontLeft
414
+
410 415
     // The edges of the rectangle in which to probe
411 416
     #define LEFT_PROBE_BED_POSITION 15
412 417
     #define RIGHT_PROBE_BED_POSITION 170

+ 38
- 37
Marlin/stepper.cpp View File

@@ -413,48 +413,49 @@ ISR(TIMER1_COMPA_vect) {
413 413
       #else
414 414
         // Head direction in -X axis for CoreXY bots.
415 415
         // If DeltaX == -DeltaY, the movement is only in Y axis
416
-        if (TEST(out_bits, X_HEAD) && (current_block->steps_x != current_block->steps_y || (TEST(out_bits, X_AXIS) == TEST(out_bits, Y_AXIS))))
416
+        if (current_block->steps_x != current_block->steps_y || (TEST(out_bits, X_AXIS) == TEST(out_bits, Y_AXIS)))      
417
+            if (TEST(out_bits, X_HEAD))
417 418
       #endif
418
-        { // -direction
419
-          #ifdef DUAL_X_CARRIAGE
420
-            // with 2 x-carriages, endstops are only checked in the homing direction for the active extruder
421
-            if ((current_block->active_extruder == 0 && X_HOME_DIR == -1) || (current_block->active_extruder != 0 && X2_HOME_DIR == -1))
422
-          #endif          
423
-            {
424
-              #if defined(X_MIN_PIN) && X_MIN_PIN >= 0
425
-                UPDATE_ENDSTOP(x, X, min, MIN);
419
+            { // -direction
420
+              #ifdef DUAL_X_CARRIAGE
421
+                // with 2 x-carriages, endstops are only checked in the homing direction for the active extruder
422
+                if ((current_block->active_extruder == 0 && X_HOME_DIR == -1) || (current_block->active_extruder != 0 && X2_HOME_DIR == -1))
423
+              #endif          
424
+                {
425
+                  #if defined(X_MIN_PIN) && X_MIN_PIN >= 0
426
+                    UPDATE_ENDSTOP(x, X, min, MIN);
427
+                  #endif
428
+                }
429
+            }
430
+            else { // +direction
431
+              #ifdef DUAL_X_CARRIAGE
432
+                // with 2 x-carriages, endstops are only checked in the homing direction for the active extruder
433
+                if ((current_block->active_extruder == 0 && X_HOME_DIR == 1) || (current_block->active_extruder != 0 && X2_HOME_DIR == 1))
426 434
               #endif
435
+                {
436
+                  #if defined(X_MAX_PIN) && X_MAX_PIN >= 0
437
+                    UPDATE_ENDSTOP(x, X, max, MAX);
438
+                  #endif
439
+                }
427 440
             }
428
-        }
429
-        else { // +direction
430
-          #ifdef DUAL_X_CARRIAGE
431
-            // with 2 x-carriages, endstops are only checked in the homing direction for the active extruder
432
-            if ((current_block->active_extruder == 0 && X_HOME_DIR == 1) || (current_block->active_extruder != 0 && X2_HOME_DIR == 1))
433
-          #endif
434
-            {
435
-              #if defined(X_MAX_PIN) && X_MAX_PIN >= 0
436
-                UPDATE_ENDSTOP(x, X, max, MAX);
441
+      #ifndef COREXY
442
+        if (TEST(out_bits, Y_AXIS))   // -direction
443
+      #else
444
+        // Head direction in -Y axis for CoreXY bots.
445
+        // If DeltaX == DeltaY, the movement is only in X axis
446
+        if (current_block->steps_x != current_block->steps_y || (TEST(out_bits, X_AXIS) != TEST(out_bits, Y_AXIS)))
447
+            if (TEST(out_bits, Y_HEAD))             
448
+      #endif
449
+            { // -direction
450
+              #if defined(Y_MIN_PIN) && Y_MIN_PIN >= 0
451
+                UPDATE_ENDSTOP(y, Y, min, MIN);
452
+              #endif
453
+            }
454
+            else { // +direction
455
+              #if defined(Y_MAX_PIN) && Y_MAX_PIN >= 0
456
+                UPDATE_ENDSTOP(y, Y, max, MAX);
437 457
               #endif
438 458
             }
439
-        }
440
-
441
-        #ifndef COREXY
442
-          if (TEST(out_bits, Y_AXIS))   // -direction
443
-        #else
444
-          // Head direction in -Y axis for CoreXY bots.
445
-          // If DeltaX == DeltaY, the movement is only in X axis
446
-          if (TEST(out_bits, Y_HEAD) && (current_block->steps_x != current_block->steps_y || (TEST(out_bits, X_AXIS) != TEST(out_bits, Y_AXIS))))
447
-        #endif
448
-        { // -direction
449
-          #if defined(Y_MIN_PIN) && Y_MIN_PIN >= 0
450
-            UPDATE_ENDSTOP(y, Y, min, MIN);
451
-          #endif
452
-        }
453
-        else { // +direction
454
-          #if defined(Y_MAX_PIN) && Y_MAX_PIN >= 0
455
-            UPDATE_ENDSTOP(y, Y, max, MAX);
456
-          #endif
457
-        }
458 459
     }
459 460
 
460 461
     if (TEST(out_bits, Z_AXIS)) {   // -direction

+ 3
- 3
Marlin/temperature.cpp View File

@@ -535,17 +535,17 @@ inline void _temp_error(int e, const char *msg1, const char *msg2) {
535 535
 
536 536
 void max_temp_error(uint8_t e) {
537 537
   disable_heater();
538
-  _temp_error(e, MSG_MAXTEMP_EXTRUDER_OFF, MSG_ERR_MAXTEMP);
538
+  _temp_error(e, PSTR(MSG_MAXTEMP_EXTRUDER_OFF), PSTR(MSG_ERR_MAXTEMP));
539 539
 }
540 540
 void min_temp_error(uint8_t e) {
541 541
   disable_heater();
542
-  _temp_error(e, MSG_MINTEMP_EXTRUDER_OFF, MSG_ERR_MINTEMP);
542
+  _temp_error(e, PSTR(MSG_MINTEMP_EXTRUDER_OFF), PSTR(MSG_ERR_MINTEMP));
543 543
 }
544 544
 void bed_max_temp_error(void) {
545 545
   #if HAS_HEATER_BED
546 546
     WRITE_HEATER_BED(0);
547 547
   #endif
548
-  _temp_error(-1, MSG_MAXTEMP_BED_OFF, MSG_ERR_MAXTEMP_BED);
548
+  _temp_error(-1, PSTR(MSG_MAXTEMP_BED_OFF), PSTR(MSG_ERR_MAXTEMP_BED));
549 549
 }
550 550
 
551 551
 float get_pid_output(int e) {

Loading…
Cancel
Save