浏览代码

Merge corrections from dev branch (PR#2704)

Richard Wackerbarth 8 年前
父节点
当前提交
a0f6407d6a
共有 47 个文件被更改,包括 778 次插入892 次删除
  1. 0
    5
      Marlin/Configuration.h
  2. 2
    1
      Marlin/MarlinSerial.cpp
  3. 31
    19
      Marlin/Marlin_main.cpp
  4. 4
    2
      Marlin/Sd2Card.cpp
  5. 12
    6
      Marlin/Sd2PinMap.h
  6. 2
    2
      Marlin/configuration_store.cpp
  7. 0
    5
      Marlin/configurator/config/Configuration.h
  8. 4
    2
      Marlin/dogm_lcd_implementation.h
  9. 1
    6
      Marlin/example_configurations/Felix/Configuration.h
  10. 2
    7
      Marlin/example_configurations/Felix/Configuration_DUAL.h
  11. 40
    43
      Marlin/example_configurations/Felix/Configuration_adv.h
  12. 2
    7
      Marlin/example_configurations/Hephestos/Configuration.h
  13. 40
    43
      Marlin/example_configurations/Hephestos/Configuration_adv.h
  14. 1
    6
      Marlin/example_configurations/K8200/Configuration.h
  15. 40
    43
      Marlin/example_configurations/K8200/Configuration_adv.h
  16. 1
    6
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  17. 1
    6
      Marlin/example_configurations/RigidBot/Configuration.h
  18. 40
    43
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  19. 6
    11
      Marlin/example_configurations/SCARA/Configuration.h
  20. 40
    43
      Marlin/example_configurations/SCARA/Configuration_adv.h
  21. 1
    6
      Marlin/example_configurations/TAZ4/Configuration.h
  22. 40
    43
      Marlin/example_configurations/TAZ4/Configuration_adv.h
  23. 1
    6
      Marlin/example_configurations/WITBOX/Configuration.h
  24. 40
    43
      Marlin/example_configurations/WITBOX/Configuration_adv.h
  25. 1
    6
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  26. 1
    6
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  27. 40
    43
      Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
  28. 1
    6
      Marlin/example_configurations/delta/generic/Configuration.h
  29. 40
    43
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  30. 1
    6
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  31. 40
    43
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  32. 1
    6
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  33. 40
    43
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  34. 2
    7
      Marlin/example_configurations/makibox/Configuration.h
  35. 40
    43
      Marlin/example_configurations/makibox/Configuration_adv.h
  36. 2
    7
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  37. 40
    43
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
  38. 6
    6
      Marlin/fastio.h
  39. 4
    2
      Marlin/planner.cpp
  40. 10
    13
      Marlin/qr_solve.cpp
  41. 6
    4
      Marlin/stepper.cpp
  42. 12
    6
      Marlin/temperature.cpp
  43. 49
    68
      Marlin/ultralcd.cpp
  44. 2
    2
      Marlin/ultralcd_implementation_hitachi_HD44780.h
  45. 69
    46
      Marlin/utf_mapper.h
  46. 13
    29
      Marlin/watchdog.cpp
  47. 7
    10
      Marlin/watchdog.h

+ 0
- 5
Marlin/Configuration.h 查看文件

853
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
853
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
854
 //#define FILAMENT_LCD_DISPLAY
854
 //#define FILAMENT_LCD_DISPLAY
855
 
855
 
856
-
857
-
858
-
859
-
860
-
861
 #include "Configuration_adv.h"
856
 #include "Configuration_adv.h"
862
 #include "thermistortables.h"
857
 #include "thermistortables.h"
863
 
858
 

+ 2
- 1
Marlin/MarlinSerial.cpp 查看文件

78
   if (useU2X) {
78
   if (useU2X) {
79
     M_UCSRxA = BIT(M_U2Xx);
79
     M_UCSRxA = BIT(M_U2Xx);
80
     baud_setting = (F_CPU / 4 / baud - 1) / 2;
80
     baud_setting = (F_CPU / 4 / baud - 1) / 2;
81
-  } else {
81
+  }
82
+  else {
82
     M_UCSRxA = 0;
83
     M_UCSRxA = 0;
83
     baud_setting = (F_CPU / 8 / baud - 1) / 2;
84
     baud_setting = (F_CPU / 8 / baud - 1) / 2;
84
   }
85
   }

+ 31
- 19
Marlin/Marlin_main.cpp 查看文件

45
 #include "stepper.h"
45
 #include "stepper.h"
46
 #include "temperature.h"
46
 #include "temperature.h"
47
 #include "cardreader.h"
47
 #include "cardreader.h"
48
-#include "watchdog.h"
49
 #include "configuration_store.h"
48
 #include "configuration_store.h"
50
 #include "language.h"
49
 #include "language.h"
51
 #include "pins_arduino.h"
50
 #include "pins_arduino.h"
52
 #include "math.h"
51
 #include "math.h"
53
 #include "buzzer.h"
52
 #include "buzzer.h"
54
 
53
 
54
+#if ENABLED(USE_WATCHDOG)
55
+  #include "watchdog.h"
56
+#endif
57
+
55
 #if ENABLED(BLINKM)
58
 #if ENABLED(BLINKM)
56
   #include "blinkm.h"
59
   #include "blinkm.h"
57
   #include "Wire.h"
60
   #include "Wire.h"
681
 
684
 
682
   tp_init();    // Initialize temperature loop
685
   tp_init();    // Initialize temperature loop
683
   plan_init();  // Initialize planner;
686
   plan_init();  // Initialize planner;
684
-  watchdog_init();
687
+
688
+  #if ENABLED(USE_WATCHDOG)
689
+    watchdog_init();
690
+  #endif
691
+
685
   st_init();    // Initialize stepper, this enables interrupts!
692
   st_init();    // Initialize stepper, this enables interrupts!
686
   setup_photpin();
693
   setup_photpin();
687
   servo_init();
694
   servo_init();
827
         fromsd[cmd_queue_index_w] = false;
834
         fromsd[cmd_queue_index_w] = false;
828
       #endif
835
       #endif
829
 
836
 
830
-      char *npos = strchr(command, 'N');
831
-      char *apos = strchr(command, '*');
837
+      while (*command == ' ') command++; // skip any leading spaces
838
+      char* npos = (*command == 'N') ? command : NULL; // Require the N parameter to start the line
839
+      char* apos = strchr(command, '*');
840
+
832
       if (npos) {
841
       if (npos) {
833
 
842
 
834
         boolean M110 = strstr_P(command, PSTR("M110")) != NULL;
843
         boolean M110 = strstr_P(command, PSTR("M110")) != NULL;
1688
       if (a < b) {
1697
       if (a < b) {
1689
         if (b < c) median = b;
1698
         if (b < c) median = b;
1690
         if (c < a) median = a;
1699
         if (c < a) median = a;
1691
-      } else {  // b <= a
1700
+      }
1701
+      else {  // b <= a
1692
         if (c < b) median = b;
1702
         if (c < b) median = b;
1693
         if (a < c) median = a;
1703
         if (a < c) median = a;
1694
       }
1704
       }
1783
       #endif
1793
       #endif
1784
       do_blocking_move_to_x(X_MAX_POS + SLED_DOCKING_OFFSET + offset - 1);  // Dock sled a bit closer to ensure proper capturing
1794
       do_blocking_move_to_x(X_MAX_POS + SLED_DOCKING_OFFSET + offset - 1);  // Dock sled a bit closer to ensure proper capturing
1785
       digitalWrite(SLED_PIN, LOW); // turn off magnet
1795
       digitalWrite(SLED_PIN, LOW); // turn off magnet
1786
-    } else {
1796
+    }
1797
+    else {
1787
       float z_loc = current_position[Z_AXIS];
1798
       float z_loc = current_position[Z_AXIS];
1788
       if (z_loc < Z_RAISE_BEFORE_PROBING + 5) z_loc = Z_RAISE_BEFORE_PROBING;
1799
       if (z_loc < Z_RAISE_BEFORE_PROBING + 5) z_loc = Z_RAISE_BEFORE_PROBING;
1789
       do_blocking_move_to(X_MAX_POS + SLED_DOCKING_OFFSET + offset, current_position[Y_AXIS], z_loc); // this also updates current_position
1800
       do_blocking_move_to(X_MAX_POS + SLED_DOCKING_OFFSET + offset, current_position[Y_AXIS], z_loc); // this also updates current_position
2696
             SERIAL_PROTOCOLPGM("X out of range (1-" STRINGIFY(MESH_NUM_X_POINTS) ").\n");
2707
             SERIAL_PROTOCOLPGM("X out of range (1-" STRINGIFY(MESH_NUM_X_POINTS) ").\n");
2697
             return;
2708
             return;
2698
           }
2709
           }
2699
-        } else {
2710
+        }
2711
+        else {
2700
           SERIAL_PROTOCOLPGM("X not entered.\n");
2712
           SERIAL_PROTOCOLPGM("X not entered.\n");
2701
           return;
2713
           return;
2702
         }
2714
         }
2706
             SERIAL_PROTOCOLPGM("Y out of range (1-" STRINGIFY(MESH_NUM_Y_POINTS) ").\n");
2718
             SERIAL_PROTOCOLPGM("Y out of range (1-" STRINGIFY(MESH_NUM_Y_POINTS) ").\n");
2707
             return;
2719
             return;
2708
           }
2720
           }
2709
-        } else {
2721
+        }
2722
+        else {
2710
           SERIAL_PROTOCOLPGM("Y not entered.\n");
2723
           SERIAL_PROTOCOLPGM("Y not entered.\n");
2711
           return;
2724
           return;
2712
         }
2725
         }
4653
 inline void gcode_M221() {
4666
 inline void gcode_M221() {
4654
   if (code_seen('S')) {
4667
   if (code_seen('S')) {
4655
     int sval = code_value();
4668
     int sval = code_value();
4656
-    if (code_seen('T')) {
4657
-      if (setTargetedHotend(221)) return;
4658
-      extruder_multiplier[target_extruder] = sval;
4659
-    }
4660
-    else {
4661
-      extruder_multiplier[active_extruder] = sval;
4662
-    }
4669
+    if (setTargetedHotend(221)) return;
4670
+    extruder_multiplier[target_extruder] = sval;
4663
   }
4671
   }
4664
 }
4672
 }
4665
 
4673
 
6381
     ny = current_position[Y_AXIS] + (y - current_position[Y_AXIS]) * normalized_dist;
6389
     ny = current_position[Y_AXIS] + (y - current_position[Y_AXIS]) * normalized_dist;
6382
     ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist;
6390
     ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist;
6383
     x_splits ^= BIT(ix);
6391
     x_splits ^= BIT(ix);
6384
-  } else if (ix < pix && (x_splits) & BIT(pix)) {
6392
+  }
6393
+  else if (ix < pix && (x_splits) & BIT(pix)) {
6385
     nx = mbl.get_x(pix);
6394
     nx = mbl.get_x(pix);
6386
     normalized_dist = (nx - current_position[X_AXIS]) / (x - current_position[X_AXIS]);
6395
     normalized_dist = (nx - current_position[X_AXIS]) / (x - current_position[X_AXIS]);
6387
     ny = current_position[Y_AXIS] + (y - current_position[Y_AXIS]) * normalized_dist;
6396
     ny = current_position[Y_AXIS] + (y - current_position[Y_AXIS]) * normalized_dist;
6388
     ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist;
6397
     ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist;
6389
     x_splits ^= BIT(pix);
6398
     x_splits ^= BIT(pix);
6390
-  } else if (iy > piy && (y_splits) & BIT(iy)) {
6399
+  }
6400
+  else if (iy > piy && (y_splits) & BIT(iy)) {
6391
     ny = mbl.get_y(iy);
6401
     ny = mbl.get_y(iy);
6392
     normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]);
6402
     normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]);
6393
     nx = current_position[X_AXIS] + (x - current_position[X_AXIS]) * normalized_dist;
6403
     nx = current_position[X_AXIS] + (x - current_position[X_AXIS]) * normalized_dist;
6394
     ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist;
6404
     ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist;
6395
     y_splits ^= BIT(iy);
6405
     y_splits ^= BIT(iy);
6396
-  } else if (iy < piy && (y_splits) & BIT(piy)) {
6406
+  }
6407
+  else if (iy < piy && (y_splits) & BIT(piy)) {
6397
     ny = mbl.get_y(piy);
6408
     ny = mbl.get_y(piy);
6398
     normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]);
6409
     normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]);
6399
     nx = current_position[X_AXIS] + (x - current_position[X_AXIS]) * normalized_dist;
6410
     nx = current_position[X_AXIS] + (x - current_position[X_AXIS]) * normalized_dist;
6400
     ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist;
6411
     ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist;
6401
     y_splits ^= BIT(piy);
6412
     y_splits ^= BIT(piy);
6402
-  } else {
6413
+  }
6414
+  else {
6403
     // Already split on a border
6415
     // Already split on a border
6404
     plan_buffer_line(x, y, z, e, feed_rate, extruder);
6416
     plan_buffer_line(x, y, z, e, feed_rate, extruder);
6405
     set_current_to_destination();
6417
     set_current_to_destination();

+ 4
- 2
Marlin/Sd2Card.cpp 查看文件

192
     uint8_t c_size_mult = (csd.v1.c_size_mult_high << 1)
192
     uint8_t c_size_mult = (csd.v1.c_size_mult_high << 1)
193
                           | csd.v1.c_size_mult_low;
193
                           | csd.v1.c_size_mult_low;
194
     return (uint32_t)(c_size + 1) << (c_size_mult + read_bl_len - 7);
194
     return (uint32_t)(c_size + 1) << (c_size_mult + read_bl_len - 7);
195
-  } else if (csd.v2.csd_ver == 1) {
195
+  }
196
+  else if (csd.v2.csd_ver == 1) {
196
     uint32_t c_size = ((uint32_t)csd.v2.c_size_high << 16)
197
     uint32_t c_size = ((uint32_t)csd.v2.c_size_high << 16)
197
                       | (csd.v2.c_size_mid << 8) | csd.v2.c_size_low;
198
                       | (csd.v2.c_size_mid << 8) | csd.v2.c_size_low;
198
     return (c_size + 1) << 10;
199
     return (c_size + 1) << 10;
199
-  } else {
200
+  }
201
+  else {
200
     error(SD_CARD_ERROR_BAD_CSD);
202
     error(SD_CARD_ERROR_BAD_CSD);
201
     return 0;
203
     return 0;
202
   }
204
   }

+ 12
- 6
Marlin/Sd2PinMap.h 查看文件

396
   bool getPinMode(uint8_t pin) {
396
   bool getPinMode(uint8_t pin) {
397
   if (__builtin_constant_p(pin) && pin < digitalPinCount) {
397
   if (__builtin_constant_p(pin) && pin < digitalPinCount) {
398
     return (*digitalPinMap[pin].ddr >> digitalPinMap[pin].bit) & 1;
398
     return (*digitalPinMap[pin].ddr >> digitalPinMap[pin].bit) & 1;
399
-  } else {
399
+  }
400
+  else {
400
     return badPinNumber();
401
     return badPinNumber();
401
   }
402
   }
402
 }
403
 }
405
   if (__builtin_constant_p(pin) && pin < digitalPinCount) {
406
   if (__builtin_constant_p(pin) && pin < digitalPinCount) {
406
     if (mode) {
407
     if (mode) {
407
       *digitalPinMap[pin].ddr |= BIT(digitalPinMap[pin].bit);
408
       *digitalPinMap[pin].ddr |= BIT(digitalPinMap[pin].bit);
408
-    } else {
409
+    }
410
+    else {
409
       *digitalPinMap[pin].ddr &= ~BIT(digitalPinMap[pin].bit);
411
       *digitalPinMap[pin].ddr &= ~BIT(digitalPinMap[pin].bit);
410
     }
412
     }
411
-  } else {
413
+  }
414
+  else {
412
     badPinNumber();
415
     badPinNumber();
413
   }
416
   }
414
 }
417
 }
416
   bool fastDigitalRead(uint8_t pin) {
419
   bool fastDigitalRead(uint8_t pin) {
417
   if (__builtin_constant_p(pin) && pin < digitalPinCount) {
420
   if (__builtin_constant_p(pin) && pin < digitalPinCount) {
418
     return (*digitalPinMap[pin].pin >> digitalPinMap[pin].bit) & 1;
421
     return (*digitalPinMap[pin].pin >> digitalPinMap[pin].bit) & 1;
419
-  } else {
422
+  }
423
+  else {
420
     return badPinNumber();
424
     return badPinNumber();
421
   }
425
   }
422
 }
426
 }
425
   if (__builtin_constant_p(pin) && pin < digitalPinCount) {
429
   if (__builtin_constant_p(pin) && pin < digitalPinCount) {
426
     if (value) {
430
     if (value) {
427
       *digitalPinMap[pin].port |= BIT(digitalPinMap[pin].bit);
431
       *digitalPinMap[pin].port |= BIT(digitalPinMap[pin].bit);
428
-    } else {
432
+    }
433
+    else {
429
       *digitalPinMap[pin].port &= ~BIT(digitalPinMap[pin].bit);
434
       *digitalPinMap[pin].port &= ~BIT(digitalPinMap[pin].bit);
430
     }
435
     }
431
-  } else {
436
+  }
437
+  else {
432
     badPinNumber();
438
     badPinNumber();
433
   }
439
   }
434
 }
440
 }

+ 2
- 2
Marlin/configuration_store.cpp 查看文件

410
 
410
 
411
     EEPROM_READ_VAR(i, dummy); // bedKp
411
     EEPROM_READ_VAR(i, dummy); // bedKp
412
     if (dummy != DUMMY_PID_VALUE) {
412
     if (dummy != DUMMY_PID_VALUE) {
413
-      bedKp = dummy;
413
+      bedKp = dummy; UNUSED(bedKp);
414
       EEPROM_READ_VAR(i, bedKi);
414
       EEPROM_READ_VAR(i, bedKi);
415
       EEPROM_READ_VAR(i, bedKd);
415
       EEPROM_READ_VAR(i, bedKd);
416
     }
416
     }
540
     #if ENABLED(PID_PARAMS_PER_EXTRUDER)
540
     #if ENABLED(PID_PARAMS_PER_EXTRUDER)
541
       for (int e = 0; e < EXTRUDERS; e++)
541
       for (int e = 0; e < EXTRUDERS; e++)
542
     #else
542
     #else
543
-      int e = 0; // only need to write once
543
+      int e = 0; UNUSED(e); // only need to write once
544
     #endif
544
     #endif
545
     {
545
     {
546
       PID_PARAM(Kp, e) = DEFAULT_Kp;
546
       PID_PARAM(Kp, e) = DEFAULT_Kp;

+ 0
- 5
Marlin/configurator/config/Configuration.h 查看文件

852
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
852
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
853
 //#define FILAMENT_LCD_DISPLAY
853
 //#define FILAMENT_LCD_DISPLAY
854
 
854
 
855
-
856
-
857
-
858
-
859
-
860
 #include "Configuration_adv.h"
855
 #include "Configuration_adv.h"
861
 #include "thermistortables.h"
856
 #include "thermistortables.h"
862
 
857
 

+ 4
- 2
Marlin/dogm_lcd_implementation.h 查看文件

197
 /* Warning: This function is called from interrupt context */
197
 /* Warning: This function is called from interrupt context */
198
 static void lcd_implementation_init() {
198
 static void lcd_implementation_init() {
199
 
199
 
200
-  #if ENABLED(LCD_PIN_BL) // Enable LCD backlight
200
+  #if defined(LCD_PIN_BL) && LCD_PIN_BL > -1 // Enable LCD backlight
201
     pinMode(LCD_PIN_BL, OUTPUT);
201
     pinMode(LCD_PIN_BL, OUTPUT);
202
     digitalWrite(LCD_PIN_BL, HIGH);
202
     digitalWrite(LCD_PIN_BL, HIGH);
203
   #endif
203
   #endif
204
 
204
 
205
-  #if ENABLED(LCD_PIN_RESET)
205
+  #if defined(LCD_PIN_RESET) && LCD_PIN_RESET > -1
206
     pinMode(LCD_PIN_RESET, OUTPUT);
206
     pinMode(LCD_PIN_RESET, OUTPUT);
207
     digitalWrite(LCD_PIN_RESET, HIGH);
207
     digitalWrite(LCD_PIN_RESET, HIGH);
208
   #endif
208
   #endif
209
+
209
   #if DISABLED(MINIPANEL) // setContrast not working for Mini Panel
210
   #if DISABLED(MINIPANEL) // setContrast not working for Mini Panel
210
     u8g.setContrast(lcd_contrast);
211
     u8g.setContrast(lcd_contrast);
211
   #endif
212
   #endif
213
+
212
   // FIXME: remove this workaround
214
   // FIXME: remove this workaround
213
   // Uncomment this if you have the first generation (V1.10) of STBs board
215
   // Uncomment this if you have the first generation (V1.10) of STBs board
214
   // pinMode(17, OUTPUT); // Enable LCD backlight
216
   // pinMode(17, OUTPUT); // Enable LCD backlight

+ 1
- 6
Marlin/example_configurations/Felix/Configuration.h 查看文件

725
 
725
 
726
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
726
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
727
 //#define LCD_I2C_VIKI
727
 //#define LCD_I2C_VIKI
728
-  
728
+
729
 // SSD1306 OLED generic display support
729
 // SSD1306 OLED generic display support
730
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
730
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
731
 //#define U8GLIB_SSD1306
731
 //#define U8GLIB_SSD1306
835
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
835
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
836
 //#define FILAMENT_LCD_DISPLAY
836
 //#define FILAMENT_LCD_DISPLAY
837
 
837
 
838
-
839
-
840
-
841
-
842
-
843
 #include "Configuration_adv.h"
838
 #include "Configuration_adv.h"
844
 #include "thermistortables.h"
839
 #include "thermistortables.h"
845
 
840
 

+ 2
- 7
Marlin/example_configurations/Felix/Configuration_DUAL.h 查看文件

366
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
366
   #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
367
   #define FILAMENT_RUNOUT_SCRIPT "M600"
367
   #define FILAMENT_RUNOUT_SCRIPT "M600"
368
 #endif
368
 #endif
369
-  
369
+
370
 //===========================================================================
370
 //===========================================================================
371
 //=========================== Manual Bed Leveling ===========================
371
 //=========================== Manual Bed Leveling ===========================
372
 //===========================================================================
372
 //===========================================================================
459
 
459
 
460
 //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
460
 //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
461
                                                                             // Useful to retract a deployable Z probe.
461
                                                                             // Useful to retract a deployable Z probe.
462
-                                                                           
462
+
463
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
463
   //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
464
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
464
   //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
465
 
465
 
799
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
799
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
800
 //#define FILAMENT_LCD_DISPLAY
800
 //#define FILAMENT_LCD_DISPLAY
801
 
801
 
802
-
803
-
804
-
805
-
806
-
807
 #include "Configuration_adv.h"
802
 #include "Configuration_adv.h"
808
 #include "thermistortables.h"
803
 #include "thermistortables.h"
809
 
804
 

+ 40
- 43
Marlin/example_configurations/Felix/Configuration_adv.h 查看文件

145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
146
 
146
 
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
148
-  // That way the machine is capable to align the bed during home, since both Z steppers are homed. 
148
+  // That way the machine is capable to align the bed during home, since both Z steppers are homed.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
343
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
343
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
344
   // we don't have a big font for Cyrillic, Kana
344
   // we don't have a big font for Cyrillic, Kana
345
   //#define USE_BIG_EDIT_FONT
345
   //#define USE_BIG_EDIT_FONT
346
- 
347
-  // If you have spare 2300Byte of progmem and want to use a 
346
+
347
+  // If you have spare 2300Byte of progmem and want to use a
348
   // smaller font on the Info-screen uncomment the next line.
348
   // smaller font on the Info-screen uncomment the next line.
349
   //#define USE_SMALL_INFOFONT
349
   //#define USE_SMALL_INFOFONT
350
 #endif // DOGLCD
350
 #endif // DOGLCD
466
 #endif
466
 #endif
467
 
467
 
468
 /******************************************************************************\
468
 /******************************************************************************\
469
- * enable this section if you have TMC26X motor drivers. 
469
+ * enable this section if you have TMC26X motor drivers.
470
  * you need to import the TMC26XStepper library into the arduino IDE for this
470
  * you need to import the TMC26XStepper library into the arduino IDE for this
471
  ******************************************************************************/
471
  ******************************************************************************/
472
 
472
 
479
   #define X_MAX_CURRENT 1000  //in mA
479
   #define X_MAX_CURRENT 1000  //in mA
480
   #define X_SENSE_RESISTOR 91 //in mOhms
480
   #define X_SENSE_RESISTOR 91 //in mOhms
481
   #define X_MICROSTEPS 16     //number of microsteps
481
   #define X_MICROSTEPS 16     //number of microsteps
482
-  
482
+
483
 //#define X2_IS_TMC
483
 //#define X2_IS_TMC
484
   #define X2_MAX_CURRENT 1000  //in mA
484
   #define X2_MAX_CURRENT 1000  //in mA
485
   #define X2_SENSE_RESISTOR 91 //in mOhms
485
   #define X2_SENSE_RESISTOR 91 //in mOhms
486
   #define X2_MICROSTEPS 16     //number of microsteps
486
   #define X2_MICROSTEPS 16     //number of microsteps
487
-  
487
+
488
 //#define Y_IS_TMC
488
 //#define Y_IS_TMC
489
   #define Y_MAX_CURRENT 1000  //in mA
489
   #define Y_MAX_CURRENT 1000  //in mA
490
   #define Y_SENSE_RESISTOR 91 //in mOhms
490
   #define Y_SENSE_RESISTOR 91 //in mOhms
491
   #define Y_MICROSTEPS 16     //number of microsteps
491
   #define Y_MICROSTEPS 16     //number of microsteps
492
-  
492
+
493
 //#define Y2_IS_TMC
493
 //#define Y2_IS_TMC
494
   #define Y2_MAX_CURRENT 1000  //in mA
494
   #define Y2_MAX_CURRENT 1000  //in mA
495
   #define Y2_SENSE_RESISTOR 91 //in mOhms
495
   #define Y2_SENSE_RESISTOR 91 //in mOhms
496
-  #define Y2_MICROSTEPS 16     //number of microsteps 
497
-  
496
+  #define Y2_MICROSTEPS 16     //number of microsteps
497
+
498
 //#define Z_IS_TMC
498
 //#define Z_IS_TMC
499
   #define Z_MAX_CURRENT 1000  //in mA
499
   #define Z_MAX_CURRENT 1000  //in mA
500
   #define Z_SENSE_RESISTOR 91 //in mOhms
500
   #define Z_SENSE_RESISTOR 91 //in mOhms
501
   #define Z_MICROSTEPS 16     //number of microsteps
501
   #define Z_MICROSTEPS 16     //number of microsteps
502
-  
502
+
503
 //#define Z2_IS_TMC
503
 //#define Z2_IS_TMC
504
   #define Z2_MAX_CURRENT 1000  //in mA
504
   #define Z2_MAX_CURRENT 1000  //in mA
505
   #define Z2_SENSE_RESISTOR 91 //in mOhms
505
   #define Z2_SENSE_RESISTOR 91 //in mOhms
506
   #define Z2_MICROSTEPS 16     //number of microsteps
506
   #define Z2_MICROSTEPS 16     //number of microsteps
507
-  
507
+
508
 //#define E0_IS_TMC
508
 //#define E0_IS_TMC
509
   #define E0_MAX_CURRENT 1000  //in mA
509
   #define E0_MAX_CURRENT 1000  //in mA
510
   #define E0_SENSE_RESISTOR 91 //in mOhms
510
   #define E0_SENSE_RESISTOR 91 //in mOhms
511
   #define E0_MICROSTEPS 16     //number of microsteps
511
   #define E0_MICROSTEPS 16     //number of microsteps
512
-  
512
+
513
 //#define E1_IS_TMC
513
 //#define E1_IS_TMC
514
   #define E1_MAX_CURRENT 1000  //in mA
514
   #define E1_MAX_CURRENT 1000  //in mA
515
   #define E1_SENSE_RESISTOR 91 //in mOhms
515
   #define E1_SENSE_RESISTOR 91 //in mOhms
516
-  #define E1_MICROSTEPS 16     //number of microsteps 
517
-  
516
+  #define E1_MICROSTEPS 16     //number of microsteps
517
+
518
 //#define E2_IS_TMC
518
 //#define E2_IS_TMC
519
   #define E2_MAX_CURRENT 1000  //in mA
519
   #define E2_MAX_CURRENT 1000  //in mA
520
   #define E2_SENSE_RESISTOR 91 //in mOhms
520
   #define E2_SENSE_RESISTOR 91 //in mOhms
521
-  #define E2_MICROSTEPS 16     //number of microsteps 
522
-  
521
+  #define E2_MICROSTEPS 16     //number of microsteps
522
+
523
 //#define E3_IS_TMC
523
 //#define E3_IS_TMC
524
   #define E3_MAX_CURRENT 1000  //in mA
524
   #define E3_MAX_CURRENT 1000  //in mA
525
   #define E3_SENSE_RESISTOR 91 //in mOhms
525
   #define E3_SENSE_RESISTOR 91 //in mOhms
526
-  #define E3_MICROSTEPS 16     //number of microsteps   
526
+  #define E3_MICROSTEPS 16     //number of microsteps
527
 
527
 
528
 #endif
528
 #endif
529
 
529
 
530
 /******************************************************************************\
530
 /******************************************************************************\
531
- * enable this section if you have L6470  motor drivers. 
531
+ * enable this section if you have L6470  motor drivers.
532
  * you need to import the L6470 library into the arduino IDE for this
532
  * you need to import the L6470 library into the arduino IDE for this
533
  ******************************************************************************/
533
  ******************************************************************************/
534
 
534
 
539
 
539
 
540
 //#define X_IS_L6470
540
 //#define X_IS_L6470
541
   #define X_MICROSTEPS 16     //number of microsteps
541
   #define X_MICROSTEPS 16     //number of microsteps
542
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
542
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
543
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
543
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
544
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
544
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
545
-  
545
+
546
 //#define X2_IS_L6470
546
 //#define X2_IS_L6470
547
   #define X2_MICROSTEPS 16     //number of microsteps
547
   #define X2_MICROSTEPS 16     //number of microsteps
548
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
548
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
549
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
549
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
550
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
550
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
551
-  
551
+
552
 //#define Y_IS_L6470
552
 //#define Y_IS_L6470
553
   #define Y_MICROSTEPS 16     //number of microsteps
553
   #define Y_MICROSTEPS 16     //number of microsteps
554
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
554
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
555
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
555
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
556
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
556
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557
-  
557
+
558
 //#define Y2_IS_L6470
558
 //#define Y2_IS_L6470
559
-  #define Y2_MICROSTEPS 16     //number of microsteps 
560
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
559
+  #define Y2_MICROSTEPS 16     //number of microsteps
560
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
561
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
561
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
562
-  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
563
-  
562
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
563
+
564
 //#define Z_IS_L6470
564
 //#define Z_IS_L6470
565
   #define Z_MICROSTEPS 16     //number of microsteps
565
   #define Z_MICROSTEPS 16     //number of microsteps
566
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
566
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
567
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
567
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
568
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
568
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
569
-  
569
+
570
 //#define Z2_IS_L6470
570
 //#define Z2_IS_L6470
571
   #define Z2_MICROSTEPS 16     //number of microsteps
571
   #define Z2_MICROSTEPS 16     //number of microsteps
572
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
572
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
573
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
573
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
574
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
574
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
575
-  
575
+
576
 //#define E0_IS_L6470
576
 //#define E0_IS_L6470
577
   #define E0_MICROSTEPS 16     //number of microsteps
577
   #define E0_MICROSTEPS 16     //number of microsteps
578
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
578
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
579
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
579
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
580
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
580
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
581
-  
581
+
582
 //#define E1_IS_L6470
582
 //#define E1_IS_L6470
583
-  #define E1_MICROSTEPS 16     //number of microsteps 
584
   #define E1_MICROSTEPS 16     //number of microsteps
583
   #define E1_MICROSTEPS 16     //number of microsteps
585
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
584
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
586
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
585
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
587
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
586
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
588
-  
587
+
589
 //#define E2_IS_L6470
588
 //#define E2_IS_L6470
590
-  #define E2_MICROSTEPS 16     //number of microsteps 
591
   #define E2_MICROSTEPS 16     //number of microsteps
589
   #define E2_MICROSTEPS 16     //number of microsteps
592
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
590
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
593
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
591
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
594
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
592
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
595
-  
593
+
596
 //#define E3_IS_L6470
594
 //#define E3_IS_L6470
597
-  #define E3_MICROSTEPS 16     //number of microsteps   
598
   #define E3_MICROSTEPS 16     //number of microsteps
595
   #define E3_MICROSTEPS 16     //number of microsteps
599
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
596
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
600
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
597
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
601
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
598
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
602
-  
599
+
603
 #endif
600
 #endif
604
 
601
 
605
 #include "Conditionals.h"
602
 #include "Conditionals.h"

+ 2
- 7
Marlin/example_configurations/Hephestos/Configuration.h 查看文件

79
 
79
 
80
 // Added for BQ
80
 // Added for BQ
81
 #define SOURCE_CODE_URL "http://www.bq.com/gb/downloads-prusa-i3-hephestos.html"
81
 #define SOURCE_CODE_URL "http://www.bq.com/gb/downloads-prusa-i3-hephestos.html"
82
- 
82
+
83
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
83
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
84
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
84
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
85
 //#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
85
 //#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
734
 
734
 
735
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
735
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
736
 //#define LCD_I2C_VIKI
736
 //#define LCD_I2C_VIKI
737
-  
737
+
738
 // SSD1306 OLED generic display support
738
 // SSD1306 OLED generic display support
739
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
739
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
740
 //#define U8GLIB_SSD1306
740
 //#define U8GLIB_SSD1306
844
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
844
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
845
 //#define FILAMENT_LCD_DISPLAY
845
 //#define FILAMENT_LCD_DISPLAY
846
 
846
 
847
-
848
-
849
-
850
-
851
-
852
 #include "Configuration_adv.h"
847
 #include "Configuration_adv.h"
853
 #include "thermistortables.h"
848
 #include "thermistortables.h"
854
 
849
 

+ 40
- 43
Marlin/example_configurations/Hephestos/Configuration_adv.h 查看文件

145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
146
 
146
 
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
148
-  // That way the machine is capable to align the bed during home, since both Z steppers are homed. 
148
+  // That way the machine is capable to align the bed during home, since both Z steppers are homed.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
343
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
343
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
344
   // we don't have a big font for Cyrillic, Kana
344
   // we don't have a big font for Cyrillic, Kana
345
   //#define USE_BIG_EDIT_FONT
345
   //#define USE_BIG_EDIT_FONT
346
- 
347
-  // If you have spare 2300Byte of progmem and want to use a 
346
+
347
+  // If you have spare 2300Byte of progmem and want to use a
348
   // smaller font on the Info-screen uncomment the next line.
348
   // smaller font on the Info-screen uncomment the next line.
349
   //#define USE_SMALL_INFOFONT
349
   //#define USE_SMALL_INFOFONT
350
 #endif // DOGLCD
350
 #endif // DOGLCD
466
 #endif
466
 #endif
467
 
467
 
468
 /******************************************************************************\
468
 /******************************************************************************\
469
- * enable this section if you have TMC26X motor drivers. 
469
+ * enable this section if you have TMC26X motor drivers.
470
  * you need to import the TMC26XStepper library into the arduino IDE for this
470
  * you need to import the TMC26XStepper library into the arduino IDE for this
471
  ******************************************************************************/
471
  ******************************************************************************/
472
 
472
 
479
   #define X_MAX_CURRENT 1000  //in mA
479
   #define X_MAX_CURRENT 1000  //in mA
480
   #define X_SENSE_RESISTOR 91 //in mOhms
480
   #define X_SENSE_RESISTOR 91 //in mOhms
481
   #define X_MICROSTEPS 16     //number of microsteps
481
   #define X_MICROSTEPS 16     //number of microsteps
482
-  
482
+
483
 //#define X2_IS_TMC
483
 //#define X2_IS_TMC
484
   #define X2_MAX_CURRENT 1000  //in mA
484
   #define X2_MAX_CURRENT 1000  //in mA
485
   #define X2_SENSE_RESISTOR 91 //in mOhms
485
   #define X2_SENSE_RESISTOR 91 //in mOhms
486
   #define X2_MICROSTEPS 16     //number of microsteps
486
   #define X2_MICROSTEPS 16     //number of microsteps
487
-  
487
+
488
 //#define Y_IS_TMC
488
 //#define Y_IS_TMC
489
   #define Y_MAX_CURRENT 1000  //in mA
489
   #define Y_MAX_CURRENT 1000  //in mA
490
   #define Y_SENSE_RESISTOR 91 //in mOhms
490
   #define Y_SENSE_RESISTOR 91 //in mOhms
491
   #define Y_MICROSTEPS 16     //number of microsteps
491
   #define Y_MICROSTEPS 16     //number of microsteps
492
-  
492
+
493
 //#define Y2_IS_TMC
493
 //#define Y2_IS_TMC
494
   #define Y2_MAX_CURRENT 1000  //in mA
494
   #define Y2_MAX_CURRENT 1000  //in mA
495
   #define Y2_SENSE_RESISTOR 91 //in mOhms
495
   #define Y2_SENSE_RESISTOR 91 //in mOhms
496
-  #define Y2_MICROSTEPS 16     //number of microsteps 
497
-  
496
+  #define Y2_MICROSTEPS 16     //number of microsteps
497
+
498
 //#define Z_IS_TMC
498
 //#define Z_IS_TMC
499
   #define Z_MAX_CURRENT 1000  //in mA
499
   #define Z_MAX_CURRENT 1000  //in mA
500
   #define Z_SENSE_RESISTOR 91 //in mOhms
500
   #define Z_SENSE_RESISTOR 91 //in mOhms
501
   #define Z_MICROSTEPS 16     //number of microsteps
501
   #define Z_MICROSTEPS 16     //number of microsteps
502
-  
502
+
503
 //#define Z2_IS_TMC
503
 //#define Z2_IS_TMC
504
   #define Z2_MAX_CURRENT 1000  //in mA
504
   #define Z2_MAX_CURRENT 1000  //in mA
505
   #define Z2_SENSE_RESISTOR 91 //in mOhms
505
   #define Z2_SENSE_RESISTOR 91 //in mOhms
506
   #define Z2_MICROSTEPS 16     //number of microsteps
506
   #define Z2_MICROSTEPS 16     //number of microsteps
507
-  
507
+
508
 //#define E0_IS_TMC
508
 //#define E0_IS_TMC
509
   #define E0_MAX_CURRENT 1000  //in mA
509
   #define E0_MAX_CURRENT 1000  //in mA
510
   #define E0_SENSE_RESISTOR 91 //in mOhms
510
   #define E0_SENSE_RESISTOR 91 //in mOhms
511
   #define E0_MICROSTEPS 16     //number of microsteps
511
   #define E0_MICROSTEPS 16     //number of microsteps
512
-  
512
+
513
 //#define E1_IS_TMC
513
 //#define E1_IS_TMC
514
   #define E1_MAX_CURRENT 1000  //in mA
514
   #define E1_MAX_CURRENT 1000  //in mA
515
   #define E1_SENSE_RESISTOR 91 //in mOhms
515
   #define E1_SENSE_RESISTOR 91 //in mOhms
516
-  #define E1_MICROSTEPS 16     //number of microsteps 
517
-  
516
+  #define E1_MICROSTEPS 16     //number of microsteps
517
+
518
 //#define E2_IS_TMC
518
 //#define E2_IS_TMC
519
   #define E2_MAX_CURRENT 1000  //in mA
519
   #define E2_MAX_CURRENT 1000  //in mA
520
   #define E2_SENSE_RESISTOR 91 //in mOhms
520
   #define E2_SENSE_RESISTOR 91 //in mOhms
521
-  #define E2_MICROSTEPS 16     //number of microsteps 
522
-  
521
+  #define E2_MICROSTEPS 16     //number of microsteps
522
+
523
 //#define E3_IS_TMC
523
 //#define E3_IS_TMC
524
   #define E3_MAX_CURRENT 1000  //in mA
524
   #define E3_MAX_CURRENT 1000  //in mA
525
   #define E3_SENSE_RESISTOR 91 //in mOhms
525
   #define E3_SENSE_RESISTOR 91 //in mOhms
526
-  #define E3_MICROSTEPS 16     //number of microsteps   
526
+  #define E3_MICROSTEPS 16     //number of microsteps
527
 
527
 
528
 #endif
528
 #endif
529
 
529
 
530
 /******************************************************************************\
530
 /******************************************************************************\
531
- * enable this section if you have L6470  motor drivers. 
531
+ * enable this section if you have L6470  motor drivers.
532
  * you need to import the L6470 library into the arduino IDE for this
532
  * you need to import the L6470 library into the arduino IDE for this
533
  ******************************************************************************/
533
  ******************************************************************************/
534
 
534
 
539
 
539
 
540
 //#define X_IS_L6470
540
 //#define X_IS_L6470
541
   #define X_MICROSTEPS 16     //number of microsteps
541
   #define X_MICROSTEPS 16     //number of microsteps
542
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
542
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
543
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
543
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
544
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
544
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
545
-  
545
+
546
 //#define X2_IS_L6470
546
 //#define X2_IS_L6470
547
   #define X2_MICROSTEPS 16     //number of microsteps
547
   #define X2_MICROSTEPS 16     //number of microsteps
548
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
548
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
549
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
549
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
550
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
550
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
551
-  
551
+
552
 //#define Y_IS_L6470
552
 //#define Y_IS_L6470
553
   #define Y_MICROSTEPS 16     //number of microsteps
553
   #define Y_MICROSTEPS 16     //number of microsteps
554
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
554
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
555
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
555
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
556
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
556
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557
-  
557
+
558
 //#define Y2_IS_L6470
558
 //#define Y2_IS_L6470
559
-  #define Y2_MICROSTEPS 16     //number of microsteps 
560
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
559
+  #define Y2_MICROSTEPS 16     //number of microsteps
560
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
561
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
561
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
562
-  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
563
-  
562
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
563
+
564
 //#define Z_IS_L6470
564
 //#define Z_IS_L6470
565
   #define Z_MICROSTEPS 16     //number of microsteps
565
   #define Z_MICROSTEPS 16     //number of microsteps
566
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
566
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
567
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
567
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
568
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
568
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
569
-  
569
+
570
 //#define Z2_IS_L6470
570
 //#define Z2_IS_L6470
571
   #define Z2_MICROSTEPS 16     //number of microsteps
571
   #define Z2_MICROSTEPS 16     //number of microsteps
572
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
572
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
573
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
573
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
574
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
574
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
575
-  
575
+
576
 //#define E0_IS_L6470
576
 //#define E0_IS_L6470
577
   #define E0_MICROSTEPS 16     //number of microsteps
577
   #define E0_MICROSTEPS 16     //number of microsteps
578
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
578
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
579
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
579
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
580
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
580
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
581
-  
581
+
582
 //#define E1_IS_L6470
582
 //#define E1_IS_L6470
583
-  #define E1_MICROSTEPS 16     //number of microsteps 
584
   #define E1_MICROSTEPS 16     //number of microsteps
583
   #define E1_MICROSTEPS 16     //number of microsteps
585
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
584
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
586
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
585
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
587
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
586
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
588
-  
587
+
589
 //#define E2_IS_L6470
588
 //#define E2_IS_L6470
590
-  #define E2_MICROSTEPS 16     //number of microsteps 
591
   #define E2_MICROSTEPS 16     //number of microsteps
589
   #define E2_MICROSTEPS 16     //number of microsteps
592
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
590
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
593
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
591
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
594
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
592
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
595
-  
593
+
596
 //#define E3_IS_L6470
594
 //#define E3_IS_L6470
597
-  #define E3_MICROSTEPS 16     //number of microsteps   
598
   #define E3_MICROSTEPS 16     //number of microsteps
595
   #define E3_MICROSTEPS 16     //number of microsteps
599
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
596
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
600
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
597
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
601
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
598
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
602
-  
599
+
603
 #endif
600
 #endif
604
 
601
 
605
 #include "Conditionals.h"
602
 #include "Conditionals.h"

+ 1
- 6
Marlin/example_configurations/K8200/Configuration.h 查看文件

730
 
730
 
731
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
731
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
732
 //#define LCD_I2C_VIKI
732
 //#define LCD_I2C_VIKI
733
-  
733
+
734
 // SSD1306 OLED generic display support
734
 // SSD1306 OLED generic display support
735
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
735
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
736
 //#define U8GLIB_SSD1306
736
 //#define U8GLIB_SSD1306
840
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
840
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
841
 //#define FILAMENT_LCD_DISPLAY
841
 //#define FILAMENT_LCD_DISPLAY
842
 
842
 
843
-
844
-
845
-
846
-
847
-
848
 #include "Configuration_adv.h"
843
 #include "Configuration_adv.h"
849
 #include "thermistortables.h"
844
 #include "thermistortables.h"
850
 
845
 

+ 40
- 43
Marlin/example_configurations/K8200/Configuration_adv.h 查看文件

145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
146
 
146
 
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
148
-  // That way the machine is capable to align the bed during home, since both Z steppers are homed. 
148
+  // That way the machine is capable to align the bed during home, since both Z steppers are homed.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
343
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
343
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
344
   // we don't have a big font for Cyrillic, Kana
344
   // we don't have a big font for Cyrillic, Kana
345
   //#define USE_BIG_EDIT_FONT
345
   //#define USE_BIG_EDIT_FONT
346
- 
347
-  // If you have spare 2300Byte of progmem and want to use a 
346
+
347
+  // If you have spare 2300Byte of progmem and want to use a
348
   // smaller font on the Info-screen uncomment the next line.
348
   // smaller font on the Info-screen uncomment the next line.
349
   //#define USE_SMALL_INFOFONT
349
   //#define USE_SMALL_INFOFONT
350
 #endif // DOGLCD
350
 #endif // DOGLCD
466
 #endif
466
 #endif
467
 
467
 
468
 /******************************************************************************\
468
 /******************************************************************************\
469
- * enable this section if you have TMC26X motor drivers. 
469
+ * enable this section if you have TMC26X motor drivers.
470
  * you need to import the TMC26XStepper library into the arduino IDE for this
470
  * you need to import the TMC26XStepper library into the arduino IDE for this
471
  ******************************************************************************/
471
  ******************************************************************************/
472
 
472
 
479
   #define X_MAX_CURRENT 1000  //in mA
479
   #define X_MAX_CURRENT 1000  //in mA
480
   #define X_SENSE_RESISTOR 91 //in mOhms
480
   #define X_SENSE_RESISTOR 91 //in mOhms
481
   #define X_MICROSTEPS 16     //number of microsteps
481
   #define X_MICROSTEPS 16     //number of microsteps
482
-  
482
+
483
 //#define X2_IS_TMC
483
 //#define X2_IS_TMC
484
   #define X2_MAX_CURRENT 1000  //in mA
484
   #define X2_MAX_CURRENT 1000  //in mA
485
   #define X2_SENSE_RESISTOR 91 //in mOhms
485
   #define X2_SENSE_RESISTOR 91 //in mOhms
486
   #define X2_MICROSTEPS 16     //number of microsteps
486
   #define X2_MICROSTEPS 16     //number of microsteps
487
-  
487
+
488
 //#define Y_IS_TMC
488
 //#define Y_IS_TMC
489
   #define Y_MAX_CURRENT 1000  //in mA
489
   #define Y_MAX_CURRENT 1000  //in mA
490
   #define Y_SENSE_RESISTOR 91 //in mOhms
490
   #define Y_SENSE_RESISTOR 91 //in mOhms
491
   #define Y_MICROSTEPS 16     //number of microsteps
491
   #define Y_MICROSTEPS 16     //number of microsteps
492
-  
492
+
493
 //#define Y2_IS_TMC
493
 //#define Y2_IS_TMC
494
   #define Y2_MAX_CURRENT 1000  //in mA
494
   #define Y2_MAX_CURRENT 1000  //in mA
495
   #define Y2_SENSE_RESISTOR 91 //in mOhms
495
   #define Y2_SENSE_RESISTOR 91 //in mOhms
496
-  #define Y2_MICROSTEPS 16     //number of microsteps 
497
-  
496
+  #define Y2_MICROSTEPS 16     //number of microsteps
497
+
498
 //#define Z_IS_TMC
498
 //#define Z_IS_TMC
499
   #define Z_MAX_CURRENT 1000  //in mA
499
   #define Z_MAX_CURRENT 1000  //in mA
500
   #define Z_SENSE_RESISTOR 91 //in mOhms
500
   #define Z_SENSE_RESISTOR 91 //in mOhms
501
   #define Z_MICROSTEPS 16     //number of microsteps
501
   #define Z_MICROSTEPS 16     //number of microsteps
502
-  
502
+
503
 //#define Z2_IS_TMC
503
 //#define Z2_IS_TMC
504
   #define Z2_MAX_CURRENT 1000  //in mA
504
   #define Z2_MAX_CURRENT 1000  //in mA
505
   #define Z2_SENSE_RESISTOR 91 //in mOhms
505
   #define Z2_SENSE_RESISTOR 91 //in mOhms
506
   #define Z2_MICROSTEPS 16     //number of microsteps
506
   #define Z2_MICROSTEPS 16     //number of microsteps
507
-  
507
+
508
 //#define E0_IS_TMC
508
 //#define E0_IS_TMC
509
   #define E0_MAX_CURRENT 1000  //in mA
509
   #define E0_MAX_CURRENT 1000  //in mA
510
   #define E0_SENSE_RESISTOR 91 //in mOhms
510
   #define E0_SENSE_RESISTOR 91 //in mOhms
511
   #define E0_MICROSTEPS 16     //number of microsteps
511
   #define E0_MICROSTEPS 16     //number of microsteps
512
-  
512
+
513
 //#define E1_IS_TMC
513
 //#define E1_IS_TMC
514
   #define E1_MAX_CURRENT 1000  //in mA
514
   #define E1_MAX_CURRENT 1000  //in mA
515
   #define E1_SENSE_RESISTOR 91 //in mOhms
515
   #define E1_SENSE_RESISTOR 91 //in mOhms
516
-  #define E1_MICROSTEPS 16     //number of microsteps 
517
-  
516
+  #define E1_MICROSTEPS 16     //number of microsteps
517
+
518
 //#define E2_IS_TMC
518
 //#define E2_IS_TMC
519
   #define E2_MAX_CURRENT 1000  //in mA
519
   #define E2_MAX_CURRENT 1000  //in mA
520
   #define E2_SENSE_RESISTOR 91 //in mOhms
520
   #define E2_SENSE_RESISTOR 91 //in mOhms
521
-  #define E2_MICROSTEPS 16     //number of microsteps 
522
-  
521
+  #define E2_MICROSTEPS 16     //number of microsteps
522
+
523
 //#define E3_IS_TMC
523
 //#define E3_IS_TMC
524
   #define E3_MAX_CURRENT 1000  //in mA
524
   #define E3_MAX_CURRENT 1000  //in mA
525
   #define E3_SENSE_RESISTOR 91 //in mOhms
525
   #define E3_SENSE_RESISTOR 91 //in mOhms
526
-  #define E3_MICROSTEPS 16     //number of microsteps   
526
+  #define E3_MICROSTEPS 16     //number of microsteps
527
 
527
 
528
 #endif
528
 #endif
529
 
529
 
530
 /******************************************************************************\
530
 /******************************************************************************\
531
- * enable this section if you have L6470  motor drivers. 
531
+ * enable this section if you have L6470  motor drivers.
532
  * you need to import the L6470 library into the arduino IDE for this
532
  * you need to import the L6470 library into the arduino IDE for this
533
  ******************************************************************************/
533
  ******************************************************************************/
534
 
534
 
539
 
539
 
540
 //#define X_IS_L6470
540
 //#define X_IS_L6470
541
   #define X_MICROSTEPS 16     //number of microsteps
541
   #define X_MICROSTEPS 16     //number of microsteps
542
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
542
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
543
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
543
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
544
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
544
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
545
-  
545
+
546
 //#define X2_IS_L6470
546
 //#define X2_IS_L6470
547
   #define X2_MICROSTEPS 16     //number of microsteps
547
   #define X2_MICROSTEPS 16     //number of microsteps
548
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
548
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
549
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
549
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
550
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
550
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
551
-  
551
+
552
 //#define Y_IS_L6470
552
 //#define Y_IS_L6470
553
   #define Y_MICROSTEPS 16     //number of microsteps
553
   #define Y_MICROSTEPS 16     //number of microsteps
554
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
554
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
555
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
555
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
556
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
556
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557
-  
557
+
558
 //#define Y2_IS_L6470
558
 //#define Y2_IS_L6470
559
-  #define Y2_MICROSTEPS 16     //number of microsteps 
560
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
559
+  #define Y2_MICROSTEPS 16     //number of microsteps
560
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
561
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
561
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
562
-  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
563
-  
562
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
563
+
564
 //#define Z_IS_L6470
564
 //#define Z_IS_L6470
565
   #define Z_MICROSTEPS 16     //number of microsteps
565
   #define Z_MICROSTEPS 16     //number of microsteps
566
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
566
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
567
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
567
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
568
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
568
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
569
-  
569
+
570
 //#define Z2_IS_L6470
570
 //#define Z2_IS_L6470
571
   #define Z2_MICROSTEPS 16     //number of microsteps
571
   #define Z2_MICROSTEPS 16     //number of microsteps
572
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
572
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
573
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
573
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
574
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
574
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
575
-  
575
+
576
 //#define E0_IS_L6470
576
 //#define E0_IS_L6470
577
   #define E0_MICROSTEPS 16     //number of microsteps
577
   #define E0_MICROSTEPS 16     //number of microsteps
578
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
578
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
579
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
579
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
580
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
580
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
581
-  
581
+
582
 //#define E1_IS_L6470
582
 //#define E1_IS_L6470
583
-  #define E1_MICROSTEPS 16     //number of microsteps 
584
   #define E1_MICROSTEPS 16     //number of microsteps
583
   #define E1_MICROSTEPS 16     //number of microsteps
585
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
584
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
586
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
585
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
587
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
586
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
588
-  
587
+
589
 //#define E2_IS_L6470
588
 //#define E2_IS_L6470
590
-  #define E2_MICROSTEPS 16     //number of microsteps 
591
   #define E2_MICROSTEPS 16     //number of microsteps
589
   #define E2_MICROSTEPS 16     //number of microsteps
592
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
590
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
593
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
591
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
594
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
592
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
595
-  
593
+
596
 //#define E3_IS_L6470
594
 //#define E3_IS_L6470
597
-  #define E3_MICROSTEPS 16     //number of microsteps   
598
   #define E3_MICROSTEPS 16     //number of microsteps
595
   #define E3_MICROSTEPS 16     //number of microsteps
599
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
596
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
600
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
597
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
601
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
598
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
602
-  
599
+
603
 #endif
600
 #endif
604
 
601
 
605
 #include "Conditionals.h"
602
 #include "Conditionals.h"

+ 1
- 6
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h 查看文件

742
 
742
 
743
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
743
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
744
 //#define LCD_I2C_VIKI
744
 //#define LCD_I2C_VIKI
745
-  
745
+
746
 // SSD1306 OLED generic display support
746
 // SSD1306 OLED generic display support
747
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
747
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
748
 //#define U8GLIB_SSD1306
748
 //#define U8GLIB_SSD1306
852
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
852
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
853
 //#define FILAMENT_LCD_DISPLAY
853
 //#define FILAMENT_LCD_DISPLAY
854
 
854
 
855
-
856
-
857
-
858
-
859
-
860
 #include "Configuration_adv.h"
855
 #include "Configuration_adv.h"
861
 #include "thermistortables.h"
856
 #include "thermistortables.h"
862
 
857
 

+ 1
- 6
Marlin/example_configurations/RigidBot/Configuration.h 查看文件

732
 
732
 
733
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
733
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
734
 //#define LCD_I2C_VIKI
734
 //#define LCD_I2C_VIKI
735
-  
735
+
736
 // SSD1306 OLED generic display support
736
 // SSD1306 OLED generic display support
737
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
737
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
738
 //#define U8GLIB_SSD1306
738
 //#define U8GLIB_SSD1306
842
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
842
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
843
 //#define FILAMENT_LCD_DISPLAY
843
 //#define FILAMENT_LCD_DISPLAY
844
 
844
 
845
-
846
-
847
-
848
-
849
-
850
 #include "Configuration_adv.h"
845
 #include "Configuration_adv.h"
851
 #include "thermistortables.h"
846
 #include "thermistortables.h"
852
 
847
 

+ 40
- 43
Marlin/example_configurations/RigidBot/Configuration_adv.h 查看文件

137
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
137
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
138
 
138
 
139
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
139
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
140
-  // That way the machine is capable to align the bed during home, since both Z steppers are homed. 
140
+  // That way the machine is capable to align the bed during home, since both Z steppers are homed.
141
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
141
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
142
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
142
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
143
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
143
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
336
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
336
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
337
   // we don't have a big font for Cyrillic, Kana
337
   // we don't have a big font for Cyrillic, Kana
338
   //#define USE_BIG_EDIT_FONT
338
   //#define USE_BIG_EDIT_FONT
339
- 
340
-  // If you have spare 2300Byte of progmem and want to use a 
339
+
340
+  // If you have spare 2300Byte of progmem and want to use a
341
   // smaller font on the Info-screen uncomment the next line.
341
   // smaller font on the Info-screen uncomment the next line.
342
   //#define USE_SMALL_INFOFONT
342
   //#define USE_SMALL_INFOFONT
343
 #endif // DOGLCD
343
 #endif // DOGLCD
461
 #endif
461
 #endif
462
 
462
 
463
 /******************************************************************************\
463
 /******************************************************************************\
464
- * enable this section if you have TMC26X motor drivers. 
464
+ * enable this section if you have TMC26X motor drivers.
465
  * you need to import the TMC26XStepper library into the arduino IDE for this
465
  * you need to import the TMC26XStepper library into the arduino IDE for this
466
  ******************************************************************************/
466
  ******************************************************************************/
467
 
467
 
474
   #define X_MAX_CURRENT 1000  //in mA
474
   #define X_MAX_CURRENT 1000  //in mA
475
   #define X_SENSE_RESISTOR 91 //in mOhms
475
   #define X_SENSE_RESISTOR 91 //in mOhms
476
   #define X_MICROSTEPS 16     //number of microsteps
476
   #define X_MICROSTEPS 16     //number of microsteps
477
-  
477
+
478
 //#define X2_IS_TMC
478
 //#define X2_IS_TMC
479
   #define X2_MAX_CURRENT 1000  //in mA
479
   #define X2_MAX_CURRENT 1000  //in mA
480
   #define X2_SENSE_RESISTOR 91 //in mOhms
480
   #define X2_SENSE_RESISTOR 91 //in mOhms
481
   #define X2_MICROSTEPS 16     //number of microsteps
481
   #define X2_MICROSTEPS 16     //number of microsteps
482
-  
482
+
483
 //#define Y_IS_TMC
483
 //#define Y_IS_TMC
484
   #define Y_MAX_CURRENT 1000  //in mA
484
   #define Y_MAX_CURRENT 1000  //in mA
485
   #define Y_SENSE_RESISTOR 91 //in mOhms
485
   #define Y_SENSE_RESISTOR 91 //in mOhms
486
   #define Y_MICROSTEPS 16     //number of microsteps
486
   #define Y_MICROSTEPS 16     //number of microsteps
487
-  
487
+
488
 //#define Y2_IS_TMC
488
 //#define Y2_IS_TMC
489
   #define Y2_MAX_CURRENT 1000  //in mA
489
   #define Y2_MAX_CURRENT 1000  //in mA
490
   #define Y2_SENSE_RESISTOR 91 //in mOhms
490
   #define Y2_SENSE_RESISTOR 91 //in mOhms
491
-  #define Y2_MICROSTEPS 16     //number of microsteps 
492
-  
491
+  #define Y2_MICROSTEPS 16     //number of microsteps
492
+
493
 //#define Z_IS_TMC
493
 //#define Z_IS_TMC
494
   #define Z_MAX_CURRENT 1000  //in mA
494
   #define Z_MAX_CURRENT 1000  //in mA
495
   #define Z_SENSE_RESISTOR 91 //in mOhms
495
   #define Z_SENSE_RESISTOR 91 //in mOhms
496
   #define Z_MICROSTEPS 16     //number of microsteps
496
   #define Z_MICROSTEPS 16     //number of microsteps
497
-  
497
+
498
 //#define Z2_IS_TMC
498
 //#define Z2_IS_TMC
499
   #define Z2_MAX_CURRENT 1000  //in mA
499
   #define Z2_MAX_CURRENT 1000  //in mA
500
   #define Z2_SENSE_RESISTOR 91 //in mOhms
500
   #define Z2_SENSE_RESISTOR 91 //in mOhms
501
   #define Z2_MICROSTEPS 16     //number of microsteps
501
   #define Z2_MICROSTEPS 16     //number of microsteps
502
-  
502
+
503
 //#define E0_IS_TMC
503
 //#define E0_IS_TMC
504
   #define E0_MAX_CURRENT 1000  //in mA
504
   #define E0_MAX_CURRENT 1000  //in mA
505
   #define E0_SENSE_RESISTOR 91 //in mOhms
505
   #define E0_SENSE_RESISTOR 91 //in mOhms
506
   #define E0_MICROSTEPS 16     //number of microsteps
506
   #define E0_MICROSTEPS 16     //number of microsteps
507
-  
507
+
508
 //#define E1_IS_TMC
508
 //#define E1_IS_TMC
509
   #define E1_MAX_CURRENT 1000  //in mA
509
   #define E1_MAX_CURRENT 1000  //in mA
510
   #define E1_SENSE_RESISTOR 91 //in mOhms
510
   #define E1_SENSE_RESISTOR 91 //in mOhms
511
-  #define E1_MICROSTEPS 16     //number of microsteps 
512
-  
511
+  #define E1_MICROSTEPS 16     //number of microsteps
512
+
513
 //#define E2_IS_TMC
513
 //#define E2_IS_TMC
514
   #define E2_MAX_CURRENT 1000  //in mA
514
   #define E2_MAX_CURRENT 1000  //in mA
515
   #define E2_SENSE_RESISTOR 91 //in mOhms
515
   #define E2_SENSE_RESISTOR 91 //in mOhms
516
-  #define E2_MICROSTEPS 16     //number of microsteps 
517
-  
516
+  #define E2_MICROSTEPS 16     //number of microsteps
517
+
518
 //#define E3_IS_TMC
518
 //#define E3_IS_TMC
519
   #define E3_MAX_CURRENT 1000  //in mA
519
   #define E3_MAX_CURRENT 1000  //in mA
520
   #define E3_SENSE_RESISTOR 91 //in mOhms
520
   #define E3_SENSE_RESISTOR 91 //in mOhms
521
-  #define E3_MICROSTEPS 16     //number of microsteps   
521
+  #define E3_MICROSTEPS 16     //number of microsteps
522
 
522
 
523
 #endif
523
 #endif
524
 
524
 
525
 /******************************************************************************\
525
 /******************************************************************************\
526
- * enable this section if you have L6470  motor drivers. 
526
+ * enable this section if you have L6470  motor drivers.
527
  * you need to import the L6470 library into the arduino IDE for this
527
  * you need to import the L6470 library into the arduino IDE for this
528
  ******************************************************************************/
528
  ******************************************************************************/
529
 
529
 
534
 
534
 
535
 //#define X_IS_L6470
535
 //#define X_IS_L6470
536
   #define X_MICROSTEPS 16     //number of microsteps
536
   #define X_MICROSTEPS 16     //number of microsteps
537
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
537
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
538
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
538
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
539
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
539
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
540
-  
540
+
541
 //#define X2_IS_L6470
541
 //#define X2_IS_L6470
542
   #define X2_MICROSTEPS 16     //number of microsteps
542
   #define X2_MICROSTEPS 16     //number of microsteps
543
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
543
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
544
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
544
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
545
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
545
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
546
-  
546
+
547
 //#define Y_IS_L6470
547
 //#define Y_IS_L6470
548
   #define Y_MICROSTEPS 16     //number of microsteps
548
   #define Y_MICROSTEPS 16     //number of microsteps
549
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
549
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
550
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
550
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
551
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
551
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
552
-  
552
+
553
 //#define Y2_IS_L6470
553
 //#define Y2_IS_L6470
554
-  #define Y2_MICROSTEPS 16     //number of microsteps 
555
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
554
+  #define Y2_MICROSTEPS 16     //number of microsteps
555
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
556
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
556
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
557
-  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
558
-  
557
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
558
+
559
 //#define Z_IS_L6470
559
 //#define Z_IS_L6470
560
   #define Z_MICROSTEPS 16     //number of microsteps
560
   #define Z_MICROSTEPS 16     //number of microsteps
561
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
561
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
562
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
562
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
563
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
563
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
564
-  
564
+
565
 //#define Z2_IS_L6470
565
 //#define Z2_IS_L6470
566
   #define Z2_MICROSTEPS 16     //number of microsteps
566
   #define Z2_MICROSTEPS 16     //number of microsteps
567
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
567
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
568
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
568
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
569
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
569
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
570
-  
570
+
571
 //#define E0_IS_L6470
571
 //#define E0_IS_L6470
572
   #define E0_MICROSTEPS 16     //number of microsteps
572
   #define E0_MICROSTEPS 16     //number of microsteps
573
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
573
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
574
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
574
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
575
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
575
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
576
-  
576
+
577
 //#define E1_IS_L6470
577
 //#define E1_IS_L6470
578
-  #define E1_MICROSTEPS 16     //number of microsteps 
579
   #define E1_MICROSTEPS 16     //number of microsteps
578
   #define E1_MICROSTEPS 16     //number of microsteps
580
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
579
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
581
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
580
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
582
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
581
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
583
-  
582
+
584
 //#define E2_IS_L6470
583
 //#define E2_IS_L6470
585
-  #define E2_MICROSTEPS 16     //number of microsteps 
586
   #define E2_MICROSTEPS 16     //number of microsteps
584
   #define E2_MICROSTEPS 16     //number of microsteps
587
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
585
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
588
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
586
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
589
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
587
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
590
-  
588
+
591
 //#define E3_IS_L6470
589
 //#define E3_IS_L6470
592
-  #define E3_MICROSTEPS 16     //number of microsteps   
593
   #define E3_MICROSTEPS 16     //number of microsteps
590
   #define E3_MICROSTEPS 16     //number of microsteps
594
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
591
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
595
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
592
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
596
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
593
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
597
-  
594
+
598
 #endif
595
 #endif
599
 
596
 
600
 #include "Conditionals.h"
597
 #include "Conditionals.h"

+ 6
- 11
Marlin/example_configurations/SCARA/Configuration.h 查看文件

37
 // QHARLEYS Autobedlevelling has not been ported, because Marlin has now Bed-levelling
37
 // QHARLEYS Autobedlevelling has not been ported, because Marlin has now Bed-levelling
38
 // You might need Z-Min endstop on SCARA-Printer to use this feature. Actually untested!
38
 // You might need Z-Min endstop on SCARA-Printer to use this feature. Actually untested!
39
 // Uncomment to use Morgan scara mode
39
 // Uncomment to use Morgan scara mode
40
-#define SCARA  
40
+#define SCARA
41
 #define SCARA_SEGMENTS_PER_SECOND 200 // If movement is choppy try lowering this value
41
 #define SCARA_SEGMENTS_PER_SECOND 200 // If movement is choppy try lowering this value
42
 // Length of inner support arm
42
 // Length of inner support arm
43
 #define Linkage_1 150 //mm      Preprocessor cannot handle decimal point...
43
 #define Linkage_1 150 //mm      Preprocessor cannot handle decimal point...
44
-// Length of outer support arm     Measure arm lengths precisely and enter 
45
-#define Linkage_2 150 //mm    
44
+// Length of outer support arm     Measure arm lengths precisely and enter
45
+#define Linkage_2 150 //mm
46
 
46
 
47
-// SCARA tower offset (position of Tower relative to bed zero position) 
47
+// SCARA tower offset (position of Tower relative to bed zero position)
48
 // This needs to be reasonably accurate as it defines the printbed position in the SCARA space.
48
 // This needs to be reasonably accurate as it defines the printbed position in the SCARA space.
49
-#define SCARA_offset_x 100 //mm   
49
+#define SCARA_offset_x 100 //mm
50
 #define SCARA_offset_y -56 //mm
50
 #define SCARA_offset_y -56 //mm
51
 #define SCARA_RAD2DEG 57.2957795  // to convert RAD to degrees
51
 #define SCARA_RAD2DEG 57.2957795  // to convert RAD to degrees
52
 
52
 
750
 
750
 
751
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
751
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
752
 //#define LCD_I2C_VIKI
752
 //#define LCD_I2C_VIKI
753
-  
753
+
754
 // SSD1306 OLED generic display support
754
 // SSD1306 OLED generic display support
755
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
755
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
756
 //#define U8GLIB_SSD1306
756
 //#define U8GLIB_SSD1306
860
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
860
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
861
 //#define FILAMENT_LCD_DISPLAY
861
 //#define FILAMENT_LCD_DISPLAY
862
 
862
 
863
-
864
-
865
-
866
-
867
-
868
 #include "Configuration_adv.h"
863
 #include "Configuration_adv.h"
869
 #include "thermistortables.h"
864
 #include "thermistortables.h"
870
 
865
 

+ 40
- 43
Marlin/example_configurations/SCARA/Configuration_adv.h 查看文件

145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
146
 
146
 
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
148
-  // That way the machine is capable to align the bed during home, since both Z steppers are homed. 
148
+  // That way the machine is capable to align the bed during home, since both Z steppers are homed.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
343
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
343
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
344
   // we don't have a big font for Cyrillic, Kana
344
   // we don't have a big font for Cyrillic, Kana
345
   //#define USE_BIG_EDIT_FONT
345
   //#define USE_BIG_EDIT_FONT
346
- 
347
-  // If you have spare 2300Byte of progmem and want to use a 
346
+
347
+  // If you have spare 2300Byte of progmem and want to use a
348
   // smaller font on the Info-screen uncomment the next line.
348
   // smaller font on the Info-screen uncomment the next line.
349
   //#define USE_SMALL_INFOFONT
349
   //#define USE_SMALL_INFOFONT
350
 #endif // DOGLCD
350
 #endif // DOGLCD
466
 #endif
466
 #endif
467
 
467
 
468
 /******************************************************************************\
468
 /******************************************************************************\
469
- * enable this section if you have TMC26X motor drivers. 
469
+ * enable this section if you have TMC26X motor drivers.
470
  * you need to import the TMC26XStepper library into the arduino IDE for this
470
  * you need to import the TMC26XStepper library into the arduino IDE for this
471
  ******************************************************************************/
471
  ******************************************************************************/
472
 
472
 
479
   #define X_MAX_CURRENT 1000  //in mA
479
   #define X_MAX_CURRENT 1000  //in mA
480
   #define X_SENSE_RESISTOR 91 //in mOhms
480
   #define X_SENSE_RESISTOR 91 //in mOhms
481
   #define X_MICROSTEPS 16     //number of microsteps
481
   #define X_MICROSTEPS 16     //number of microsteps
482
-  
482
+
483
 //#define X2_IS_TMC
483
 //#define X2_IS_TMC
484
   #define X2_MAX_CURRENT 1000  //in mA
484
   #define X2_MAX_CURRENT 1000  //in mA
485
   #define X2_SENSE_RESISTOR 91 //in mOhms
485
   #define X2_SENSE_RESISTOR 91 //in mOhms
486
   #define X2_MICROSTEPS 16     //number of microsteps
486
   #define X2_MICROSTEPS 16     //number of microsteps
487
-  
487
+
488
 //#define Y_IS_TMC
488
 //#define Y_IS_TMC
489
   #define Y_MAX_CURRENT 1000  //in mA
489
   #define Y_MAX_CURRENT 1000  //in mA
490
   #define Y_SENSE_RESISTOR 91 //in mOhms
490
   #define Y_SENSE_RESISTOR 91 //in mOhms
491
   #define Y_MICROSTEPS 16     //number of microsteps
491
   #define Y_MICROSTEPS 16     //number of microsteps
492
-  
492
+
493
 //#define Y2_IS_TMC
493
 //#define Y2_IS_TMC
494
   #define Y2_MAX_CURRENT 1000  //in mA
494
   #define Y2_MAX_CURRENT 1000  //in mA
495
   #define Y2_SENSE_RESISTOR 91 //in mOhms
495
   #define Y2_SENSE_RESISTOR 91 //in mOhms
496
-  #define Y2_MICROSTEPS 16     //number of microsteps 
497
-  
496
+  #define Y2_MICROSTEPS 16     //number of microsteps
497
+
498
 //#define Z_IS_TMC
498
 //#define Z_IS_TMC
499
   #define Z_MAX_CURRENT 1000  //in mA
499
   #define Z_MAX_CURRENT 1000  //in mA
500
   #define Z_SENSE_RESISTOR 91 //in mOhms
500
   #define Z_SENSE_RESISTOR 91 //in mOhms
501
   #define Z_MICROSTEPS 16     //number of microsteps
501
   #define Z_MICROSTEPS 16     //number of microsteps
502
-  
502
+
503
 //#define Z2_IS_TMC
503
 //#define Z2_IS_TMC
504
   #define Z2_MAX_CURRENT 1000  //in mA
504
   #define Z2_MAX_CURRENT 1000  //in mA
505
   #define Z2_SENSE_RESISTOR 91 //in mOhms
505
   #define Z2_SENSE_RESISTOR 91 //in mOhms
506
   #define Z2_MICROSTEPS 16     //number of microsteps
506
   #define Z2_MICROSTEPS 16     //number of microsteps
507
-  
507
+
508
 //#define E0_IS_TMC
508
 //#define E0_IS_TMC
509
   #define E0_MAX_CURRENT 1000  //in mA
509
   #define E0_MAX_CURRENT 1000  //in mA
510
   #define E0_SENSE_RESISTOR 91 //in mOhms
510
   #define E0_SENSE_RESISTOR 91 //in mOhms
511
   #define E0_MICROSTEPS 16     //number of microsteps
511
   #define E0_MICROSTEPS 16     //number of microsteps
512
-  
512
+
513
 //#define E1_IS_TMC
513
 //#define E1_IS_TMC
514
   #define E1_MAX_CURRENT 1000  //in mA
514
   #define E1_MAX_CURRENT 1000  //in mA
515
   #define E1_SENSE_RESISTOR 91 //in mOhms
515
   #define E1_SENSE_RESISTOR 91 //in mOhms
516
-  #define E1_MICROSTEPS 16     //number of microsteps 
517
-  
516
+  #define E1_MICROSTEPS 16     //number of microsteps
517
+
518
 //#define E2_IS_TMC
518
 //#define E2_IS_TMC
519
   #define E2_MAX_CURRENT 1000  //in mA
519
   #define E2_MAX_CURRENT 1000  //in mA
520
   #define E2_SENSE_RESISTOR 91 //in mOhms
520
   #define E2_SENSE_RESISTOR 91 //in mOhms
521
-  #define E2_MICROSTEPS 16     //number of microsteps 
522
-  
521
+  #define E2_MICROSTEPS 16     //number of microsteps
522
+
523
 //#define E3_IS_TMC
523
 //#define E3_IS_TMC
524
   #define E3_MAX_CURRENT 1000  //in mA
524
   #define E3_MAX_CURRENT 1000  //in mA
525
   #define E3_SENSE_RESISTOR 91 //in mOhms
525
   #define E3_SENSE_RESISTOR 91 //in mOhms
526
-  #define E3_MICROSTEPS 16     //number of microsteps   
526
+  #define E3_MICROSTEPS 16     //number of microsteps
527
 
527
 
528
 #endif
528
 #endif
529
 
529
 
530
 /******************************************************************************\
530
 /******************************************************************************\
531
- * enable this section if you have L6470  motor drivers. 
531
+ * enable this section if you have L6470  motor drivers.
532
  * you need to import the L6470 library into the arduino IDE for this
532
  * you need to import the L6470 library into the arduino IDE for this
533
  ******************************************************************************/
533
  ******************************************************************************/
534
 
534
 
539
 
539
 
540
 //#define X_IS_L6470
540
 //#define X_IS_L6470
541
   #define X_MICROSTEPS 16     //number of microsteps
541
   #define X_MICROSTEPS 16     //number of microsteps
542
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
542
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
543
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
543
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
544
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
544
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
545
-  
545
+
546
 //#define X2_IS_L6470
546
 //#define X2_IS_L6470
547
   #define X2_MICROSTEPS 16     //number of microsteps
547
   #define X2_MICROSTEPS 16     //number of microsteps
548
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
548
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
549
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
549
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
550
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
550
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
551
-  
551
+
552
 //#define Y_IS_L6470
552
 //#define Y_IS_L6470
553
   #define Y_MICROSTEPS 16     //number of microsteps
553
   #define Y_MICROSTEPS 16     //number of microsteps
554
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
554
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
555
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
555
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
556
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
556
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557
-  
557
+
558
 //#define Y2_IS_L6470
558
 //#define Y2_IS_L6470
559
-  #define Y2_MICROSTEPS 16     //number of microsteps 
560
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
559
+  #define Y2_MICROSTEPS 16     //number of microsteps
560
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
561
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
561
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
562
-  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
563
-  
562
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
563
+
564
 //#define Z_IS_L6470
564
 //#define Z_IS_L6470
565
   #define Z_MICROSTEPS 16     //number of microsteps
565
   #define Z_MICROSTEPS 16     //number of microsteps
566
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
566
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
567
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
567
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
568
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
568
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
569
-  
569
+
570
 //#define Z2_IS_L6470
570
 //#define Z2_IS_L6470
571
   #define Z2_MICROSTEPS 16     //number of microsteps
571
   #define Z2_MICROSTEPS 16     //number of microsteps
572
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
572
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
573
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
573
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
574
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
574
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
575
-  
575
+
576
 //#define E0_IS_L6470
576
 //#define E0_IS_L6470
577
   #define E0_MICROSTEPS 16     //number of microsteps
577
   #define E0_MICROSTEPS 16     //number of microsteps
578
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
578
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
579
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
579
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
580
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
580
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
581
-  
581
+
582
 //#define E1_IS_L6470
582
 //#define E1_IS_L6470
583
-  #define E1_MICROSTEPS 16     //number of microsteps 
584
   #define E1_MICROSTEPS 16     //number of microsteps
583
   #define E1_MICROSTEPS 16     //number of microsteps
585
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
584
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
586
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
585
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
587
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
586
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
588
-  
587
+
589
 //#define E2_IS_L6470
588
 //#define E2_IS_L6470
590
-  #define E2_MICROSTEPS 16     //number of microsteps 
591
   #define E2_MICROSTEPS 16     //number of microsteps
589
   #define E2_MICROSTEPS 16     //number of microsteps
592
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
590
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
593
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
591
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
594
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
592
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
595
-  
593
+
596
 //#define E3_IS_L6470
594
 //#define E3_IS_L6470
597
-  #define E3_MICROSTEPS 16     //number of microsteps   
598
   #define E3_MICROSTEPS 16     //number of microsteps
595
   #define E3_MICROSTEPS 16     //number of microsteps
599
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
596
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
600
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
597
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
601
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
598
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
602
-  
599
+
603
 #endif
600
 #endif
604
 
601
 
605
 #include "Conditionals.h"
602
 #include "Conditionals.h"

+ 1
- 6
Marlin/example_configurations/TAZ4/Configuration.h 查看文件

761
 
761
 
762
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
762
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
763
 //#define LCD_I2C_VIKI
763
 //#define LCD_I2C_VIKI
764
-  
764
+
765
 // SSD1306 OLED generic display support
765
 // SSD1306 OLED generic display support
766
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
766
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
767
 //#define U8GLIB_SSD1306
767
 //#define U8GLIB_SSD1306
871
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
871
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
872
 //#define FILAMENT_LCD_DISPLAY
872
 //#define FILAMENT_LCD_DISPLAY
873
 
873
 
874
-
875
-
876
-
877
-
878
-
879
 #include "Configuration_adv.h"
874
 #include "Configuration_adv.h"
880
 #include "thermistortables.h"
875
 #include "thermistortables.h"
881
 
876
 

+ 40
- 43
Marlin/example_configurations/TAZ4/Configuration_adv.h 查看文件

145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
146
 
146
 
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
148
-  // That way the machine is capable to align the bed during home, since both Z steppers are homed. 
148
+  // That way the machine is capable to align the bed during home, since both Z steppers are homed.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
343
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
343
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
344
   // we don't have a big font for Cyrillic, Kana
344
   // we don't have a big font for Cyrillic, Kana
345
   //#define USE_BIG_EDIT_FONT
345
   //#define USE_BIG_EDIT_FONT
346
- 
347
-  // If you have spare 2300Byte of progmem and want to use a 
346
+
347
+  // If you have spare 2300Byte of progmem and want to use a
348
   // smaller font on the Info-screen uncomment the next line.
348
   // smaller font on the Info-screen uncomment the next line.
349
   //#define USE_SMALL_INFOFONT
349
   //#define USE_SMALL_INFOFONT
350
 #endif // DOGLCD
350
 #endif // DOGLCD
469
 #endif
469
 #endif
470
 
470
 
471
 /******************************************************************************\
471
 /******************************************************************************\
472
- * enable this section if you have TMC26X motor drivers. 
472
+ * enable this section if you have TMC26X motor drivers.
473
  * you need to import the TMC26XStepper library into the arduino IDE for this
473
  * you need to import the TMC26XStepper library into the arduino IDE for this
474
  ******************************************************************************/
474
  ******************************************************************************/
475
 
475
 
482
   #define X_MAX_CURRENT 1000  //in mA
482
   #define X_MAX_CURRENT 1000  //in mA
483
   #define X_SENSE_RESISTOR 91 //in mOhms
483
   #define X_SENSE_RESISTOR 91 //in mOhms
484
   #define X_MICROSTEPS 16     //number of microsteps
484
   #define X_MICROSTEPS 16     //number of microsteps
485
-  
485
+
486
 //#define X2_IS_TMC
486
 //#define X2_IS_TMC
487
   #define X2_MAX_CURRENT 1000  //in mA
487
   #define X2_MAX_CURRENT 1000  //in mA
488
   #define X2_SENSE_RESISTOR 91 //in mOhms
488
   #define X2_SENSE_RESISTOR 91 //in mOhms
489
   #define X2_MICROSTEPS 16     //number of microsteps
489
   #define X2_MICROSTEPS 16     //number of microsteps
490
-  
490
+
491
 //#define Y_IS_TMC
491
 //#define Y_IS_TMC
492
   #define Y_MAX_CURRENT 1000  //in mA
492
   #define Y_MAX_CURRENT 1000  //in mA
493
   #define Y_SENSE_RESISTOR 91 //in mOhms
493
   #define Y_SENSE_RESISTOR 91 //in mOhms
494
   #define Y_MICROSTEPS 16     //number of microsteps
494
   #define Y_MICROSTEPS 16     //number of microsteps
495
-  
495
+
496
 //#define Y2_IS_TMC
496
 //#define Y2_IS_TMC
497
   #define Y2_MAX_CURRENT 1000  //in mA
497
   #define Y2_MAX_CURRENT 1000  //in mA
498
   #define Y2_SENSE_RESISTOR 91 //in mOhms
498
   #define Y2_SENSE_RESISTOR 91 //in mOhms
499
-  #define Y2_MICROSTEPS 16     //number of microsteps 
500
-  
499
+  #define Y2_MICROSTEPS 16     //number of microsteps
500
+
501
 //#define Z_IS_TMC
501
 //#define Z_IS_TMC
502
   #define Z_MAX_CURRENT 1000  //in mA
502
   #define Z_MAX_CURRENT 1000  //in mA
503
   #define Z_SENSE_RESISTOR 91 //in mOhms
503
   #define Z_SENSE_RESISTOR 91 //in mOhms
504
   #define Z_MICROSTEPS 16     //number of microsteps
504
   #define Z_MICROSTEPS 16     //number of microsteps
505
-  
505
+
506
 //#define Z2_IS_TMC
506
 //#define Z2_IS_TMC
507
   #define Z2_MAX_CURRENT 1000  //in mA
507
   #define Z2_MAX_CURRENT 1000  //in mA
508
   #define Z2_SENSE_RESISTOR 91 //in mOhms
508
   #define Z2_SENSE_RESISTOR 91 //in mOhms
509
   #define Z2_MICROSTEPS 16     //number of microsteps
509
   #define Z2_MICROSTEPS 16     //number of microsteps
510
-  
510
+
511
 //#define E0_IS_TMC
511
 //#define E0_IS_TMC
512
   #define E0_MAX_CURRENT 1000  //in mA
512
   #define E0_MAX_CURRENT 1000  //in mA
513
   #define E0_SENSE_RESISTOR 91 //in mOhms
513
   #define E0_SENSE_RESISTOR 91 //in mOhms
514
   #define E0_MICROSTEPS 16     //number of microsteps
514
   #define E0_MICROSTEPS 16     //number of microsteps
515
-  
515
+
516
 //#define E1_IS_TMC
516
 //#define E1_IS_TMC
517
   #define E1_MAX_CURRENT 1000  //in mA
517
   #define E1_MAX_CURRENT 1000  //in mA
518
   #define E1_SENSE_RESISTOR 91 //in mOhms
518
   #define E1_SENSE_RESISTOR 91 //in mOhms
519
-  #define E1_MICROSTEPS 16     //number of microsteps 
520
-  
519
+  #define E1_MICROSTEPS 16     //number of microsteps
520
+
521
 //#define E2_IS_TMC
521
 //#define E2_IS_TMC
522
   #define E2_MAX_CURRENT 1000  //in mA
522
   #define E2_MAX_CURRENT 1000  //in mA
523
   #define E2_SENSE_RESISTOR 91 //in mOhms
523
   #define E2_SENSE_RESISTOR 91 //in mOhms
524
-  #define E2_MICROSTEPS 16     //number of microsteps 
525
-  
524
+  #define E2_MICROSTEPS 16     //number of microsteps
525
+
526
 //#define E3_IS_TMC
526
 //#define E3_IS_TMC
527
   #define E3_MAX_CURRENT 1000  //in mA
527
   #define E3_MAX_CURRENT 1000  //in mA
528
   #define E3_SENSE_RESISTOR 91 //in mOhms
528
   #define E3_SENSE_RESISTOR 91 //in mOhms
529
-  #define E3_MICROSTEPS 16     //number of microsteps   
529
+  #define E3_MICROSTEPS 16     //number of microsteps
530
 
530
 
531
 #endif
531
 #endif
532
 
532
 
533
 /******************************************************************************\
533
 /******************************************************************************\
534
- * enable this section if you have L6470  motor drivers. 
534
+ * enable this section if you have L6470  motor drivers.
535
  * you need to import the L6470 library into the arduino IDE for this
535
  * you need to import the L6470 library into the arduino IDE for this
536
  ******************************************************************************/
536
  ******************************************************************************/
537
 
537
 
542
 
542
 
543
 //#define X_IS_L6470
543
 //#define X_IS_L6470
544
   #define X_MICROSTEPS 16     //number of microsteps
544
   #define X_MICROSTEPS 16     //number of microsteps
545
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
545
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
546
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
546
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
547
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
547
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
548
-  
548
+
549
 //#define X2_IS_L6470
549
 //#define X2_IS_L6470
550
   #define X2_MICROSTEPS 16     //number of microsteps
550
   #define X2_MICROSTEPS 16     //number of microsteps
551
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
551
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
552
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
552
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
553
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
553
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
554
-  
554
+
555
 //#define Y_IS_L6470
555
 //#define Y_IS_L6470
556
   #define Y_MICROSTEPS 16     //number of microsteps
556
   #define Y_MICROSTEPS 16     //number of microsteps
557
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
557
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
558
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
558
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
559
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
559
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
560
-  
560
+
561
 //#define Y2_IS_L6470
561
 //#define Y2_IS_L6470
562
-  #define Y2_MICROSTEPS 16     //number of microsteps 
563
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
562
+  #define Y2_MICROSTEPS 16     //number of microsteps
563
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
564
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
564
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
565
-  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
566
-  
565
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
566
+
567
 //#define Z_IS_L6470
567
 //#define Z_IS_L6470
568
   #define Z_MICROSTEPS 16     //number of microsteps
568
   #define Z_MICROSTEPS 16     //number of microsteps
569
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
569
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
570
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
570
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
571
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
571
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
572
-  
572
+
573
 //#define Z2_IS_L6470
573
 //#define Z2_IS_L6470
574
   #define Z2_MICROSTEPS 16     //number of microsteps
574
   #define Z2_MICROSTEPS 16     //number of microsteps
575
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
575
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
576
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
576
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
577
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
577
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
578
-  
578
+
579
 //#define E0_IS_L6470
579
 //#define E0_IS_L6470
580
   #define E0_MICROSTEPS 16     //number of microsteps
580
   #define E0_MICROSTEPS 16     //number of microsteps
581
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
581
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
582
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
582
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
583
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
583
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
584
-  
584
+
585
 //#define E1_IS_L6470
585
 //#define E1_IS_L6470
586
-  #define E1_MICROSTEPS 16     //number of microsteps 
587
   #define E1_MICROSTEPS 16     //number of microsteps
586
   #define E1_MICROSTEPS 16     //number of microsteps
588
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
587
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
589
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
588
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
590
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
589
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
591
-  
590
+
592
 //#define E2_IS_L6470
591
 //#define E2_IS_L6470
593
-  #define E2_MICROSTEPS 16     //number of microsteps 
594
   #define E2_MICROSTEPS 16     //number of microsteps
592
   #define E2_MICROSTEPS 16     //number of microsteps
595
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
593
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
596
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
594
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
597
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
595
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
598
-  
596
+
599
 //#define E3_IS_L6470
597
 //#define E3_IS_L6470
600
-  #define E3_MICROSTEPS 16     //number of microsteps   
601
   #define E3_MICROSTEPS 16     //number of microsteps
598
   #define E3_MICROSTEPS 16     //number of microsteps
602
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
599
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
603
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
600
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
604
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
601
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
605
-  
602
+
606
 #endif
603
 #endif
607
 
604
 
608
 #include "Conditionals.h"
605
 #include "Conditionals.h"

+ 1
- 6
Marlin/example_configurations/WITBOX/Configuration.h 查看文件

733
 
733
 
734
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
734
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
735
 //#define LCD_I2C_VIKI
735
 //#define LCD_I2C_VIKI
736
-  
736
+
737
 // SSD1306 OLED generic display support
737
 // SSD1306 OLED generic display support
738
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
738
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
739
 //#define U8GLIB_SSD1306
739
 //#define U8GLIB_SSD1306
843
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
843
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
844
 //#define FILAMENT_LCD_DISPLAY
844
 //#define FILAMENT_LCD_DISPLAY
845
 
845
 
846
-
847
-
848
-
849
-
850
-
851
 #include "Configuration_adv.h"
846
 #include "Configuration_adv.h"
852
 #include "thermistortables.h"
847
 #include "thermistortables.h"
853
 
848
 

+ 40
- 43
Marlin/example_configurations/WITBOX/Configuration_adv.h 查看文件

145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
146
 
146
 
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
148
-  // That way the machine is capable to align the bed during home, since both Z steppers are homed. 
148
+  // That way the machine is capable to align the bed during home, since both Z steppers are homed.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
343
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
343
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
344
   // we don't have a big font for Cyrillic, Kana
344
   // we don't have a big font for Cyrillic, Kana
345
   //#define USE_BIG_EDIT_FONT
345
   //#define USE_BIG_EDIT_FONT
346
- 
347
-  // If you have spare 2300Byte of progmem and want to use a 
346
+
347
+  // If you have spare 2300Byte of progmem and want to use a
348
   // smaller font on the Info-screen uncomment the next line.
348
   // smaller font on the Info-screen uncomment the next line.
349
   //#define USE_SMALL_INFOFONT
349
   //#define USE_SMALL_INFOFONT
350
 #endif // DOGLCD
350
 #endif // DOGLCD
466
 #endif
466
 #endif
467
 
467
 
468
 /******************************************************************************\
468
 /******************************************************************************\
469
- * enable this section if you have TMC26X motor drivers. 
469
+ * enable this section if you have TMC26X motor drivers.
470
  * you need to import the TMC26XStepper library into the arduino IDE for this
470
  * you need to import the TMC26XStepper library into the arduino IDE for this
471
  ******************************************************************************/
471
  ******************************************************************************/
472
 
472
 
479
   #define X_MAX_CURRENT 1000  //in mA
479
   #define X_MAX_CURRENT 1000  //in mA
480
   #define X_SENSE_RESISTOR 91 //in mOhms
480
   #define X_SENSE_RESISTOR 91 //in mOhms
481
   #define X_MICROSTEPS 16     //number of microsteps
481
   #define X_MICROSTEPS 16     //number of microsteps
482
-  
482
+
483
 //#define X2_IS_TMC
483
 //#define X2_IS_TMC
484
   #define X2_MAX_CURRENT 1000  //in mA
484
   #define X2_MAX_CURRENT 1000  //in mA
485
   #define X2_SENSE_RESISTOR 91 //in mOhms
485
   #define X2_SENSE_RESISTOR 91 //in mOhms
486
   #define X2_MICROSTEPS 16     //number of microsteps
486
   #define X2_MICROSTEPS 16     //number of microsteps
487
-  
487
+
488
 //#define Y_IS_TMC
488
 //#define Y_IS_TMC
489
   #define Y_MAX_CURRENT 1000  //in mA
489
   #define Y_MAX_CURRENT 1000  //in mA
490
   #define Y_SENSE_RESISTOR 91 //in mOhms
490
   #define Y_SENSE_RESISTOR 91 //in mOhms
491
   #define Y_MICROSTEPS 16     //number of microsteps
491
   #define Y_MICROSTEPS 16     //number of microsteps
492
-  
492
+
493
 //#define Y2_IS_TMC
493
 //#define Y2_IS_TMC
494
   #define Y2_MAX_CURRENT 1000  //in mA
494
   #define Y2_MAX_CURRENT 1000  //in mA
495
   #define Y2_SENSE_RESISTOR 91 //in mOhms
495
   #define Y2_SENSE_RESISTOR 91 //in mOhms
496
-  #define Y2_MICROSTEPS 16     //number of microsteps 
497
-  
496
+  #define Y2_MICROSTEPS 16     //number of microsteps
497
+
498
 //#define Z_IS_TMC
498
 //#define Z_IS_TMC
499
   #define Z_MAX_CURRENT 1000  //in mA
499
   #define Z_MAX_CURRENT 1000  //in mA
500
   #define Z_SENSE_RESISTOR 91 //in mOhms
500
   #define Z_SENSE_RESISTOR 91 //in mOhms
501
   #define Z_MICROSTEPS 16     //number of microsteps
501
   #define Z_MICROSTEPS 16     //number of microsteps
502
-  
502
+
503
 //#define Z2_IS_TMC
503
 //#define Z2_IS_TMC
504
   #define Z2_MAX_CURRENT 1000  //in mA
504
   #define Z2_MAX_CURRENT 1000  //in mA
505
   #define Z2_SENSE_RESISTOR 91 //in mOhms
505
   #define Z2_SENSE_RESISTOR 91 //in mOhms
506
   #define Z2_MICROSTEPS 16     //number of microsteps
506
   #define Z2_MICROSTEPS 16     //number of microsteps
507
-  
507
+
508
 //#define E0_IS_TMC
508
 //#define E0_IS_TMC
509
   #define E0_MAX_CURRENT 1000  //in mA
509
   #define E0_MAX_CURRENT 1000  //in mA
510
   #define E0_SENSE_RESISTOR 91 //in mOhms
510
   #define E0_SENSE_RESISTOR 91 //in mOhms
511
   #define E0_MICROSTEPS 16     //number of microsteps
511
   #define E0_MICROSTEPS 16     //number of microsteps
512
-  
512
+
513
 //#define E1_IS_TMC
513
 //#define E1_IS_TMC
514
   #define E1_MAX_CURRENT 1000  //in mA
514
   #define E1_MAX_CURRENT 1000  //in mA
515
   #define E1_SENSE_RESISTOR 91 //in mOhms
515
   #define E1_SENSE_RESISTOR 91 //in mOhms
516
-  #define E1_MICROSTEPS 16     //number of microsteps 
517
-  
516
+  #define E1_MICROSTEPS 16     //number of microsteps
517
+
518
 //#define E2_IS_TMC
518
 //#define E2_IS_TMC
519
   #define E2_MAX_CURRENT 1000  //in mA
519
   #define E2_MAX_CURRENT 1000  //in mA
520
   #define E2_SENSE_RESISTOR 91 //in mOhms
520
   #define E2_SENSE_RESISTOR 91 //in mOhms
521
-  #define E2_MICROSTEPS 16     //number of microsteps 
522
-  
521
+  #define E2_MICROSTEPS 16     //number of microsteps
522
+
523
 //#define E3_IS_TMC
523
 //#define E3_IS_TMC
524
   #define E3_MAX_CURRENT 1000  //in mA
524
   #define E3_MAX_CURRENT 1000  //in mA
525
   #define E3_SENSE_RESISTOR 91 //in mOhms
525
   #define E3_SENSE_RESISTOR 91 //in mOhms
526
-  #define E3_MICROSTEPS 16     //number of microsteps   
526
+  #define E3_MICROSTEPS 16     //number of microsteps
527
 
527
 
528
 #endif
528
 #endif
529
 
529
 
530
 /******************************************************************************\
530
 /******************************************************************************\
531
- * enable this section if you have L6470  motor drivers. 
531
+ * enable this section if you have L6470  motor drivers.
532
  * you need to import the L6470 library into the arduino IDE for this
532
  * you need to import the L6470 library into the arduino IDE for this
533
  ******************************************************************************/
533
  ******************************************************************************/
534
 
534
 
539
 
539
 
540
 //#define X_IS_L6470
540
 //#define X_IS_L6470
541
   #define X_MICROSTEPS 16     //number of microsteps
541
   #define X_MICROSTEPS 16     //number of microsteps
542
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
542
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
543
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
543
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
544
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
544
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
545
-  
545
+
546
 //#define X2_IS_L6470
546
 //#define X2_IS_L6470
547
   #define X2_MICROSTEPS 16     //number of microsteps
547
   #define X2_MICROSTEPS 16     //number of microsteps
548
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
548
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
549
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
549
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
550
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
550
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
551
-  
551
+
552
 //#define Y_IS_L6470
552
 //#define Y_IS_L6470
553
   #define Y_MICROSTEPS 16     //number of microsteps
553
   #define Y_MICROSTEPS 16     //number of microsteps
554
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
554
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
555
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
555
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
556
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
556
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557
-  
557
+
558
 //#define Y2_IS_L6470
558
 //#define Y2_IS_L6470
559
-  #define Y2_MICROSTEPS 16     //number of microsteps 
560
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
559
+  #define Y2_MICROSTEPS 16     //number of microsteps
560
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
561
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
561
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
562
-  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
563
-  
562
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
563
+
564
 //#define Z_IS_L6470
564
 //#define Z_IS_L6470
565
   #define Z_MICROSTEPS 16     //number of microsteps
565
   #define Z_MICROSTEPS 16     //number of microsteps
566
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
566
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
567
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
567
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
568
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
568
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
569
-  
569
+
570
 //#define Z2_IS_L6470
570
 //#define Z2_IS_L6470
571
   #define Z2_MICROSTEPS 16     //number of microsteps
571
   #define Z2_MICROSTEPS 16     //number of microsteps
572
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
572
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
573
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
573
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
574
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
574
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
575
-  
575
+
576
 //#define E0_IS_L6470
576
 //#define E0_IS_L6470
577
   #define E0_MICROSTEPS 16     //number of microsteps
577
   #define E0_MICROSTEPS 16     //number of microsteps
578
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
578
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
579
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
579
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
580
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
580
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
581
-  
581
+
582
 //#define E1_IS_L6470
582
 //#define E1_IS_L6470
583
-  #define E1_MICROSTEPS 16     //number of microsteps 
584
   #define E1_MICROSTEPS 16     //number of microsteps
583
   #define E1_MICROSTEPS 16     //number of microsteps
585
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
584
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
586
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
585
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
587
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
586
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
588
-  
587
+
589
 //#define E2_IS_L6470
588
 //#define E2_IS_L6470
590
-  #define E2_MICROSTEPS 16     //number of microsteps 
591
   #define E2_MICROSTEPS 16     //number of microsteps
589
   #define E2_MICROSTEPS 16     //number of microsteps
592
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
590
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
593
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
591
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
594
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
592
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
595
-  
593
+
596
 //#define E3_IS_L6470
594
 //#define E3_IS_L6470
597
-  #define E3_MICROSTEPS 16     //number of microsteps   
598
   #define E3_MICROSTEPS 16     //number of microsteps
595
   #define E3_MICROSTEPS 16     //number of microsteps
599
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
596
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
600
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
597
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
601
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
598
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
602
-  
599
+
603
 #endif
600
 #endif
604
 
601
 
605
 #include "Conditionals.h"
602
 #include "Conditionals.h"

+ 1
- 6
Marlin/example_configurations/adafruit/ST7565/Configuration.h 查看文件

742
 
742
 
743
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
743
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
744
 //#define LCD_I2C_VIKI
744
 //#define LCD_I2C_VIKI
745
-  
745
+
746
 // SSD1306 OLED generic display support
746
 // SSD1306 OLED generic display support
747
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
747
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
748
 //#define U8GLIB_SSD1306
748
 //#define U8GLIB_SSD1306
852
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
852
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
853
 //#define FILAMENT_LCD_DISPLAY
853
 //#define FILAMENT_LCD_DISPLAY
854
 
854
 
855
-
856
-
857
-
858
-
859
-
860
 #include "Configuration_adv.h"
855
 #include "Configuration_adv.h"
861
 #include "thermistortables.h"
856
 #include "thermistortables.h"
862
 
857
 

+ 1
- 6
Marlin/example_configurations/delta/biv2.5/Configuration.h 查看文件

867
 
867
 
868
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
868
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
869
 //#define LCD_I2C_VIKI
869
 //#define LCD_I2C_VIKI
870
-  
870
+
871
 // SSD1306 OLED generic display support
871
 // SSD1306 OLED generic display support
872
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
872
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
873
 //#define U8GLIB_SSD1306
873
 //#define U8GLIB_SSD1306
977
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
977
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
978
 //#define FILAMENT_LCD_DISPLAY
978
 //#define FILAMENT_LCD_DISPLAY
979
 
979
 
980
-
981
-
982
-
983
-
984
-
985
 #include "Configuration_adv.h"
980
 #include "Configuration_adv.h"
986
 #include "thermistortables.h"
981
 #include "thermistortables.h"
987
 
982
 

+ 40
- 43
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h 查看文件

145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
146
 
146
 
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
148
-  // That way the machine is capable to align the bed during home, since both Z steppers are homed. 
148
+  // That way the machine is capable to align the bed during home, since both Z steppers are homed.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
345
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
345
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
346
   // we don't have a big font for Cyrillic, Kana
346
   // we don't have a big font for Cyrillic, Kana
347
   //#define USE_BIG_EDIT_FONT
347
   //#define USE_BIG_EDIT_FONT
348
- 
349
-  // If you have spare 2300Byte of progmem and want to use a 
348
+
349
+  // If you have spare 2300Byte of progmem and want to use a
350
   // smaller font on the Info-screen uncomment the next line.
350
   // smaller font on the Info-screen uncomment the next line.
351
   //#define USE_SMALL_INFOFONT
351
   //#define USE_SMALL_INFOFONT
352
 #endif // DOGLCD
352
 #endif // DOGLCD
467
 #endif
467
 #endif
468
 
468
 
469
 /******************************************************************************\
469
 /******************************************************************************\
470
- * enable this section if you have TMC26X motor drivers. 
470
+ * enable this section if you have TMC26X motor drivers.
471
  * you need to import the TMC26XStepper library into the arduino IDE for this
471
  * you need to import the TMC26XStepper library into the arduino IDE for this
472
  ******************************************************************************/
472
  ******************************************************************************/
473
 
473
 
480
   #define X_MAX_CURRENT 1000  //in mA
480
   #define X_MAX_CURRENT 1000  //in mA
481
   #define X_SENSE_RESISTOR 91 //in mOhms
481
   #define X_SENSE_RESISTOR 91 //in mOhms
482
   #define X_MICROSTEPS 16     //number of microsteps
482
   #define X_MICROSTEPS 16     //number of microsteps
483
-  
483
+
484
 //#define X2_IS_TMC
484
 //#define X2_IS_TMC
485
   #define X2_MAX_CURRENT 1000  //in mA
485
   #define X2_MAX_CURRENT 1000  //in mA
486
   #define X2_SENSE_RESISTOR 91 //in mOhms
486
   #define X2_SENSE_RESISTOR 91 //in mOhms
487
   #define X2_MICROSTEPS 16     //number of microsteps
487
   #define X2_MICROSTEPS 16     //number of microsteps
488
-  
488
+
489
 //#define Y_IS_TMC
489
 //#define Y_IS_TMC
490
   #define Y_MAX_CURRENT 1000  //in mA
490
   #define Y_MAX_CURRENT 1000  //in mA
491
   #define Y_SENSE_RESISTOR 91 //in mOhms
491
   #define Y_SENSE_RESISTOR 91 //in mOhms
492
   #define Y_MICROSTEPS 16     //number of microsteps
492
   #define Y_MICROSTEPS 16     //number of microsteps
493
-  
493
+
494
 //#define Y2_IS_TMC
494
 //#define Y2_IS_TMC
495
   #define Y2_MAX_CURRENT 1000  //in mA
495
   #define Y2_MAX_CURRENT 1000  //in mA
496
   #define Y2_SENSE_RESISTOR 91 //in mOhms
496
   #define Y2_SENSE_RESISTOR 91 //in mOhms
497
-  #define Y2_MICROSTEPS 16     //number of microsteps 
498
-  
497
+  #define Y2_MICROSTEPS 16     //number of microsteps
498
+
499
 //#define Z_IS_TMC
499
 //#define Z_IS_TMC
500
   #define Z_MAX_CURRENT 1000  //in mA
500
   #define Z_MAX_CURRENT 1000  //in mA
501
   #define Z_SENSE_RESISTOR 91 //in mOhms
501
   #define Z_SENSE_RESISTOR 91 //in mOhms
502
   #define Z_MICROSTEPS 16     //number of microsteps
502
   #define Z_MICROSTEPS 16     //number of microsteps
503
-  
503
+
504
 //#define Z2_IS_TMC
504
 //#define Z2_IS_TMC
505
   #define Z2_MAX_CURRENT 1000  //in mA
505
   #define Z2_MAX_CURRENT 1000  //in mA
506
   #define Z2_SENSE_RESISTOR 91 //in mOhms
506
   #define Z2_SENSE_RESISTOR 91 //in mOhms
507
   #define Z2_MICROSTEPS 16     //number of microsteps
507
   #define Z2_MICROSTEPS 16     //number of microsteps
508
-  
508
+
509
 //#define E0_IS_TMC
509
 //#define E0_IS_TMC
510
   #define E0_MAX_CURRENT 1000  //in mA
510
   #define E0_MAX_CURRENT 1000  //in mA
511
   #define E0_SENSE_RESISTOR 91 //in mOhms
511
   #define E0_SENSE_RESISTOR 91 //in mOhms
512
   #define E0_MICROSTEPS 16     //number of microsteps
512
   #define E0_MICROSTEPS 16     //number of microsteps
513
-  
513
+
514
 //#define E1_IS_TMC
514
 //#define E1_IS_TMC
515
   #define E1_MAX_CURRENT 1000  //in mA
515
   #define E1_MAX_CURRENT 1000  //in mA
516
   #define E1_SENSE_RESISTOR 91 //in mOhms
516
   #define E1_SENSE_RESISTOR 91 //in mOhms
517
-  #define E1_MICROSTEPS 16     //number of microsteps 
518
-  
517
+  #define E1_MICROSTEPS 16     //number of microsteps
518
+
519
 //#define E2_IS_TMC
519
 //#define E2_IS_TMC
520
   #define E2_MAX_CURRENT 1000  //in mA
520
   #define E2_MAX_CURRENT 1000  //in mA
521
   #define E2_SENSE_RESISTOR 91 //in mOhms
521
   #define E2_SENSE_RESISTOR 91 //in mOhms
522
-  #define E2_MICROSTEPS 16     //number of microsteps 
523
-  
522
+  #define E2_MICROSTEPS 16     //number of microsteps
523
+
524
 //#define E3_IS_TMC
524
 //#define E3_IS_TMC
525
   #define E3_MAX_CURRENT 1000  //in mA
525
   #define E3_MAX_CURRENT 1000  //in mA
526
   #define E3_SENSE_RESISTOR 91 //in mOhms
526
   #define E3_SENSE_RESISTOR 91 //in mOhms
527
-  #define E3_MICROSTEPS 16     //number of microsteps   
527
+  #define E3_MICROSTEPS 16     //number of microsteps
528
 
528
 
529
 #endif
529
 #endif
530
 
530
 
531
 /******************************************************************************\
531
 /******************************************************************************\
532
- * enable this section if you have L6470  motor drivers. 
532
+ * enable this section if you have L6470  motor drivers.
533
  * you need to import the L6470 library into the arduino IDE for this
533
  * you need to import the L6470 library into the arduino IDE for this
534
  ******************************************************************************/
534
  ******************************************************************************/
535
 
535
 
540
 
540
 
541
 //#define X_IS_L6470
541
 //#define X_IS_L6470
542
   #define X_MICROSTEPS 16     //number of microsteps
542
   #define X_MICROSTEPS 16     //number of microsteps
543
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
543
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
544
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
544
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
545
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
545
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
546
-  
546
+
547
 //#define X2_IS_L6470
547
 //#define X2_IS_L6470
548
   #define X2_MICROSTEPS 16     //number of microsteps
548
   #define X2_MICROSTEPS 16     //number of microsteps
549
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
549
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
550
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
550
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
551
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
551
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
552
-  
552
+
553
 //#define Y_IS_L6470
553
 //#define Y_IS_L6470
554
   #define Y_MICROSTEPS 16     //number of microsteps
554
   #define Y_MICROSTEPS 16     //number of microsteps
555
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
555
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
556
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
556
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
557
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
558
-  
558
+
559
 //#define Y2_IS_L6470
559
 //#define Y2_IS_L6470
560
-  #define Y2_MICROSTEPS 16     //number of microsteps 
561
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
560
+  #define Y2_MICROSTEPS 16     //number of microsteps
561
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
562
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
562
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
563
-  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
564
-  
563
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
564
+
565
 //#define Z_IS_L6470
565
 //#define Z_IS_L6470
566
   #define Z_MICROSTEPS 16     //number of microsteps
566
   #define Z_MICROSTEPS 16     //number of microsteps
567
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
567
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
568
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
568
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
569
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
569
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
570
-  
570
+
571
 //#define Z2_IS_L6470
571
 //#define Z2_IS_L6470
572
   #define Z2_MICROSTEPS 16     //number of microsteps
572
   #define Z2_MICROSTEPS 16     //number of microsteps
573
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
573
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
574
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
574
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
575
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
575
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
576
-  
576
+
577
 //#define E0_IS_L6470
577
 //#define E0_IS_L6470
578
   #define E0_MICROSTEPS 16     //number of microsteps
578
   #define E0_MICROSTEPS 16     //number of microsteps
579
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
579
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
580
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
580
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
581
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
581
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
582
-  
582
+
583
 //#define E1_IS_L6470
583
 //#define E1_IS_L6470
584
-  #define E1_MICROSTEPS 16     //number of microsteps 
585
   #define E1_MICROSTEPS 16     //number of microsteps
584
   #define E1_MICROSTEPS 16     //number of microsteps
586
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
585
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
587
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
586
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
588
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
587
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
589
-  
588
+
590
 //#define E2_IS_L6470
589
 //#define E2_IS_L6470
591
-  #define E2_MICROSTEPS 16     //number of microsteps 
592
   #define E2_MICROSTEPS 16     //number of microsteps
590
   #define E2_MICROSTEPS 16     //number of microsteps
593
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
591
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
594
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
592
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
595
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
593
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
596
-  
594
+
597
 //#define E3_IS_L6470
595
 //#define E3_IS_L6470
598
-  #define E3_MICROSTEPS 16     //number of microsteps   
599
   #define E3_MICROSTEPS 16     //number of microsteps
596
   #define E3_MICROSTEPS 16     //number of microsteps
600
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
597
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
601
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
598
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
602
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
599
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
603
-  
600
+
604
 #endif
601
 #endif
605
 
602
 
606
 #include "Conditionals.h"
603
 #include "Conditionals.h"

+ 1
- 6
Marlin/example_configurations/delta/generic/Configuration.h 查看文件

872
 
872
 
873
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
873
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
874
 //#define LCD_I2C_VIKI
874
 //#define LCD_I2C_VIKI
875
-  
875
+
876
 // SSD1306 OLED generic display support
876
 // SSD1306 OLED generic display support
877
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
877
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
878
 //#define U8GLIB_SSD1306
878
 //#define U8GLIB_SSD1306
982
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
982
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
983
 //#define FILAMENT_LCD_DISPLAY
983
 //#define FILAMENT_LCD_DISPLAY
984
 
984
 
985
-
986
-
987
-
988
-
989
-
990
 #include "Configuration_adv.h"
985
 #include "Configuration_adv.h"
991
 #include "thermistortables.h"
986
 #include "thermistortables.h"
992
 
987
 

+ 40
- 43
Marlin/example_configurations/delta/generic/Configuration_adv.h 查看文件

145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
146
 
146
 
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
148
-  // That way the machine is capable to align the bed during home, since both Z steppers are homed. 
148
+  // That way the machine is capable to align the bed during home, since both Z steppers are homed.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
345
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
345
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
346
   // we don't have a big font for Cyrillic, Kana
346
   // we don't have a big font for Cyrillic, Kana
347
   //#define USE_BIG_EDIT_FONT
347
   //#define USE_BIG_EDIT_FONT
348
- 
349
-  // If you have spare 2300Byte of progmem and want to use a 
348
+
349
+  // If you have spare 2300Byte of progmem and want to use a
350
   // smaller font on the Info-screen uncomment the next line.
350
   // smaller font on the Info-screen uncomment the next line.
351
   //#define USE_SMALL_INFOFONT
351
   //#define USE_SMALL_INFOFONT
352
 #endif // DOGLCD
352
 #endif // DOGLCD
468
 #endif
468
 #endif
469
 
469
 
470
 /******************************************************************************\
470
 /******************************************************************************\
471
- * enable this section if you have TMC26X motor drivers. 
471
+ * enable this section if you have TMC26X motor drivers.
472
  * you need to import the TMC26XStepper library into the arduino IDE for this
472
  * you need to import the TMC26XStepper library into the arduino IDE for this
473
  ******************************************************************************/
473
  ******************************************************************************/
474
 
474
 
481
   #define X_MAX_CURRENT 1000  //in mA
481
   #define X_MAX_CURRENT 1000  //in mA
482
   #define X_SENSE_RESISTOR 91 //in mOhms
482
   #define X_SENSE_RESISTOR 91 //in mOhms
483
   #define X_MICROSTEPS 16     //number of microsteps
483
   #define X_MICROSTEPS 16     //number of microsteps
484
-  
484
+
485
 //#define X2_IS_TMC
485
 //#define X2_IS_TMC
486
   #define X2_MAX_CURRENT 1000  //in mA
486
   #define X2_MAX_CURRENT 1000  //in mA
487
   #define X2_SENSE_RESISTOR 91 //in mOhms
487
   #define X2_SENSE_RESISTOR 91 //in mOhms
488
   #define X2_MICROSTEPS 16     //number of microsteps
488
   #define X2_MICROSTEPS 16     //number of microsteps
489
-  
489
+
490
 //#define Y_IS_TMC
490
 //#define Y_IS_TMC
491
   #define Y_MAX_CURRENT 1000  //in mA
491
   #define Y_MAX_CURRENT 1000  //in mA
492
   #define Y_SENSE_RESISTOR 91 //in mOhms
492
   #define Y_SENSE_RESISTOR 91 //in mOhms
493
   #define Y_MICROSTEPS 16     //number of microsteps
493
   #define Y_MICROSTEPS 16     //number of microsteps
494
-  
494
+
495
 //#define Y2_IS_TMC
495
 //#define Y2_IS_TMC
496
   #define Y2_MAX_CURRENT 1000  //in mA
496
   #define Y2_MAX_CURRENT 1000  //in mA
497
   #define Y2_SENSE_RESISTOR 91 //in mOhms
497
   #define Y2_SENSE_RESISTOR 91 //in mOhms
498
-  #define Y2_MICROSTEPS 16     //number of microsteps 
499
-  
498
+  #define Y2_MICROSTEPS 16     //number of microsteps
499
+
500
 //#define Z_IS_TMC
500
 //#define Z_IS_TMC
501
   #define Z_MAX_CURRENT 1000  //in mA
501
   #define Z_MAX_CURRENT 1000  //in mA
502
   #define Z_SENSE_RESISTOR 91 //in mOhms
502
   #define Z_SENSE_RESISTOR 91 //in mOhms
503
   #define Z_MICROSTEPS 16     //number of microsteps
503
   #define Z_MICROSTEPS 16     //number of microsteps
504
-  
504
+
505
 //#define Z2_IS_TMC
505
 //#define Z2_IS_TMC
506
   #define Z2_MAX_CURRENT 1000  //in mA
506
   #define Z2_MAX_CURRENT 1000  //in mA
507
   #define Z2_SENSE_RESISTOR 91 //in mOhms
507
   #define Z2_SENSE_RESISTOR 91 //in mOhms
508
   #define Z2_MICROSTEPS 16     //number of microsteps
508
   #define Z2_MICROSTEPS 16     //number of microsteps
509
-  
509
+
510
 //#define E0_IS_TMC
510
 //#define E0_IS_TMC
511
   #define E0_MAX_CURRENT 1000  //in mA
511
   #define E0_MAX_CURRENT 1000  //in mA
512
   #define E0_SENSE_RESISTOR 91 //in mOhms
512
   #define E0_SENSE_RESISTOR 91 //in mOhms
513
   #define E0_MICROSTEPS 16     //number of microsteps
513
   #define E0_MICROSTEPS 16     //number of microsteps
514
-  
514
+
515
 //#define E1_IS_TMC
515
 //#define E1_IS_TMC
516
   #define E1_MAX_CURRENT 1000  //in mA
516
   #define E1_MAX_CURRENT 1000  //in mA
517
   #define E1_SENSE_RESISTOR 91 //in mOhms
517
   #define E1_SENSE_RESISTOR 91 //in mOhms
518
-  #define E1_MICROSTEPS 16     //number of microsteps 
519
-  
518
+  #define E1_MICROSTEPS 16     //number of microsteps
519
+
520
 //#define E2_IS_TMC
520
 //#define E2_IS_TMC
521
   #define E2_MAX_CURRENT 1000  //in mA
521
   #define E2_MAX_CURRENT 1000  //in mA
522
   #define E2_SENSE_RESISTOR 91 //in mOhms
522
   #define E2_SENSE_RESISTOR 91 //in mOhms
523
-  #define E2_MICROSTEPS 16     //number of microsteps 
524
-  
523
+  #define E2_MICROSTEPS 16     //number of microsteps
524
+
525
 //#define E3_IS_TMC
525
 //#define E3_IS_TMC
526
   #define E3_MAX_CURRENT 1000  //in mA
526
   #define E3_MAX_CURRENT 1000  //in mA
527
   #define E3_SENSE_RESISTOR 91 //in mOhms
527
   #define E3_SENSE_RESISTOR 91 //in mOhms
528
-  #define E3_MICROSTEPS 16     //number of microsteps   
528
+  #define E3_MICROSTEPS 16     //number of microsteps
529
 
529
 
530
 #endif
530
 #endif
531
 
531
 
532
 /******************************************************************************\
532
 /******************************************************************************\
533
- * enable this section if you have L6470  motor drivers. 
533
+ * enable this section if you have L6470  motor drivers.
534
  * you need to import the L6470 library into the arduino IDE for this
534
  * you need to import the L6470 library into the arduino IDE for this
535
  ******************************************************************************/
535
  ******************************************************************************/
536
 
536
 
541
 
541
 
542
 //#define X_IS_L6470
542
 //#define X_IS_L6470
543
   #define X_MICROSTEPS 16     //number of microsteps
543
   #define X_MICROSTEPS 16     //number of microsteps
544
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
544
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
545
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
545
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
546
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
546
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
547
-  
547
+
548
 //#define X2_IS_L6470
548
 //#define X2_IS_L6470
549
   #define X2_MICROSTEPS 16     //number of microsteps
549
   #define X2_MICROSTEPS 16     //number of microsteps
550
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
550
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
551
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
551
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
552
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
552
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
553
-  
553
+
554
 //#define Y_IS_L6470
554
 //#define Y_IS_L6470
555
   #define Y_MICROSTEPS 16     //number of microsteps
555
   #define Y_MICROSTEPS 16     //number of microsteps
556
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
556
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
557
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
557
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
558
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
558
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
559
-  
559
+
560
 //#define Y2_IS_L6470
560
 //#define Y2_IS_L6470
561
-  #define Y2_MICROSTEPS 16     //number of microsteps 
562
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
561
+  #define Y2_MICROSTEPS 16     //number of microsteps
562
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
563
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
563
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
564
-  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
565
-  
564
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
565
+
566
 //#define Z_IS_L6470
566
 //#define Z_IS_L6470
567
   #define Z_MICROSTEPS 16     //number of microsteps
567
   #define Z_MICROSTEPS 16     //number of microsteps
568
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
568
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
569
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
569
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
570
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
570
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
571
-  
571
+
572
 //#define Z2_IS_L6470
572
 //#define Z2_IS_L6470
573
   #define Z2_MICROSTEPS 16     //number of microsteps
573
   #define Z2_MICROSTEPS 16     //number of microsteps
574
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
574
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
575
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
575
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
576
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
576
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
577
-  
577
+
578
 //#define E0_IS_L6470
578
 //#define E0_IS_L6470
579
   #define E0_MICROSTEPS 16     //number of microsteps
579
   #define E0_MICROSTEPS 16     //number of microsteps
580
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
580
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
581
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
581
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
582
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
582
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
583
-  
583
+
584
 //#define E1_IS_L6470
584
 //#define E1_IS_L6470
585
-  #define E1_MICROSTEPS 16     //number of microsteps 
586
   #define E1_MICROSTEPS 16     //number of microsteps
585
   #define E1_MICROSTEPS 16     //number of microsteps
587
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
586
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
588
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
587
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
589
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
588
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
590
-  
589
+
591
 //#define E2_IS_L6470
590
 //#define E2_IS_L6470
592
-  #define E2_MICROSTEPS 16     //number of microsteps 
593
   #define E2_MICROSTEPS 16     //number of microsteps
591
   #define E2_MICROSTEPS 16     //number of microsteps
594
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
592
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
595
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
593
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
596
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
594
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
597
-  
595
+
598
 //#define E3_IS_L6470
596
 //#define E3_IS_L6470
599
-  #define E3_MICROSTEPS 16     //number of microsteps   
600
   #define E3_MICROSTEPS 16     //number of microsteps
597
   #define E3_MICROSTEPS 16     //number of microsteps
601
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
598
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
602
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
599
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
603
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
600
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
604
-  
601
+
605
 #endif
602
 #endif
606
 
603
 
607
 #include "Conditionals.h"
604
 #include "Conditionals.h"

+ 1
- 6
Marlin/example_configurations/delta/kossel_mini/Configuration.h 查看文件

872
 
872
 
873
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
873
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
874
 //#define LCD_I2C_VIKI
874
 //#define LCD_I2C_VIKI
875
-  
875
+
876
 // SSD1306 OLED generic display support
876
 // SSD1306 OLED generic display support
877
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
877
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
878
 //#define U8GLIB_SSD1306
878
 //#define U8GLIB_SSD1306
982
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
982
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
983
 //#define FILAMENT_LCD_DISPLAY
983
 //#define FILAMENT_LCD_DISPLAY
984
 
984
 
985
-
986
-
987
-
988
-
989
-
990
 #include "Configuration_adv.h"
985
 #include "Configuration_adv.h"
991
 #include "thermistortables.h"
986
 #include "thermistortables.h"
992
 
987
 

+ 40
- 43
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h 查看文件

145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
146
 
146
 
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
148
-  // That way the machine is capable to align the bed during home, since both Z steppers are homed. 
148
+  // That way the machine is capable to align the bed during home, since both Z steppers are homed.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
344
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
344
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
345
   // we don't have a big font for Cyrillic, Kana
345
   // we don't have a big font for Cyrillic, Kana
346
   //#define USE_BIG_EDIT_FONT
346
   //#define USE_BIG_EDIT_FONT
347
- 
348
-  // If you have spare 2300Byte of progmem and want to use a 
347
+
348
+  // If you have spare 2300Byte of progmem and want to use a
349
   // smaller font on the Info-screen uncomment the next line.
349
   // smaller font on the Info-screen uncomment the next line.
350
   //#define USE_SMALL_INFOFONT
350
   //#define USE_SMALL_INFOFONT
351
 #endif // DOGLCD
351
 #endif // DOGLCD
467
 #endif
467
 #endif
468
 
468
 
469
 /******************************************************************************\
469
 /******************************************************************************\
470
- * enable this section if you have TMC26X motor drivers. 
470
+ * enable this section if you have TMC26X motor drivers.
471
  * you need to import the TMC26XStepper library into the arduino IDE for this
471
  * you need to import the TMC26XStepper library into the arduino IDE for this
472
  ******************************************************************************/
472
  ******************************************************************************/
473
 
473
 
480
   #define X_MAX_CURRENT 1000  //in mA
480
   #define X_MAX_CURRENT 1000  //in mA
481
   #define X_SENSE_RESISTOR 91 //in mOhms
481
   #define X_SENSE_RESISTOR 91 //in mOhms
482
   #define X_MICROSTEPS 16     //number of microsteps
482
   #define X_MICROSTEPS 16     //number of microsteps
483
-  
483
+
484
 //#define X2_IS_TMC
484
 //#define X2_IS_TMC
485
   #define X2_MAX_CURRENT 1000  //in mA
485
   #define X2_MAX_CURRENT 1000  //in mA
486
   #define X2_SENSE_RESISTOR 91 //in mOhms
486
   #define X2_SENSE_RESISTOR 91 //in mOhms
487
   #define X2_MICROSTEPS 16     //number of microsteps
487
   #define X2_MICROSTEPS 16     //number of microsteps
488
-  
488
+
489
 //#define Y_IS_TMC
489
 //#define Y_IS_TMC
490
   #define Y_MAX_CURRENT 1000  //in mA
490
   #define Y_MAX_CURRENT 1000  //in mA
491
   #define Y_SENSE_RESISTOR 91 //in mOhms
491
   #define Y_SENSE_RESISTOR 91 //in mOhms
492
   #define Y_MICROSTEPS 16     //number of microsteps
492
   #define Y_MICROSTEPS 16     //number of microsteps
493
-  
493
+
494
 //#define Y2_IS_TMC
494
 //#define Y2_IS_TMC
495
   #define Y2_MAX_CURRENT 1000  //in mA
495
   #define Y2_MAX_CURRENT 1000  //in mA
496
   #define Y2_SENSE_RESISTOR 91 //in mOhms
496
   #define Y2_SENSE_RESISTOR 91 //in mOhms
497
-  #define Y2_MICROSTEPS 16     //number of microsteps 
498
-  
497
+  #define Y2_MICROSTEPS 16     //number of microsteps
498
+
499
 //#define Z_IS_TMC
499
 //#define Z_IS_TMC
500
   #define Z_MAX_CURRENT 1000  //in mA
500
   #define Z_MAX_CURRENT 1000  //in mA
501
   #define Z_SENSE_RESISTOR 91 //in mOhms
501
   #define Z_SENSE_RESISTOR 91 //in mOhms
502
   #define Z_MICROSTEPS 16     //number of microsteps
502
   #define Z_MICROSTEPS 16     //number of microsteps
503
-  
503
+
504
 //#define Z2_IS_TMC
504
 //#define Z2_IS_TMC
505
   #define Z2_MAX_CURRENT 1000  //in mA
505
   #define Z2_MAX_CURRENT 1000  //in mA
506
   #define Z2_SENSE_RESISTOR 91 //in mOhms
506
   #define Z2_SENSE_RESISTOR 91 //in mOhms
507
   #define Z2_MICROSTEPS 16     //number of microsteps
507
   #define Z2_MICROSTEPS 16     //number of microsteps
508
-  
508
+
509
 //#define E0_IS_TMC
509
 //#define E0_IS_TMC
510
   #define E0_MAX_CURRENT 1000  //in mA
510
   #define E0_MAX_CURRENT 1000  //in mA
511
   #define E0_SENSE_RESISTOR 91 //in mOhms
511
   #define E0_SENSE_RESISTOR 91 //in mOhms
512
   #define E0_MICROSTEPS 16     //number of microsteps
512
   #define E0_MICROSTEPS 16     //number of microsteps
513
-  
513
+
514
 //#define E1_IS_TMC
514
 //#define E1_IS_TMC
515
   #define E1_MAX_CURRENT 1000  //in mA
515
   #define E1_MAX_CURRENT 1000  //in mA
516
   #define E1_SENSE_RESISTOR 91 //in mOhms
516
   #define E1_SENSE_RESISTOR 91 //in mOhms
517
-  #define E1_MICROSTEPS 16     //number of microsteps 
518
-  
517
+  #define E1_MICROSTEPS 16     //number of microsteps
518
+
519
 //#define E2_IS_TMC
519
 //#define E2_IS_TMC
520
   #define E2_MAX_CURRENT 1000  //in mA
520
   #define E2_MAX_CURRENT 1000  //in mA
521
   #define E2_SENSE_RESISTOR 91 //in mOhms
521
   #define E2_SENSE_RESISTOR 91 //in mOhms
522
-  #define E2_MICROSTEPS 16     //number of microsteps 
523
-  
522
+  #define E2_MICROSTEPS 16     //number of microsteps
523
+
524
 //#define E3_IS_TMC
524
 //#define E3_IS_TMC
525
   #define E3_MAX_CURRENT 1000  //in mA
525
   #define E3_MAX_CURRENT 1000  //in mA
526
   #define E3_SENSE_RESISTOR 91 //in mOhms
526
   #define E3_SENSE_RESISTOR 91 //in mOhms
527
-  #define E3_MICROSTEPS 16     //number of microsteps   
527
+  #define E3_MICROSTEPS 16     //number of microsteps
528
 
528
 
529
 #endif
529
 #endif
530
 
530
 
531
 /******************************************************************************\
531
 /******************************************************************************\
532
- * enable this section if you have L6470  motor drivers. 
532
+ * enable this section if you have L6470  motor drivers.
533
  * you need to import the L6470 library into the arduino IDE for this
533
  * you need to import the L6470 library into the arduino IDE for this
534
  ******************************************************************************/
534
  ******************************************************************************/
535
 
535
 
540
 
540
 
541
 //#define X_IS_L6470
541
 //#define X_IS_L6470
542
   #define X_MICROSTEPS 16     //number of microsteps
542
   #define X_MICROSTEPS 16     //number of microsteps
543
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
543
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
544
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
544
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
545
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
545
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
546
-  
546
+
547
 //#define X2_IS_L6470
547
 //#define X2_IS_L6470
548
   #define X2_MICROSTEPS 16     //number of microsteps
548
   #define X2_MICROSTEPS 16     //number of microsteps
549
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
549
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
550
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
550
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
551
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
551
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
552
-  
552
+
553
 //#define Y_IS_L6470
553
 //#define Y_IS_L6470
554
   #define Y_MICROSTEPS 16     //number of microsteps
554
   #define Y_MICROSTEPS 16     //number of microsteps
555
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
555
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
556
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
556
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
557
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
558
-  
558
+
559
 //#define Y2_IS_L6470
559
 //#define Y2_IS_L6470
560
-  #define Y2_MICROSTEPS 16     //number of microsteps 
561
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
560
+  #define Y2_MICROSTEPS 16     //number of microsteps
561
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
562
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
562
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
563
-  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
564
-  
563
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
564
+
565
 //#define Z_IS_L6470
565
 //#define Z_IS_L6470
566
   #define Z_MICROSTEPS 16     //number of microsteps
566
   #define Z_MICROSTEPS 16     //number of microsteps
567
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
567
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
568
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
568
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
569
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
569
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
570
-  
570
+
571
 //#define Z2_IS_L6470
571
 //#define Z2_IS_L6470
572
   #define Z2_MICROSTEPS 16     //number of microsteps
572
   #define Z2_MICROSTEPS 16     //number of microsteps
573
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
573
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
574
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
574
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
575
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
575
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
576
-  
576
+
577
 //#define E0_IS_L6470
577
 //#define E0_IS_L6470
578
   #define E0_MICROSTEPS 16     //number of microsteps
578
   #define E0_MICROSTEPS 16     //number of microsteps
579
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
579
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
580
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
580
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
581
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
581
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
582
-  
582
+
583
 //#define E1_IS_L6470
583
 //#define E1_IS_L6470
584
-  #define E1_MICROSTEPS 16     //number of microsteps 
585
   #define E1_MICROSTEPS 16     //number of microsteps
584
   #define E1_MICROSTEPS 16     //number of microsteps
586
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
585
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
587
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
586
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
588
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
587
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
589
-  
588
+
590
 //#define E2_IS_L6470
589
 //#define E2_IS_L6470
591
-  #define E2_MICROSTEPS 16     //number of microsteps 
592
   #define E2_MICROSTEPS 16     //number of microsteps
590
   #define E2_MICROSTEPS 16     //number of microsteps
593
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
591
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
594
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
592
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
595
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
593
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
596
-  
594
+
597
 //#define E3_IS_L6470
595
 //#define E3_IS_L6470
598
-  #define E3_MICROSTEPS 16     //number of microsteps   
599
   #define E3_MICROSTEPS 16     //number of microsteps
596
   #define E3_MICROSTEPS 16     //number of microsteps
600
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
597
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
601
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
598
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
602
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
599
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
603
-  
600
+
604
 #endif
601
 #endif
605
 
602
 
606
 #include "Conditionals.h"
603
 #include "Conditionals.h"

+ 1
- 6
Marlin/example_configurations/delta/kossel_pro/Configuration.h 查看文件

862
 
862
 
863
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
863
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
864
 //#define LCD_I2C_VIKI
864
 //#define LCD_I2C_VIKI
865
-  
865
+
866
 // SSD1306 OLED generic display support
866
 // SSD1306 OLED generic display support
867
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
867
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
868
 //#define U8GLIB_SSD1306
868
 //#define U8GLIB_SSD1306
972
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
972
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
973
 //#define FILAMENT_LCD_DISPLAY
973
 //#define FILAMENT_LCD_DISPLAY
974
 
974
 
975
-
976
-
977
-
978
-
979
-
980
 #include "Configuration_adv.h"
975
 #include "Configuration_adv.h"
981
 #include "thermistortables.h"
976
 #include "thermistortables.h"
982
 
977
 

+ 40
- 43
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h 查看文件

149
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
149
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
150
 
150
 
151
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
151
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
152
-  // That way the machine is capable to align the bed during home, since both Z steppers are homed. 
152
+  // That way the machine is capable to align the bed during home, since both Z steppers are homed.
153
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
153
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
154
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
154
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
155
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
155
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
348
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
348
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
349
   // we don't have a big font for Cyrillic, Kana
349
   // we don't have a big font for Cyrillic, Kana
350
   //#define USE_BIG_EDIT_FONT
350
   //#define USE_BIG_EDIT_FONT
351
- 
352
-  // If you have spare 2300Byte of progmem and want to use a 
351
+
352
+  // If you have spare 2300Byte of progmem and want to use a
353
   // smaller font on the Info-screen uncomment the next line.
353
   // smaller font on the Info-screen uncomment the next line.
354
   //#define USE_SMALL_INFOFONT
354
   //#define USE_SMALL_INFOFONT
355
 #endif // DOGLCD
355
 #endif // DOGLCD
471
 #endif
471
 #endif
472
 
472
 
473
 /******************************************************************************\
473
 /******************************************************************************\
474
- * enable this section if you have TMC26X motor drivers. 
474
+ * enable this section if you have TMC26X motor drivers.
475
  * you need to import the TMC26XStepper library into the arduino IDE for this
475
  * you need to import the TMC26XStepper library into the arduino IDE for this
476
  ******************************************************************************/
476
  ******************************************************************************/
477
 
477
 
484
   #define X_MAX_CURRENT 1000  //in mA
484
   #define X_MAX_CURRENT 1000  //in mA
485
   #define X_SENSE_RESISTOR 91 //in mOhms
485
   #define X_SENSE_RESISTOR 91 //in mOhms
486
   #define X_MICROSTEPS 16     //number of microsteps
486
   #define X_MICROSTEPS 16     //number of microsteps
487
-  
487
+
488
 //#define X2_IS_TMC
488
 //#define X2_IS_TMC
489
   #define X2_MAX_CURRENT 1000  //in mA
489
   #define X2_MAX_CURRENT 1000  //in mA
490
   #define X2_SENSE_RESISTOR 91 //in mOhms
490
   #define X2_SENSE_RESISTOR 91 //in mOhms
491
   #define X2_MICROSTEPS 16     //number of microsteps
491
   #define X2_MICROSTEPS 16     //number of microsteps
492
-  
492
+
493
 //#define Y_IS_TMC
493
 //#define Y_IS_TMC
494
   #define Y_MAX_CURRENT 1000  //in mA
494
   #define Y_MAX_CURRENT 1000  //in mA
495
   #define Y_SENSE_RESISTOR 91 //in mOhms
495
   #define Y_SENSE_RESISTOR 91 //in mOhms
496
   #define Y_MICROSTEPS 16     //number of microsteps
496
   #define Y_MICROSTEPS 16     //number of microsteps
497
-  
497
+
498
 //#define Y2_IS_TMC
498
 //#define Y2_IS_TMC
499
   #define Y2_MAX_CURRENT 1000  //in mA
499
   #define Y2_MAX_CURRENT 1000  //in mA
500
   #define Y2_SENSE_RESISTOR 91 //in mOhms
500
   #define Y2_SENSE_RESISTOR 91 //in mOhms
501
-  #define Y2_MICROSTEPS 16     //number of microsteps 
502
-  
501
+  #define Y2_MICROSTEPS 16     //number of microsteps
502
+
503
 //#define Z_IS_TMC
503
 //#define Z_IS_TMC
504
   #define Z_MAX_CURRENT 1000  //in mA
504
   #define Z_MAX_CURRENT 1000  //in mA
505
   #define Z_SENSE_RESISTOR 91 //in mOhms
505
   #define Z_SENSE_RESISTOR 91 //in mOhms
506
   #define Z_MICROSTEPS 16     //number of microsteps
506
   #define Z_MICROSTEPS 16     //number of microsteps
507
-  
507
+
508
 //#define Z2_IS_TMC
508
 //#define Z2_IS_TMC
509
   #define Z2_MAX_CURRENT 1000  //in mA
509
   #define Z2_MAX_CURRENT 1000  //in mA
510
   #define Z2_SENSE_RESISTOR 91 //in mOhms
510
   #define Z2_SENSE_RESISTOR 91 //in mOhms
511
   #define Z2_MICROSTEPS 16     //number of microsteps
511
   #define Z2_MICROSTEPS 16     //number of microsteps
512
-  
512
+
513
 //#define E0_IS_TMC
513
 //#define E0_IS_TMC
514
   #define E0_MAX_CURRENT 1000  //in mA
514
   #define E0_MAX_CURRENT 1000  //in mA
515
   #define E0_SENSE_RESISTOR 91 //in mOhms
515
   #define E0_SENSE_RESISTOR 91 //in mOhms
516
   #define E0_MICROSTEPS 16     //number of microsteps
516
   #define E0_MICROSTEPS 16     //number of microsteps
517
-  
517
+
518
 //#define E1_IS_TMC
518
 //#define E1_IS_TMC
519
   #define E1_MAX_CURRENT 1000  //in mA
519
   #define E1_MAX_CURRENT 1000  //in mA
520
   #define E1_SENSE_RESISTOR 91 //in mOhms
520
   #define E1_SENSE_RESISTOR 91 //in mOhms
521
-  #define E1_MICROSTEPS 16     //number of microsteps 
522
-  
521
+  #define E1_MICROSTEPS 16     //number of microsteps
522
+
523
 //#define E2_IS_TMC
523
 //#define E2_IS_TMC
524
   #define E2_MAX_CURRENT 1000  //in mA
524
   #define E2_MAX_CURRENT 1000  //in mA
525
   #define E2_SENSE_RESISTOR 91 //in mOhms
525
   #define E2_SENSE_RESISTOR 91 //in mOhms
526
-  #define E2_MICROSTEPS 16     //number of microsteps 
527
-  
526
+  #define E2_MICROSTEPS 16     //number of microsteps
527
+
528
 //#define E3_IS_TMC
528
 //#define E3_IS_TMC
529
   #define E3_MAX_CURRENT 1000  //in mA
529
   #define E3_MAX_CURRENT 1000  //in mA
530
   #define E3_SENSE_RESISTOR 91 //in mOhms
530
   #define E3_SENSE_RESISTOR 91 //in mOhms
531
-  #define E3_MICROSTEPS 16     //number of microsteps   
531
+  #define E3_MICROSTEPS 16     //number of microsteps
532
 
532
 
533
 #endif
533
 #endif
534
 
534
 
535
 /******************************************************************************\
535
 /******************************************************************************\
536
- * enable this section if you have L6470  motor drivers. 
536
+ * enable this section if you have L6470  motor drivers.
537
  * you need to import the L6470 library into the arduino IDE for this
537
  * you need to import the L6470 library into the arduino IDE for this
538
  ******************************************************************************/
538
  ******************************************************************************/
539
 
539
 
544
 
544
 
545
 //#define X_IS_L6470
545
 //#define X_IS_L6470
546
   #define X_MICROSTEPS 16     //number of microsteps
546
   #define X_MICROSTEPS 16     //number of microsteps
547
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
547
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
548
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
548
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
549
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
549
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
550
-  
550
+
551
 //#define X2_IS_L6470
551
 //#define X2_IS_L6470
552
   #define X2_MICROSTEPS 16     //number of microsteps
552
   #define X2_MICROSTEPS 16     //number of microsteps
553
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
553
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
554
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
554
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
555
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
555
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
556
-  
556
+
557
 //#define Y_IS_L6470
557
 //#define Y_IS_L6470
558
   #define Y_MICROSTEPS 16     //number of microsteps
558
   #define Y_MICROSTEPS 16     //number of microsteps
559
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
559
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
560
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
560
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
561
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
561
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
562
-  
562
+
563
 //#define Y2_IS_L6470
563
 //#define Y2_IS_L6470
564
-  #define Y2_MICROSTEPS 16     //number of microsteps 
565
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
564
+  #define Y2_MICROSTEPS 16     //number of microsteps
565
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
566
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
566
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
567
-  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
568
-  
567
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
568
+
569
 //#define Z_IS_L6470
569
 //#define Z_IS_L6470
570
   #define Z_MICROSTEPS 16     //number of microsteps
570
   #define Z_MICROSTEPS 16     //number of microsteps
571
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
571
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
572
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
572
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
573
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
573
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
574
-  
574
+
575
 //#define Z2_IS_L6470
575
 //#define Z2_IS_L6470
576
   #define Z2_MICROSTEPS 16     //number of microsteps
576
   #define Z2_MICROSTEPS 16     //number of microsteps
577
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
577
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
578
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
578
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
579
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
579
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
580
-  
580
+
581
 //#define E0_IS_L6470
581
 //#define E0_IS_L6470
582
   #define E0_MICROSTEPS 16     //number of microsteps
582
   #define E0_MICROSTEPS 16     //number of microsteps
583
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
583
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
584
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
584
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
585
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
585
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
586
-  
586
+
587
 //#define E1_IS_L6470
587
 //#define E1_IS_L6470
588
-  #define E1_MICROSTEPS 16     //number of microsteps 
589
   #define E1_MICROSTEPS 16     //number of microsteps
588
   #define E1_MICROSTEPS 16     //number of microsteps
590
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
589
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
591
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
590
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
592
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
591
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
593
-  
592
+
594
 //#define E2_IS_L6470
593
 //#define E2_IS_L6470
595
-  #define E2_MICROSTEPS 16     //number of microsteps 
596
   #define E2_MICROSTEPS 16     //number of microsteps
594
   #define E2_MICROSTEPS 16     //number of microsteps
597
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
595
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
598
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
596
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
599
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
597
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
600
-  
598
+
601
 //#define E3_IS_L6470
599
 //#define E3_IS_L6470
602
-  #define E3_MICROSTEPS 16     //number of microsteps   
603
   #define E3_MICROSTEPS 16     //number of microsteps
600
   #define E3_MICROSTEPS 16     //number of microsteps
604
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
601
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
605
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
602
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
606
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
603
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
607
-  
604
+
608
 #endif
605
 #endif
609
 
606
 
610
 #include "Conditionals.h"
607
 #include "Conditionals.h"

+ 2
- 7
Marlin/example_configurations/makibox/Configuration.h 查看文件

590
 // default settings
590
 // default settings
591
 
591
 
592
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {400, 400, 400, 163}     // default steps per unit for ***** MakiBox A6 *****
592
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {400, 400, 400, 163}     // default steps per unit for ***** MakiBox A6 *****
593
-#define DEFAULT_MAX_FEEDRATE          {60, 60, 20, 45}         // (mm/sec)    
593
+#define DEFAULT_MAX_FEEDRATE          {60, 60, 20, 45}         // (mm/sec)
594
 #define DEFAULT_MAX_ACCELERATION      {2000,2000,30,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.
594
 #define DEFAULT_MAX_ACCELERATION      {2000,2000,30,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.
595
 
595
 
596
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration in mm/s^2 for printing moves
596
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration in mm/s^2 for printing moves
744
 
744
 
745
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
745
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
746
 //#define LCD_I2C_VIKI
746
 //#define LCD_I2C_VIKI
747
-  
747
+
748
 // SSD1306 OLED generic display support
748
 // SSD1306 OLED generic display support
749
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
749
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
750
 //#define U8GLIB_SSD1306
750
 //#define U8GLIB_SSD1306
854
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
854
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
855
 //#define FILAMENT_LCD_DISPLAY
855
 //#define FILAMENT_LCD_DISPLAY
856
 
856
 
857
-
858
-
859
-
860
-
861
-
862
 #include "Configuration_adv.h"
857
 #include "Configuration_adv.h"
863
 #include "thermistortables.h"
858
 #include "thermistortables.h"
864
 
859
 

+ 40
- 43
Marlin/example_configurations/makibox/Configuration_adv.h 查看文件

145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
146
 
146
 
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
148
-  // That way the machine is capable to align the bed during home, since both Z steppers are homed. 
148
+  // That way the machine is capable to align the bed during home, since both Z steppers are homed.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
342
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
342
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
343
   // we don't have a big font for Cyrillic, Kana
343
   // we don't have a big font for Cyrillic, Kana
344
   //#define USE_BIG_EDIT_FONT
344
   //#define USE_BIG_EDIT_FONT
345
- 
346
-  // If you have spare 2300Byte of progmem and want to use a 
345
+
346
+  // If you have spare 2300Byte of progmem and want to use a
347
   // smaller font on the Info-screen uncomment the next line.
347
   // smaller font on the Info-screen uncomment the next line.
348
   //#define USE_SMALL_INFOFONT
348
   //#define USE_SMALL_INFOFONT
349
 #endif // DOGLCD
349
 #endif // DOGLCD
465
 #endif
465
 #endif
466
 
466
 
467
 /******************************************************************************\
467
 /******************************************************************************\
468
- * enable this section if you have TMC26X motor drivers. 
468
+ * enable this section if you have TMC26X motor drivers.
469
  * you need to import the TMC26XStepper library into the arduino IDE for this
469
  * you need to import the TMC26XStepper library into the arduino IDE for this
470
  ******************************************************************************/
470
  ******************************************************************************/
471
 
471
 
478
   #define X_MAX_CURRENT 1000  //in mA
478
   #define X_MAX_CURRENT 1000  //in mA
479
   #define X_SENSE_RESISTOR 91 //in mOhms
479
   #define X_SENSE_RESISTOR 91 //in mOhms
480
   #define X_MICROSTEPS 16     //number of microsteps
480
   #define X_MICROSTEPS 16     //number of microsteps
481
-  
481
+
482
 //#define X2_IS_TMC
482
 //#define X2_IS_TMC
483
   #define X2_MAX_CURRENT 1000  //in mA
483
   #define X2_MAX_CURRENT 1000  //in mA
484
   #define X2_SENSE_RESISTOR 91 //in mOhms
484
   #define X2_SENSE_RESISTOR 91 //in mOhms
485
   #define X2_MICROSTEPS 16     //number of microsteps
485
   #define X2_MICROSTEPS 16     //number of microsteps
486
-  
486
+
487
 //#define Y_IS_TMC
487
 //#define Y_IS_TMC
488
   #define Y_MAX_CURRENT 1000  //in mA
488
   #define Y_MAX_CURRENT 1000  //in mA
489
   #define Y_SENSE_RESISTOR 91 //in mOhms
489
   #define Y_SENSE_RESISTOR 91 //in mOhms
490
   #define Y_MICROSTEPS 16     //number of microsteps
490
   #define Y_MICROSTEPS 16     //number of microsteps
491
-  
491
+
492
 //#define Y2_IS_TMC
492
 //#define Y2_IS_TMC
493
   #define Y2_MAX_CURRENT 1000  //in mA
493
   #define Y2_MAX_CURRENT 1000  //in mA
494
   #define Y2_SENSE_RESISTOR 91 //in mOhms
494
   #define Y2_SENSE_RESISTOR 91 //in mOhms
495
-  #define Y2_MICROSTEPS 16     //number of microsteps 
496
-  
495
+  #define Y2_MICROSTEPS 16     //number of microsteps
496
+
497
 //#define Z_IS_TMC
497
 //#define Z_IS_TMC
498
   #define Z_MAX_CURRENT 1000  //in mA
498
   #define Z_MAX_CURRENT 1000  //in mA
499
   #define Z_SENSE_RESISTOR 91 //in mOhms
499
   #define Z_SENSE_RESISTOR 91 //in mOhms
500
   #define Z_MICROSTEPS 16     //number of microsteps
500
   #define Z_MICROSTEPS 16     //number of microsteps
501
-  
501
+
502
 //#define Z2_IS_TMC
502
 //#define Z2_IS_TMC
503
   #define Z2_MAX_CURRENT 1000  //in mA
503
   #define Z2_MAX_CURRENT 1000  //in mA
504
   #define Z2_SENSE_RESISTOR 91 //in mOhms
504
   #define Z2_SENSE_RESISTOR 91 //in mOhms
505
   #define Z2_MICROSTEPS 16     //number of microsteps
505
   #define Z2_MICROSTEPS 16     //number of microsteps
506
-  
506
+
507
 //#define E0_IS_TMC
507
 //#define E0_IS_TMC
508
   #define E0_MAX_CURRENT 1000  //in mA
508
   #define E0_MAX_CURRENT 1000  //in mA
509
   #define E0_SENSE_RESISTOR 91 //in mOhms
509
   #define E0_SENSE_RESISTOR 91 //in mOhms
510
   #define E0_MICROSTEPS 16     //number of microsteps
510
   #define E0_MICROSTEPS 16     //number of microsteps
511
-  
511
+
512
 //#define E1_IS_TMC
512
 //#define E1_IS_TMC
513
   #define E1_MAX_CURRENT 1000  //in mA
513
   #define E1_MAX_CURRENT 1000  //in mA
514
   #define E1_SENSE_RESISTOR 91 //in mOhms
514
   #define E1_SENSE_RESISTOR 91 //in mOhms
515
-  #define E1_MICROSTEPS 16     //number of microsteps 
516
-  
515
+  #define E1_MICROSTEPS 16     //number of microsteps
516
+
517
 //#define E2_IS_TMC
517
 //#define E2_IS_TMC
518
   #define E2_MAX_CURRENT 1000  //in mA
518
   #define E2_MAX_CURRENT 1000  //in mA
519
   #define E2_SENSE_RESISTOR 91 //in mOhms
519
   #define E2_SENSE_RESISTOR 91 //in mOhms
520
-  #define E2_MICROSTEPS 16     //number of microsteps 
521
-  
520
+  #define E2_MICROSTEPS 16     //number of microsteps
521
+
522
 //#define E3_IS_TMC
522
 //#define E3_IS_TMC
523
   #define E3_MAX_CURRENT 1000  //in mA
523
   #define E3_MAX_CURRENT 1000  //in mA
524
   #define E3_SENSE_RESISTOR 91 //in mOhms
524
   #define E3_SENSE_RESISTOR 91 //in mOhms
525
-  #define E3_MICROSTEPS 16     //number of microsteps   
525
+  #define E3_MICROSTEPS 16     //number of microsteps
526
 
526
 
527
 #endif
527
 #endif
528
 
528
 
529
 /******************************************************************************\
529
 /******************************************************************************\
530
- * enable this section if you have L6470  motor drivers. 
530
+ * enable this section if you have L6470  motor drivers.
531
  * you need to import the L6470 library into the arduino IDE for this
531
  * you need to import the L6470 library into the arduino IDE for this
532
  ******************************************************************************/
532
  ******************************************************************************/
533
 
533
 
538
 
538
 
539
 //#define X_IS_L6470
539
 //#define X_IS_L6470
540
   #define X_MICROSTEPS 16     //number of microsteps
540
   #define X_MICROSTEPS 16     //number of microsteps
541
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
541
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
542
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
542
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
543
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
543
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
544
-  
544
+
545
 //#define X2_IS_L6470
545
 //#define X2_IS_L6470
546
   #define X2_MICROSTEPS 16     //number of microsteps
546
   #define X2_MICROSTEPS 16     //number of microsteps
547
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
547
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
548
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
548
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
549
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
549
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
550
-  
550
+
551
 //#define Y_IS_L6470
551
 //#define Y_IS_L6470
552
   #define Y_MICROSTEPS 16     //number of microsteps
552
   #define Y_MICROSTEPS 16     //number of microsteps
553
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
553
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
554
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
554
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
555
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
555
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
556
-  
556
+
557
 //#define Y2_IS_L6470
557
 //#define Y2_IS_L6470
558
-  #define Y2_MICROSTEPS 16     //number of microsteps 
559
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
558
+  #define Y2_MICROSTEPS 16     //number of microsteps
559
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
560
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
560
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
561
-  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
562
-  
561
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
562
+
563
 //#define Z_IS_L6470
563
 //#define Z_IS_L6470
564
   #define Z_MICROSTEPS 16     //number of microsteps
564
   #define Z_MICROSTEPS 16     //number of microsteps
565
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
565
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
566
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
566
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
567
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
567
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
568
-  
568
+
569
 //#define Z2_IS_L6470
569
 //#define Z2_IS_L6470
570
   #define Z2_MICROSTEPS 16     //number of microsteps
570
   #define Z2_MICROSTEPS 16     //number of microsteps
571
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
571
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
572
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
572
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
573
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
573
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
574
-  
574
+
575
 //#define E0_IS_L6470
575
 //#define E0_IS_L6470
576
   #define E0_MICROSTEPS 16     //number of microsteps
576
   #define E0_MICROSTEPS 16     //number of microsteps
577
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
577
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
578
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
578
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
579
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
579
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
580
-  
580
+
581
 //#define E1_IS_L6470
581
 //#define E1_IS_L6470
582
-  #define E1_MICROSTEPS 16     //number of microsteps 
583
   #define E1_MICROSTEPS 16     //number of microsteps
582
   #define E1_MICROSTEPS 16     //number of microsteps
584
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
583
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
585
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
584
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
586
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
585
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
587
-  
586
+
588
 //#define E2_IS_L6470
587
 //#define E2_IS_L6470
589
-  #define E2_MICROSTEPS 16     //number of microsteps 
590
   #define E2_MICROSTEPS 16     //number of microsteps
588
   #define E2_MICROSTEPS 16     //number of microsteps
591
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
589
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
592
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
590
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
593
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
591
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
594
-  
592
+
595
 //#define E3_IS_L6470
593
 //#define E3_IS_L6470
596
-  #define E3_MICROSTEPS 16     //number of microsteps   
597
   #define E3_MICROSTEPS 16     //number of microsteps
594
   #define E3_MICROSTEPS 16     //number of microsteps
598
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
595
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
599
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
596
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
600
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
597
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
601
-  
598
+
602
 #endif
599
 #endif
603
 
600
 
604
 #include "Conditionals.h"
601
 #include "Conditionals.h"

+ 2
- 7
Marlin/example_configurations/tvrrug/Round2/Configuration.h 查看文件

581
 //#define DEFAULT_AXIS_STEPS_PER_UNIT   {81.26, 80.01, 2561, 599.14} // Michel TVRR old
581
 //#define DEFAULT_AXIS_STEPS_PER_UNIT   {81.26, 80.01, 2561, 599.14} // Michel TVRR old
582
 //#define DEFAULT_AXIS_STEPS_PER_UNIT   {71.1, 71.1, 2560, 739.65} // Michel TVRR
582
 //#define DEFAULT_AXIS_STEPS_PER_UNIT   {71.1, 71.1, 2560, 739.65} // Michel TVRR
583
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {71.1, 71.1, 2560, 600} // David TVRR
583
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {71.1, 71.1, 2560, 600} // David TVRR
584
-#define DEFAULT_MAX_FEEDRATE          {500, 500, 5, 45}    // (mm/sec) David TVRR   
584
+#define DEFAULT_MAX_FEEDRATE          {500, 500, 5, 45}    // (mm/sec) David TVRR
585
 #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.
585
 #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.
586
 
586
 
587
 /* MICHEL: This has an impact on the "ripples" in print walls */
587
 /* MICHEL: This has an impact on the "ripples" in print walls */
737
 
737
 
738
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
738
 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
739
 //#define LCD_I2C_VIKI
739
 //#define LCD_I2C_VIKI
740
-  
740
+
741
 // SSD1306 OLED generic display support
741
 // SSD1306 OLED generic display support
742
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
742
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
743
 //#define U8GLIB_SSD1306
743
 //#define U8GLIB_SSD1306
847
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
847
 //When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status.  Status will appear for 5 sec.
848
 //#define FILAMENT_LCD_DISPLAY
848
 //#define FILAMENT_LCD_DISPLAY
849
 
849
 
850
-
851
-
852
-
853
-
854
-
855
 #include "Configuration_adv.h"
850
 #include "Configuration_adv.h"
856
 #include "thermistortables.h"
851
 #include "thermistortables.h"
857
 
852
 

+ 40
- 43
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h 查看文件

145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
145
 #if ENABLED(Z_DUAL_STEPPER_DRIVERS)
146
 
146
 
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
147
   // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
148
-  // That way the machine is capable to align the bed during home, since both Z steppers are homed. 
148
+  // That way the machine is capable to align the bed during home, since both Z steppers are homed.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
149
   // There is also an implementation of M666 (software endstops adjustment) to this feature.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
150
   // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
151
   // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
343
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
343
   // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
344
   // we don't have a big font for Cyrillic, Kana
344
   // we don't have a big font for Cyrillic, Kana
345
   //#define USE_BIG_EDIT_FONT
345
   //#define USE_BIG_EDIT_FONT
346
- 
347
-  // If you have spare 2300Byte of progmem and want to use a 
346
+
347
+  // If you have spare 2300Byte of progmem and want to use a
348
   // smaller font on the Info-screen uncomment the next line.
348
   // smaller font on the Info-screen uncomment the next line.
349
   //#define USE_SMALL_INFOFONT
349
   //#define USE_SMALL_INFOFONT
350
 #endif // DOGLCD
350
 #endif // DOGLCD
466
 #endif
466
 #endif
467
 
467
 
468
 /******************************************************************************\
468
 /******************************************************************************\
469
- * enable this section if you have TMC26X motor drivers. 
469
+ * enable this section if you have TMC26X motor drivers.
470
  * you need to import the TMC26XStepper library into the arduino IDE for this
470
  * you need to import the TMC26XStepper library into the arduino IDE for this
471
  ******************************************************************************/
471
  ******************************************************************************/
472
 
472
 
479
   #define X_MAX_CURRENT 1000  //in mA
479
   #define X_MAX_CURRENT 1000  //in mA
480
   #define X_SENSE_RESISTOR 91 //in mOhms
480
   #define X_SENSE_RESISTOR 91 //in mOhms
481
   #define X_MICROSTEPS 16     //number of microsteps
481
   #define X_MICROSTEPS 16     //number of microsteps
482
-  
482
+
483
 //#define X2_IS_TMC
483
 //#define X2_IS_TMC
484
   #define X2_MAX_CURRENT 1000  //in mA
484
   #define X2_MAX_CURRENT 1000  //in mA
485
   #define X2_SENSE_RESISTOR 91 //in mOhms
485
   #define X2_SENSE_RESISTOR 91 //in mOhms
486
   #define X2_MICROSTEPS 16     //number of microsteps
486
   #define X2_MICROSTEPS 16     //number of microsteps
487
-  
487
+
488
 //#define Y_IS_TMC
488
 //#define Y_IS_TMC
489
   #define Y_MAX_CURRENT 1000  //in mA
489
   #define Y_MAX_CURRENT 1000  //in mA
490
   #define Y_SENSE_RESISTOR 91 //in mOhms
490
   #define Y_SENSE_RESISTOR 91 //in mOhms
491
   #define Y_MICROSTEPS 16     //number of microsteps
491
   #define Y_MICROSTEPS 16     //number of microsteps
492
-  
492
+
493
 //#define Y2_IS_TMC
493
 //#define Y2_IS_TMC
494
   #define Y2_MAX_CURRENT 1000  //in mA
494
   #define Y2_MAX_CURRENT 1000  //in mA
495
   #define Y2_SENSE_RESISTOR 91 //in mOhms
495
   #define Y2_SENSE_RESISTOR 91 //in mOhms
496
-  #define Y2_MICROSTEPS 16     //number of microsteps 
497
-  
496
+  #define Y2_MICROSTEPS 16     //number of microsteps
497
+
498
 //#define Z_IS_TMC
498
 //#define Z_IS_TMC
499
   #define Z_MAX_CURRENT 1000  //in mA
499
   #define Z_MAX_CURRENT 1000  //in mA
500
   #define Z_SENSE_RESISTOR 91 //in mOhms
500
   #define Z_SENSE_RESISTOR 91 //in mOhms
501
   #define Z_MICROSTEPS 16     //number of microsteps
501
   #define Z_MICROSTEPS 16     //number of microsteps
502
-  
502
+
503
 //#define Z2_IS_TMC
503
 //#define Z2_IS_TMC
504
   #define Z2_MAX_CURRENT 1000  //in mA
504
   #define Z2_MAX_CURRENT 1000  //in mA
505
   #define Z2_SENSE_RESISTOR 91 //in mOhms
505
   #define Z2_SENSE_RESISTOR 91 //in mOhms
506
   #define Z2_MICROSTEPS 16     //number of microsteps
506
   #define Z2_MICROSTEPS 16     //number of microsteps
507
-  
507
+
508
 //#define E0_IS_TMC
508
 //#define E0_IS_TMC
509
   #define E0_MAX_CURRENT 1000  //in mA
509
   #define E0_MAX_CURRENT 1000  //in mA
510
   #define E0_SENSE_RESISTOR 91 //in mOhms
510
   #define E0_SENSE_RESISTOR 91 //in mOhms
511
   #define E0_MICROSTEPS 16     //number of microsteps
511
   #define E0_MICROSTEPS 16     //number of microsteps
512
-  
512
+
513
 //#define E1_IS_TMC
513
 //#define E1_IS_TMC
514
   #define E1_MAX_CURRENT 1000  //in mA
514
   #define E1_MAX_CURRENT 1000  //in mA
515
   #define E1_SENSE_RESISTOR 91 //in mOhms
515
   #define E1_SENSE_RESISTOR 91 //in mOhms
516
-  #define E1_MICROSTEPS 16     //number of microsteps 
517
-  
516
+  #define E1_MICROSTEPS 16     //number of microsteps
517
+
518
 //#define E2_IS_TMC
518
 //#define E2_IS_TMC
519
   #define E2_MAX_CURRENT 1000  //in mA
519
   #define E2_MAX_CURRENT 1000  //in mA
520
   #define E2_SENSE_RESISTOR 91 //in mOhms
520
   #define E2_SENSE_RESISTOR 91 //in mOhms
521
-  #define E2_MICROSTEPS 16     //number of microsteps 
522
-  
521
+  #define E2_MICROSTEPS 16     //number of microsteps
522
+
523
 //#define E3_IS_TMC
523
 //#define E3_IS_TMC
524
   #define E3_MAX_CURRENT 1000  //in mA
524
   #define E3_MAX_CURRENT 1000  //in mA
525
   #define E3_SENSE_RESISTOR 91 //in mOhms
525
   #define E3_SENSE_RESISTOR 91 //in mOhms
526
-  #define E3_MICROSTEPS 16     //number of microsteps   
526
+  #define E3_MICROSTEPS 16     //number of microsteps
527
 
527
 
528
 #endif
528
 #endif
529
 
529
 
530
 /******************************************************************************\
530
 /******************************************************************************\
531
- * enable this section if you have L6470  motor drivers. 
531
+ * enable this section if you have L6470  motor drivers.
532
  * you need to import the L6470 library into the arduino IDE for this
532
  * you need to import the L6470 library into the arduino IDE for this
533
  ******************************************************************************/
533
  ******************************************************************************/
534
 
534
 
539
 
539
 
540
 //#define X_IS_L6470
540
 //#define X_IS_L6470
541
   #define X_MICROSTEPS 16     //number of microsteps
541
   #define X_MICROSTEPS 16     //number of microsteps
542
-  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
542
+  #define X_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
543
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
543
   #define X_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
544
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
544
   #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
545
-  
545
+
546
 //#define X2_IS_L6470
546
 //#define X2_IS_L6470
547
   #define X2_MICROSTEPS 16     //number of microsteps
547
   #define X2_MICROSTEPS 16     //number of microsteps
548
-  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
548
+  #define X2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
549
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
549
   #define X2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
550
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
550
   #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
551
-  
551
+
552
 //#define Y_IS_L6470
552
 //#define Y_IS_L6470
553
   #define Y_MICROSTEPS 16     //number of microsteps
553
   #define Y_MICROSTEPS 16     //number of microsteps
554
-  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
554
+  #define Y_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
555
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
555
   #define Y_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
556
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
556
   #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
557
-  
557
+
558
 //#define Y2_IS_L6470
558
 //#define Y2_IS_L6470
559
-  #define Y2_MICROSTEPS 16     //number of microsteps 
560
-  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
559
+  #define Y2_MICROSTEPS 16     //number of microsteps
560
+  #define Y2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
561
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
561
   #define Y2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
562
-  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall 
563
-  
562
+  #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
563
+
564
 //#define Z_IS_L6470
564
 //#define Z_IS_L6470
565
   #define Z_MICROSTEPS 16     //number of microsteps
565
   #define Z_MICROSTEPS 16     //number of microsteps
566
-  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
566
+  #define Z_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
567
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
567
   #define Z_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
568
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
568
   #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
569
-  
569
+
570
 //#define Z2_IS_L6470
570
 //#define Z2_IS_L6470
571
   #define Z2_MICROSTEPS 16     //number of microsteps
571
   #define Z2_MICROSTEPS 16     //number of microsteps
572
-  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
572
+  #define Z2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
573
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
573
   #define Z2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
574
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
574
   #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
575
-  
575
+
576
 //#define E0_IS_L6470
576
 //#define E0_IS_L6470
577
   #define E0_MICROSTEPS 16     //number of microsteps
577
   #define E0_MICROSTEPS 16     //number of microsteps
578
-  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
578
+  #define E0_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
579
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
579
   #define E0_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
580
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
580
   #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
581
-  
581
+
582
 //#define E1_IS_L6470
582
 //#define E1_IS_L6470
583
-  #define E1_MICROSTEPS 16     //number of microsteps 
584
   #define E1_MICROSTEPS 16     //number of microsteps
583
   #define E1_MICROSTEPS 16     //number of microsteps
585
-  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
584
+  #define E1_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
586
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
585
   #define E1_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
587
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
586
   #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
588
-  
587
+
589
 //#define E2_IS_L6470
588
 //#define E2_IS_L6470
590
-  #define E2_MICROSTEPS 16     //number of microsteps 
591
   #define E2_MICROSTEPS 16     //number of microsteps
589
   #define E2_MICROSTEPS 16     //number of microsteps
592
-  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
590
+  #define E2_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
593
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
591
   #define E2_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
594
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
592
   #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
595
-  
593
+
596
 //#define E3_IS_L6470
594
 //#define E3_IS_L6470
597
-  #define E3_MICROSTEPS 16     //number of microsteps   
598
   #define E3_MICROSTEPS 16     //number of microsteps
595
   #define E3_MICROSTEPS 16     //number of microsteps
599
-  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high    
596
+  #define E3_K_VAL 50          // 0 - 255, Higher values, are higher power. Be carefull not to go too high
600
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
597
   #define E3_OVERCURRENT 2000  //maxc current in mA. If the current goes over this value, the driver will switch off
601
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
598
   #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
602
-  
599
+
603
 #endif
600
 #endif
604
 
601
 
605
 #include "Conditionals.h"
602
 #include "Conditionals.h"

+ 6
- 6
Marlin/fastio.h 查看文件

30
 
30
 
31
 #define _WRITE_C(IO, v)   do { if (v) { \
31
 #define _WRITE_C(IO, v)   do { if (v) { \
32
                                          CRITICAL_SECTION_START; \
32
                                          CRITICAL_SECTION_START; \
33
-                                         {DIO ##  IO ## _WPORT |= MASK(DIO ## IO ## _PIN); }\
33
+                                         {DIO ##  IO ## _WPORT |= MASK(DIO ## IO ## _PIN); } \
34
                                          CRITICAL_SECTION_END; \
34
                                          CRITICAL_SECTION_END; \
35
-                                       }\
36
-                                       else {\
35
+                                       } \
36
+                                       else { \
37
                                          CRITICAL_SECTION_START; \
37
                                          CRITICAL_SECTION_START; \
38
-                                         {DIO ##  IO ## _WPORT &= ~MASK(DIO ## IO ## _PIN); }\
38
+                                         {DIO ##  IO ## _WPORT &= ~MASK(DIO ## IO ## _PIN); } \
39
                                          CRITICAL_SECTION_END; \
39
                                          CRITICAL_SECTION_END; \
40
-                                       }\
41
-                                     }\
40
+                                       } \
41
+                                     } \
42
                                      while (0)
42
                                      while (0)
43
 
43
 
44
 #define _WRITE(IO, v)  do {  if (&(DIO ##  IO ## _RPORT) >= (uint8_t *)0x100) {_WRITE_C(IO, v); } else {_WRITE_NC(IO, v); }; } while (0)
44
 #define _WRITE(IO, v)  do {  if (&(DIO ##  IO ## _RPORT) >= (uint8_t *)0x100) {_WRITE_C(IO, v); } else {_WRITE_NC(IO, v); }; } while (0)

+ 4
- 2
Marlin/planner.cpp 查看文件

439
           // Just starting up fan - run at full power.
439
           // Just starting up fan - run at full power.
440
           fan_kick_end = ms + FAN_KICKSTART_TIME;
440
           fan_kick_end = ms + FAN_KICKSTART_TIME;
441
           tail_fan_speed = 255;
441
           tail_fan_speed = 255;
442
-        } else if (fan_kick_end > ms)
442
+        }
443
+        else if (fan_kick_end > ms)
443
           // Fan still spinning up.
444
           // Fan still spinning up.
444
           tail_fan_speed = 255;
445
           tail_fan_speed = 255;
445
-        } else {
446
+        }
447
+        else {
446
           fan_kick_end = 0;
448
           fan_kick_end = 0;
447
         }
449
         }
448
     #endif //FAN_KICKSTART_TIME
450
     #endif //FAN_KICKSTART_TIME

+ 10
- 13
Marlin/qr_solve.cpp 查看文件

494
         if (scale < absxi) {
494
         if (scale < absxi) {
495
           ssq = 1.0 + ssq * (scale / absxi) * (scale / absxi);
495
           ssq = 1.0 + ssq * (scale / absxi) * (scale / absxi);
496
           scale = absxi;
496
           scale = absxi;
497
-        } else
497
+        }
498
+        else
498
           ssq = ssq + (absxi / scale) * (absxi / scale);
499
           ssq = ssq + (absxi / scale) * (absxi / scale);
499
       }
500
       }
500
       ix += incx;
501
       ix += incx;
1023
 
1024
 
1024
   if (kr != 0) {
1025
   if (kr != 0) {
1025
     job = 110;
1026
     job = 110;
1026
-    info = dqrsl(a, lda, m, kr, qraux, b, rsd, rsd, x, rsd, rsd, job);
1027
+    info = dqrsl(a, lda, m, kr, qraux, b, rsd, rsd, x, rsd, rsd, job); UNUSED(info);
1027
   }
1028
   }
1028
 
1029
 
1029
   for (i = 0; i < n; i++)
1030
   for (i = 0; i < n; i++)
1404
       x[i + 3] = sa * x[i + 3];
1405
       x[i + 3] = sa * x[i + 3];
1405
       x[i + 4] = sa * x[i + 4];
1406
       x[i + 4] = sa * x[i + 4];
1406
     }
1407
     }
1407
-  } else {
1408
+  }
1409
+  else {
1408
     if (0 <= incx)
1410
     if (0 <= incx)
1409
       ix = 0;
1411
       ix = 0;
1410
     else
1412
     else
1486
       x[i + 2] = y[i + 2];
1488
       x[i + 2] = y[i + 2];
1487
       y[i + 2] = temp;
1489
       y[i + 2] = temp;
1488
     }
1490
     }
1489
-  } else {
1490
-    if (0 <= incx)
1491
-      ix = 0;
1492
-    else
1493
-      ix = (- n + 1) * incx;
1494
-    if (0 <= incy)
1495
-      iy = 0;
1496
-    else
1497
-      iy = (- n + 1) * incy;
1491
+  }
1492
+  else {
1493
+    ix = (incx >= 0) ? 0 : (-n + 1) * incx;
1494
+    iy = (incy >= 0) ? 0 : (-n + 1) * incy;
1498
     for (i = 0; i < n; i++) {
1495
     for (i = 0; i < n; i++) {
1499
       temp = x[ix];
1496
       temp = x[ix];
1500
       x[ix] = y[iy];
1497
       x[ix] = y[iy];
1566
   tol = r8_epsilon() / r8mat_amax(m, n, a_qr);
1563
   tol = r8_epsilon() / r8mat_amax(m, n, a_qr);
1567
   itask = 1;
1564
   itask = 1;
1568
 
1565
 
1569
-  ind = dqrls(a_qr, lda, m, n, tol, &kr, b, x, r, jpvt, qraux, itask);
1566
+  ind = dqrls(a_qr, lda, m, n, tol, &kr, b, x, r, jpvt, qraux, itask); UNUSED(ind);
1570
 }
1567
 }
1571
 /******************************************************************************/
1568
 /******************************************************************************/
1572
 
1569
 

+ 6
- 4
Marlin/stepper.cpp 查看文件

139
       if (Z_HOME_DIR > 0) {\
139
       if (Z_HOME_DIR > 0) {\
140
         if (!(TEST(old_endstop_bits, Z_MAX) && (count_direction[Z_AXIS] > 0)) && !locked_z_motor) Z_STEP_WRITE(v); \
140
         if (!(TEST(old_endstop_bits, Z_MAX) && (count_direction[Z_AXIS] > 0)) && !locked_z_motor) Z_STEP_WRITE(v); \
141
         if (!(TEST(old_endstop_bits, Z2_MAX) && (count_direction[Z_AXIS] > 0)) && !locked_z2_motor) Z2_STEP_WRITE(v); \
141
         if (!(TEST(old_endstop_bits, Z2_MAX) && (count_direction[Z_AXIS] > 0)) && !locked_z2_motor) Z2_STEP_WRITE(v); \
142
-      } else {\
142
+      } \
143
+      else { \
143
         if (!(TEST(old_endstop_bits, Z_MIN) && (count_direction[Z_AXIS] < 0)) && !locked_z_motor) Z_STEP_WRITE(v); \
144
         if (!(TEST(old_endstop_bits, Z_MIN) && (count_direction[Z_AXIS] < 0)) && !locked_z_motor) Z_STEP_WRITE(v); \
144
         if (!(TEST(old_endstop_bits, Z2_MIN) && (count_direction[Z_AXIS] < 0)) && !locked_z2_motor) Z2_STEP_WRITE(v); \
145
         if (!(TEST(old_endstop_bits, Z2_MIN) && (count_direction[Z_AXIS] < 0)) && !locked_z2_motor) Z2_STEP_WRITE(v); \
145
       } \
146
       } \
146
-    } else { \
147
+    } \
148
+    else { \
147
       Z_STEP_WRITE(v); \
149
       Z_STEP_WRITE(v); \
148
       Z2_STEP_WRITE(v); \
150
       Z2_STEP_WRITE(v); \
149
     }
151
     }
397
               COPY_BIT(current_endstop_bits, Z_MIN, Z2_MIN);
399
               COPY_BIT(current_endstop_bits, Z_MIN, Z2_MIN);
398
             #endif
400
             #endif
399
 
401
 
400
-            byte z_test = TEST_ENDSTOP(Z_MIN) << 0 + TEST_ENDSTOP(Z2_MIN) << 1; // bit 0 for Z, bit 1 for Z2
402
+            byte z_test = TEST_ENDSTOP(Z_MIN) | (TEST_ENDSTOP(Z2_MIN) << 1); // bit 0 for Z, bit 1 for Z2
401
 
403
 
402
             if (z_test && current_block->steps[Z_AXIS] > 0) { // z_test = Z_MIN || Z2_MIN
404
             if (z_test && current_block->steps[Z_AXIS] > 0) { // z_test = Z_MIN || Z2_MIN
403
               endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS];
405
               endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS];
433
               COPY_BIT(current_endstop_bits, Z_MAX, Z2_MAX);
435
               COPY_BIT(current_endstop_bits, Z_MAX, Z2_MAX);
434
             #endif
436
             #endif
435
 
437
 
436
-            byte z_test = TEST_ENDSTOP(Z_MAX) << 0 + TEST_ENDSTOP(Z2_MAX) << 1; // bit 0 for Z, bit 1 for Z2
438
+            byte z_test = TEST_ENDSTOP(Z_MAX) | (TEST_ENDSTOP(Z2_MAX) << 1); // bit 0 for Z, bit 1 for Z2
437
 
439
 
438
             if (z_test && current_block->steps[Z_AXIS] > 0) {  // t_test = Z_MAX || Z2_MAX
440
             if (z_test && current_block->steps[Z_AXIS] > 0) {  // t_test = Z_MAX || Z2_MAX
439
               endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS];
441
               endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS];

+ 12
- 6
Marlin/temperature.cpp 查看文件

21
 #include "Marlin.h"
21
 #include "Marlin.h"
22
 #include "ultralcd.h"
22
 #include "ultralcd.h"
23
 #include "temperature.h"
23
 #include "temperature.h"
24
-#include "watchdog.h"
25
 #include "language.h"
24
 #include "language.h"
26
-
27
 #include "Sd2PinMap.h"
25
 #include "Sd2PinMap.h"
28
 
26
 
27
+#if ENABLED(USE_WATCHDOG)
28
+  #include "watchdog.h"
29
+#endif
30
+
29
 //===========================================================================
31
 //===========================================================================
30
 //================================== macros =================================
32
 //================================== macros =================================
31
 //===========================================================================
33
 //===========================================================================
207
 
209
 
208
   long bias, d;
210
   long bias, d;
209
   float Ku, Tu;
211
   float Ku, Tu;
210
-  float Kp, Ki, Kd;
212
+  float Kp = 0, Ki = 0, Kd = 0;
211
   float max = 0, min = 10000;
213
   float max = 0, min = 10000;
212
 
214
 
213
   #if HAS_AUTO_FAN
215
   #if HAS_AUTO_FAN
511
             if (e_position > last_position[e]) {
513
             if (e_position > last_position[e]) {
512
               lpq[lpq_ptr++] = e_position - last_position[e];
514
               lpq[lpq_ptr++] = e_position - last_position[e];
513
               last_position[e] = e_position;
515
               last_position[e] = e_position;
514
-            } else {
516
+            }
517
+            else {
515
               lpq[lpq_ptr++] = 0;
518
               lpq[lpq_ptr++] = 0;
516
             }
519
             }
517
             if (lpq_ptr >= lpq_len) lpq_ptr = 0;
520
             if (lpq_ptr >= lpq_len) lpq_ptr = 0;
818
   #if HAS_FILAMENT_SENSOR
821
   #if HAS_FILAMENT_SENSOR
819
     filament_width_meas = analog2widthFil();
822
     filament_width_meas = analog2widthFil();
820
   #endif
823
   #endif
821
-  //Reset the watchdog after we know we have a temperature measurement.
822
-  watchdog_reset();
824
+
825
+  #if ENABLED(USE_WATCHDOG)
826
+    // Reset the watchdog after we know we have a temperature measurement.
827
+    watchdog_reset();
828
+  #endif
823
 
829
 
824
   CRITICAL_SECTION_START;
830
   CRITICAL_SECTION_START;
825
   temp_meas_ready = false;
831
   temp_meas_ready = false;

+ 49
- 68
Marlin/ultralcd.cpp 查看文件

475
 #endif //BABYSTEPPING
475
 #endif //BABYSTEPPING
476
 
476
 
477
 /**
477
 /**
478
- *
479
- * "Tune" submenu
480
- *
478
+ * Watch temperature callbacks
481
  */
479
  */
480
+#if TEMP_SENSOR_0 != 0
481
+  void watch_temp_callback_E0() { start_watching_heater(0); }
482
+#endif
483
+#if EXTRUDERS > 1 && TEMP_SENSOR_1 != 0
484
+  void watch_temp_callback_E1() { start_watching_heater(1); }
485
+  #if EXTRUDERS > 2 && TEMP_SENSOR_2 != 0
486
+    void watch_temp_callback_E2() { start_watching_heater(2); }
487
+    #if EXTRUDERS > 3 && TEMP_SENSOR_3 != 0
488
+      void watch_temp_callback_E3() { start_watching_heater(3); }
489
+    #endif // EXTRUDERS > 3
490
+  #endif // EXTRUDERS > 2
491
+#endif // EXTRUDERS > 1
482
 
492
 
483
-static void lcd_tune_menu() {
484
-  START_MENU();
485
-
486
-  //
487
-  // ^ Main
488
-  //
489
-  MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
490
-
491
-  //
492
-  // Speed:
493
-  //
494
-  MENU_ITEM_EDIT(int3, MSG_SPEED, &feedrate_multiplier, 10, 999);
495
-
493
+/**
494
+ * Items shared between Tune and Temperature menus
495
+ */
496
+static void nozzle_bed_fan_menu_items(uint8_t &encoderLine, uint8_t &_lineNr, uint8_t &_drawLineNr, uint8_t &_menuItemNr, bool &wasClicked, bool &itemSelected) {
496
   //
497
   //
497
   // Nozzle:
498
   // Nozzle:
498
-  // Nozzle 1:
499
-  // Nozzle 2:
500
-  // Nozzle 3:
501
-  // Nozzle 4:
499
+  // Nozzle [1-4]:
502
   //
500
   //
503
   #if EXTRUDERS == 1
501
   #if EXTRUDERS == 1
504
     #if TEMP_SENSOR_0 != 0
502
     #if TEMP_SENSOR_0 != 0
505
-      MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
503
+      MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15, watch_temp_callback_E0);
506
     #endif
504
     #endif
507
   #else //EXTRUDERS > 1
505
   #else //EXTRUDERS > 1
508
     #if TEMP_SENSOR_0 != 0
506
     #if TEMP_SENSOR_0 != 0
509
-      MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N1, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
507
+      MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N1, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15, watch_temp_callback_E0);
510
     #endif
508
     #endif
511
     #if TEMP_SENSOR_1 != 0
509
     #if TEMP_SENSOR_1 != 0
512
-      MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N2, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
510
+      MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N2, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15, watch_temp_callback_E1);
513
     #endif
511
     #endif
514
     #if EXTRUDERS > 2
512
     #if EXTRUDERS > 2
515
       #if TEMP_SENSOR_2 != 0
513
       #if TEMP_SENSOR_2 != 0
516
-        MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N3, &target_temperature[2], 0, HEATER_2_MAXTEMP - 15);
514
+        MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N3, &target_temperature[2], 0, HEATER_2_MAXTEMP - 15, watch_temp_callback_E2);
517
       #endif
515
       #endif
518
       #if EXTRUDERS > 3
516
       #if EXTRUDERS > 3
519
         #if TEMP_SENSOR_3 != 0
517
         #if TEMP_SENSOR_3 != 0
520
-          MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N4, &target_temperature[3], 0, HEATER_3_MAXTEMP - 15);
518
+          MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N4, &target_temperature[3], 0, HEATER_3_MAXTEMP - 15, watch_temp_callback_E3);
521
         #endif
519
         #endif
522
-      #endif //EXTRUDERS > 3
523
-    #endif //EXTRUDERS > 2
524
-  #endif //EXTRUDERS > 1
520
+      #endif // EXTRUDERS > 3
521
+    #endif // EXTRUDERS > 2
522
+  #endif // EXTRUDERS > 1
525
 
523
 
526
   //
524
   //
527
   // Bed:
525
   // Bed:
534
   // Fan Speed:
532
   // Fan Speed:
535
   //
533
   //
536
   MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);
534
   MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);
535
+}
536
+
537
+
538
+/**
539
+ *
540
+ * "Tune" submenu
541
+ *
542
+ */
543
+static void lcd_tune_menu() {
544
+  START_MENU();
537
 
545
 
538
   //
546
   //
539
-  // Flow:
547
+  // ^ Main
548
+  //
549
+  MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
550
+
551
+  //
552
+  // Speed:
540
   //
553
   //
541
-  MENU_ITEM_EDIT(int3, MSG_FLOW, &extruder_multiplier[active_extruder], 10, 999);
554
+  MENU_ITEM_EDIT(int3, MSG_SPEED, &feedrate_multiplier, 10, 999);
555
+
556
+  // Nozzle, Bed, and Fan Control
557
+  nozzle_bed_fan_menu_items(encoderLine, _lineNr, _drawLineNr, _menuItemNr, wasClicked, itemSelected);
542
 
558
 
543
   //
559
   //
544
   // Flow:
560
   // Flow:
550
   #if EXTRUDERS == 1
566
   #if EXTRUDERS == 1
551
     MENU_ITEM_EDIT(int3, MSG_FLOW, &extruder_multiplier[0], 10, 999);
567
     MENU_ITEM_EDIT(int3, MSG_FLOW, &extruder_multiplier[0], 10, 999);
552
   #else // EXTRUDERS > 1
568
   #else // EXTRUDERS > 1
569
+    MENU_ITEM_EDIT(int3, MSG_FLOW, &extruder_multiplier[active_extruder], 10, 999);
553
     MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N1, &extruder_multiplier[0], 10, 999);
570
     MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N1, &extruder_multiplier[0], 10, 999);
554
     MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N2, &extruder_multiplier[1], 10, 999);
571
     MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N2, &extruder_multiplier[1], 10, 999);
555
     #if EXTRUDERS > 2
572
     #if EXTRUDERS > 2
1002
   //
1019
   //
1003
   MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
1020
   MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
1004
 
1021
 
1005
-  //
1006
-  // Nozzle
1007
-  // Nozzle 1, Nozzle 2, Nozzle 3, Nozzle 4
1008
-  //
1009
-  #if EXTRUDERS == 1
1010
-    #if TEMP_SENSOR_0 != 0
1011
-      MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
1012
-    #endif
1013
-  #else //EXTRUDERS > 1
1014
-    #if TEMP_SENSOR_0 != 0
1015
-      MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N1, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
1016
-    #endif
1017
-    #if TEMP_SENSOR_1 != 0
1018
-      MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N2, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
1019
-    #endif
1020
-    #if EXTRUDERS > 2
1021
-      #if TEMP_SENSOR_2 != 0
1022
-        MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N3, &target_temperature[2], 0, HEATER_2_MAXTEMP - 15);
1023
-      #endif
1024
-      #if EXTRUDERS > 3
1025
-        #if TEMP_SENSOR_3 != 0
1026
-          MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N4, &target_temperature[3], 0, HEATER_3_MAXTEMP - 15);
1027
-        #endif
1028
-      #endif // EXTRUDERS > 3
1029
-    #endif // EXTRUDERS > 2
1030
-  #endif // EXTRUDERS > 1
1031
-
1032
-  //
1033
-  // Bed
1034
-  //
1035
-  #if TEMP_SENSOR_BED != 0
1036
-    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_BED, &target_temperature_bed, 0, BED_MAXTEMP - 15);
1037
-  #endif
1038
-
1039
-  //
1040
-  // Fan Speed
1041
-  //
1042
-  MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);
1022
+  // Nozzle, Bed, and Fan Control
1023
+  nozzle_bed_fan_menu_items(encoderLine, _lineNr, _drawLineNr, _menuItemNr, wasClicked, itemSelected);
1043
 
1024
 
1044
   //
1025
   //
1045
   // Autotemp, Min, Max, Fact
1026
   // Autotemp, Min, Max, Fact

+ 2
- 2
Marlin/ultralcd_implementation_hitachi_HD44780.h 查看文件

716
       lcd.print(ftostr12ns(filament_width_meas));
716
       lcd.print(ftostr12ns(filament_width_meas));
717
       lcd_printPGM(PSTR(" V"));
717
       lcd_printPGM(PSTR(" V"));
718
       lcd.print(itostr3(100.0 * volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]));
718
       lcd.print(itostr3(100.0 * volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]));
719
-  	  lcd.print('%');
720
-  	  return;
719
+      lcd.print('%');
720
+      return;
721
     }
721
     }
722
 
722
 
723
   #endif // FILAMENT_LCD_DISPLAY
723
   #endif // FILAMENT_LCD_DISPLAY

+ 69
- 46
Marlin/utf_mapper.h 查看文件

123
 #endif // SIMULATE_ROMFONT
123
 #endif // SIMULATE_ROMFONT
124
 
124
 
125
 #if ENABLED(MAPPER_NON)
125
 #if ENABLED(MAPPER_NON)
126
-  char charset_mapper(char c){
126
+
127
+  char charset_mapper(char c) {
127
     HARDWARE_CHAR_OUT( c );
128
     HARDWARE_CHAR_OUT( c );
128
     return 1;
129
     return 1;
129
   }
130
   }
131
+
130
 #elif ENABLED(MAPPER_C2C3)
132
 #elif ENABLED(MAPPER_C2C3)
131
-  uint8_t utf_hi_char; // UTF-8 high part
132
-  bool seen_c2 = false;
133
-  char charset_mapper(char c){
133
+
134
+  char charset_mapper(char c) {
135
+    static uint8_t utf_hi_char; // UTF-8 high part
136
+    static bool seen_c2 = false;
134
     uint8_t d = c;
137
     uint8_t d = c;
135
     if ( d >= 0x80 ) { // UTF-8 handling
138
     if ( d >= 0x80 ) { // UTF-8 handling
136
       if ( (d >= 0xc0) && (!seen_c2) ) {
139
       if ( (d >= 0xc0) && (!seen_c2) ) {
138
         seen_c2 = true;
141
         seen_c2 = true;
139
         return 0;
142
         return 0;
140
       }
143
       }
141
-      else if (seen_c2){
144
+      else if (seen_c2) {
142
         d &= 0x3f;
145
         d &= 0x3f;
143
         #ifndef MAPPER_ONE_TO_ONE
146
         #ifndef MAPPER_ONE_TO_ONE
144
-          HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
147
+          HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
145
         #else
148
         #else
146
-          HARDWARE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d) ) ;
149
+          HARDWARE_CHAR_OUT((char)(0x80 + (utf_hi_char << 6) + d)) ;
147
         #endif
150
         #endif
148
       }
151
       }
149
       else {
152
       else {
150
-          HARDWARE_CHAR_OUT('?');
153
+        HARDWARE_CHAR_OUT('?');
151
       }
154
       }
152
     }
155
     }
153
     else {
156
     else {
156
     seen_c2 = false;
159
     seen_c2 = false;
157
     return 1;
160
     return 1;
158
   }
161
   }
162
+
159
 #elif ENABLED(MAPPER_D0D1_MOD)
163
 #elif ENABLED(MAPPER_D0D1_MOD)
160
-  uint8_t utf_hi_char; // UTF-8 high part
161
-  bool seen_d5 = false;
162
-  char charset_mapper(char c){
164
+
165
+  char charset_mapper(char c) {
163
     // it is a Russian alphabet translation
166
     // it is a Russian alphabet translation
164
     // except 0401 --> 0xa2 = Ё, 0451 --> 0xb5 = ё
167
     // except 0401 --> 0xa2 = Ё, 0451 --> 0xb5 = ё
168
+    static uint8_t utf_hi_char; // UTF-8 high part
169
+    static bool seen_d5 = false;
165
     uint8_t d = c;
170
     uint8_t d = c;
166
-    if ( d >= 0x80 ) { // UTF-8 handling
167
-      if ((d >= 0xd0) && (!seen_d5)) {
171
+    if (d >= 0x80) { // UTF-8 handling
172
+      if (d >= 0xd0 && !seen_d5) {
168
         utf_hi_char = d - 0xd0;
173
         utf_hi_char = d - 0xd0;
169
         seen_d5 = true;
174
         seen_d5 = true;
170
         return 0;
175
         return 0;
171
-      } else if (seen_d5) {
172
-          d &= 0x3f;
173
-          if ( !utf_hi_char && ( d == 1 )) {
174
-            HARDWARE_CHAR_OUT((char) 0xa2 ); // Ё
175
-        } else if ((utf_hi_char == 1) && (d == 0x11)) {
176
-            HARDWARE_CHAR_OUT((char) 0xb5 ); // ё
177
-          } else {
178
-            HARDWARE_CHAR_OUT((char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x10 ) );
179
-          }
176
+      }
177
+      else if (seen_d5) {
178
+        d &= 0x3f;
179
+        if (!utf_hi_char && d == 1) {
180
+          HARDWARE_CHAR_OUT((char) 0xa2); // Ё
181
+        }
182
+        else if (utf_hi_char == 1 && d == 0x11) {
183
+          HARDWARE_CHAR_OUT((char)0xb5); // ё
180
         }
184
         }
181
         else {
185
         else {
182
-          HARDWARE_CHAR_OUT('?');
186
+          HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x10));
183
         }
187
         }
184
-    } else {
188
+      }
189
+      else {
190
+        HARDWARE_CHAR_OUT('?');
191
+      }
192
+    }
193
+    else {
185
       HARDWARE_CHAR_OUT((char) c );
194
       HARDWARE_CHAR_OUT((char) c );
186
     }
195
     }
187
     seen_d5 = false;
196
     seen_d5 = false;
188
     return 1;
197
     return 1;
189
   }
198
   }
199
+
190
 #elif ENABLED(MAPPER_D0D1)
200
 #elif ENABLED(MAPPER_D0D1)
191
-  uint8_t utf_hi_char; // UTF-8 high part
192
-  bool seen_d5 = false;
201
+
193
   char charset_mapper(char c) {
202
   char charset_mapper(char c) {
203
+    static uint8_t utf_hi_char; // UTF-8 high part
204
+    static bool seen_d5 = false;
194
     uint8_t d = c;
205
     uint8_t d = c;
195
-    if ( d >= 0x80u ) { // UTF-8 handling
196
-      if ((d >= 0xd0u) && (!seen_d5)) {
206
+    if (d >= 0x80u) { // UTF-8 handling
207
+      if (d >= 0xd0u && !seen_d5) {
197
         utf_hi_char = d - 0xd0u;
208
         utf_hi_char = d - 0xd0u;
198
         seen_d5 = true;
209
         seen_d5 = true;
199
         return 0;
210
         return 0;
200
-      } else if (seen_d5) {
201
-          d &= 0x3fu;
211
+      }
212
+      else if (seen_d5) {
213
+        d &= 0x3fu;
202
         #ifndef MAPPER_ONE_TO_ONE
214
         #ifndef MAPPER_ONE_TO_ONE
203
-          HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
215
+          HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
204
         #else
216
         #else
205
-          HARDWARE_CHAR_OUT( (char) (0xa0u + ( utf_hi_char << 6 ) + d ) ) ;
217
+          HARDWARE_CHAR_OUT((char)(0xa0u + (utf_hi_char << 6) + d)) ;
206
         #endif
218
         #endif
207
-      } else {
219
+      }
220
+      else {
208
         HARDWARE_CHAR_OUT('?');
221
         HARDWARE_CHAR_OUT('?');
209
       }
222
       }
210
-    } else {
223
+    }
224
+    else {
211
       HARDWARE_CHAR_OUT((char) c );
225
       HARDWARE_CHAR_OUT((char) c );
212
     }
226
     }
213
     seen_d5 = false;
227
     seen_d5 = false;
214
     return 1;
228
     return 1;
215
   }
229
   }
230
+
216
 #elif ENABLED(MAPPER_E382E383)
231
 #elif ENABLED(MAPPER_E382E383)
217
-  uint8_t utf_hi_char; // UTF-8 high part
218
-  bool seen_e3 = false;
219
-  bool seen_82_83 = false;
220
-  char charset_mapper(char c){
232
+
233
+  char charset_mapper(char c) {
234
+    static uint8_t utf_hi_char; // UTF-8 high part
235
+    static bool seen_e3 = false;
236
+    static bool seen_82_83 = false;
221
     uint8_t d = c;
237
     uint8_t d = c;
222
-    if ( d >= 0x80 ) { // UTF-8 handling
223
-      if ( (d == 0xe3) && (seen_e3 == false)) {
238
+    if (d >= 0x80) { // UTF-8 handling
239
+      if (d == 0xe3 && !seen_e3) {
224
         seen_e3 = true;
240
         seen_e3 = true;
225
         return 0;      // eat 0xe3
241
         return 0;      // eat 0xe3
226
-      } else if ( (d >= 0x82) && (seen_e3 == true) && (seen_82_83 == false)) {
242
+      }
243
+      else if (d >= 0x82 && seen_e3 && !seen_82_83) {
227
         utf_hi_char = d - 0x82;
244
         utf_hi_char = d - 0x82;
228
         seen_82_83 = true;
245
         seen_82_83 = true;
229
         return 0;
246
         return 0;
230
-      } else if ((seen_e3 == true) && (seen_82_83 == true)){
247
+      }
248
+      else if (seen_e3 && seen_82_83) {
231
         d &= 0x3f;
249
         d &= 0x3f;
232
         #ifndef MAPPER_ONE_TO_ONE
250
         #ifndef MAPPER_ONE_TO_ONE
233
-          HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
251
+          HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
234
         #else
252
         #else
235
-          HARDWARE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d ) ) ;
253
+          HARDWARE_CHAR_OUT((char)(0x80 + (utf_hi_char << 6) + d)) ;
236
         #endif
254
         #endif
237
-      } else {
255
+      }
256
+      else {
238
         HARDWARE_CHAR_OUT((char) '?' );
257
         HARDWARE_CHAR_OUT((char) '?' );
239
       }
258
       }
240
-    } else {
259
+    }
260
+    else {
241
       HARDWARE_CHAR_OUT((char) c );
261
       HARDWARE_CHAR_OUT((char) c );
242
     }
262
     }
243
     seen_e3 = false;
263
     seen_e3 = false;
244
     seen_82_83 = false;
264
     seen_82_83 = false;
245
     return 1;
265
     return 1;
246
   }
266
   }
267
+
247
 #else
268
 #else
269
+
248
   #error "You have to define one of the DISPLAY_INPUT_CODE_MAPPERs in your language_xx.h file" // should not occur because (en) will set.
270
   #error "You have to define one of the DISPLAY_INPUT_CODE_MAPPERs in your language_xx.h file" // should not occur because (en) will set.
271
+
249
 #endif // code mappers
272
 #endif // code mappers
250
 
273
 
251
 #endif // UTF_MAPPER_H
274
 #endif // UTF_MAPPER_H

+ 13
- 29
Marlin/watchdog.cpp 查看文件

1
 #include "Marlin.h"
1
 #include "Marlin.h"
2
 
2
 
3
 #if ENABLED(USE_WATCHDOG)
3
 #if ENABLED(USE_WATCHDOG)
4
-#include <avr/wdt.h>
5
 
4
 
6
 #include "watchdog.h"
5
 #include "watchdog.h"
7
-#include "ultralcd.h"
8
 
6
 
9
-//===========================================================================
10
-//============================ private variables ============================
11
-//===========================================================================
12
-
13
-//===========================================================================
14
-//================================ functions ================================
15
-//===========================================================================
16
-
17
-
18
-/// intialise watch dog with a 4 sec interrupt time
7
+// Initialize watchdog with a 4 sec interrupt time
19
 void watchdog_init() {
8
 void watchdog_init() {
20
   #if ENABLED(WATCHDOG_RESET_MANUAL)
9
   #if ENABLED(WATCHDOG_RESET_MANUAL)
21
-    //We enable the watchdog timer, but only for the interrupt.
22
-    //Take care, as this requires the correct order of operation, with interrupts disabled. See the datasheet of any AVR chip for details.
10
+    // We enable the watchdog timer, but only for the interrupt.
11
+    // Take care, as this requires the correct order of operation, with interrupts disabled. See the datasheet of any AVR chip for details.
23
     wdt_reset();
12
     wdt_reset();
24
     _WD_CONTROL_REG = _BV(_WD_CHANGE_BIT) | _BV(WDE);
13
     _WD_CONTROL_REG = _BV(_WD_CHANGE_BIT) | _BV(WDE);
25
     _WD_CONTROL_REG = _BV(WDIE) | WDTO_4S;
14
     _WD_CONTROL_REG = _BV(WDIE) | WDTO_4S;
28
   #endif
17
   #endif
29
 }
18
 }
30
 
19
 
31
-/// reset watchdog. MUST be called every 1s after init or avr will reset.
32
-void watchdog_reset() {
33
-  wdt_reset();
34
-}
35
-
36
 //===========================================================================
20
 //===========================================================================
37
 //=================================== ISR ===================================
21
 //=================================== ISR ===================================
38
 //===========================================================================
22
 //===========================================================================
39
 
23
 
40
-//Watchdog timer interrupt, called if main program blocks >1sec and manual reset is enabled.
24
+// Watchdog timer interrupt, called if main program blocks >1sec and manual reset is enabled.
41
 #if ENABLED(WATCHDOG_RESET_MANUAL)
25
 #if ENABLED(WATCHDOG_RESET_MANUAL)
42
-ISR(WDT_vect) {
43
-  SERIAL_ERROR_START;
44
-  SERIAL_ERRORLNPGM("Something is wrong, please turn off the printer.");
45
-  kill(PSTR("ERR:Please Reset")); //kill blocks //16 characters so it fits on a 16x2 display
46
-  while (1); //wait for user or serial reset
47
-}
48
-#endif//RESET_MANUAL
49
-
50
-#endif//USE_WATCHDOG
26
+  ISR(WDT_vect) {
27
+    SERIAL_ERROR_START;
28
+    SERIAL_ERRORLNPGM("Something is wrong, please turn off the printer.");
29
+    kill(PSTR("ERR:Please Reset")); //kill blocks //16 characters so it fits on a 16x2 display
30
+    while (1); //wait for user or serial reset
31
+  }
32
+#endif //WATCHDOG_RESET_MANUAL
33
+
34
+#endif //USE_WATCHDOG

+ 7
- 10
Marlin/watchdog.h 查看文件

2
 #define WATCHDOG_H
2
 #define WATCHDOG_H
3
 
3
 
4
 #include "Marlin.h"
4
 #include "Marlin.h"
5
+#include <avr/wdt.h>
5
 
6
 
6
-#if ENABLED(USE_WATCHDOG)
7
-  // initialize watch dog with a 1 sec interrupt time
8
-  void watchdog_init();
9
-  // pad the dog/reset watchdog. MUST be called at least every second after the first watchdog_init or AVR will go into emergency procedures..
10
-  void watchdog_reset();
11
-#else
12
-  //If we do not have a watchdog, then we can have empty functions which are optimized away.
13
-  FORCE_INLINE void watchdog_init() {};
14
-  FORCE_INLINE void watchdog_reset() {};
15
-#endif
7
+// Initialize watchdog with a 4 second interrupt time
8
+void watchdog_init();
9
+
10
+// Reset watchdog. MUST be called at least every 4 seconds after the
11
+// first watchdog_init or AVR will go into emergency procedures.
12
+inline void watchdog_reset() { wdt_reset(); }
16
 
13
 
17
 #endif
14
 #endif

正在加载...
取消
保存