Quellcode durchsuchen

Merge pull request #6633 from thinkyhead/bf_temp_units

Minor patches and cleanup
Scott Lahteine vor 8 Jahren
Ursprung
Commit
232e8682d1
33 geänderte Dateien mit 123 neuen und 99 gelöschten Zeilen
  1. 3
    3
      Marlin/Configuration.h
  2. 15
    4
      Marlin/Marlin_main.cpp
  3. 2
    2
      Marlin/configuration_store.cpp
  4. 3
    3
      Marlin/example_configurations/Cartesio/Configuration.h
  5. 3
    3
      Marlin/example_configurations/Felix/Configuration.h
  6. 3
    3
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  7. 3
    3
      Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h
  8. 4
    4
      Marlin/example_configurations/Hephestos/Configuration.h
  9. 3
    3
      Marlin/example_configurations/Hephestos_2/Configuration.h
  10. 3
    3
      Marlin/example_configurations/K8200/Configuration.h
  11. 4
    4
      Marlin/example_configurations/K8400/Configuration.h
  12. 3
    3
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  13. 3
    3
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  14. 3
    3
      Marlin/example_configurations/RigidBot/Configuration.h
  15. 3
    3
      Marlin/example_configurations/SCARA/Configuration.h
  16. 3
    3
      Marlin/example_configurations/TAZ4/Configuration.h
  17. 3
    3
      Marlin/example_configurations/TinyBoy2/Configuration.h
  18. 3
    3
      Marlin/example_configurations/WITBOX/Configuration.h
  19. 3
    3
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  20. 3
    3
      Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
  21. 3
    3
      Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
  22. 3
    3
      Marlin/example_configurations/delta/generic/Configuration.h
  23. 3
    3
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  24. 3
    3
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  25. 3
    3
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  26. 3
    3
      Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h
  27. 3
    3
      Marlin/example_configurations/makibox/Configuration.h
  28. 3
    3
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  29. 3
    3
      Marlin/example_configurations/wt150/Configuration.h
  30. 5
    5
      Marlin/ubl.cpp
  31. 2
    2
      Marlin/ubl_G29.cpp
  32. 1
    1
      buildroot/share/git/mfdoc
  33. 15
    2
      buildroot/share/git/mfqp

+ 3
- 3
Marlin/Configuration.h Datei anzeigen

474
 /**
474
 /**
475
  * Default Axis Steps Per Unit (steps/mm)
475
  * Default Axis Steps Per Unit (steps/mm)
476
  * Override with M92
476
  * Override with M92
477
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
477
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
478
  */
478
  */
479
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 4000, 500 }
479
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 4000, 500 }
480
 
480
 
481
 /**
481
 /**
482
  * Default Max Feed Rate (mm/s)
482
  * Default Max Feed Rate (mm/s)
483
  * Override with M203
483
  * Override with M203
484
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
484
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
485
  */
485
  */
486
 #define DEFAULT_MAX_FEEDRATE          { 300, 300, 5, 25 }
486
 #define DEFAULT_MAX_FEEDRATE          { 300, 300, 5, 25 }
487
 
487
 
489
  * Default Max Acceleration (change/s) change = mm/s
489
  * Default Max Acceleration (change/s) change = mm/s
490
  * (Maximum start speed for accelerated moves)
490
  * (Maximum start speed for accelerated moves)
491
  * Override with M201
491
  * Override with M201
492
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
492
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
493
  */
493
  */
494
 #define DEFAULT_MAX_ACCELERATION      { 3000, 3000, 100, 10000 }
494
 #define DEFAULT_MAX_ACCELERATION      { 3000, 3000, 100, 10000 }
495
 
495
 

+ 15
- 4
Marlin/Marlin_main.cpp Datei anzeigen

1298
 #if ENABLED(TEMPERATURE_UNITS_SUPPORT)
1298
 #if ENABLED(TEMPERATURE_UNITS_SUPPORT)
1299
   inline void set_input_temp_units(TempUnit units) { input_temp_units = units; }
1299
   inline void set_input_temp_units(TempUnit units) { input_temp_units = units; }
1300
 
1300
 
1301
-  float temp_abs(const float &c) {
1301
+  float to_temp_units(const float &c) {
1302
     switch (input_temp_units) {
1302
     switch (input_temp_units) {
1303
       case TEMPUNIT_F:
1303
       case TEMPUNIT_F:
1304
-        return (c - 32.0) * 0.5555555556;
1304
+        return c * 0.5555555556 + 32.0;
1305
       case TEMPUNIT_K:
1305
       case TEMPUNIT_K:
1306
-        return c - 273.15;
1306
+        return c + 273.15;
1307
       case TEMPUNIT_C:
1307
       case TEMPUNIT_C:
1308
       default:
1308
       default:
1309
         return c;
1309
         return c;
1310
     }
1310
     }
1311
   }
1311
   }
1312
 
1312
 
1313
-  int16_t code_value_temp_abs() { return temp_abs(code_value_float()); }
1313
+  int16_t code_value_temp_abs() {
1314
+    const float c = code_value_float();
1315
+    switch (input_temp_units) {
1316
+      case TEMPUNIT_F:
1317
+        return (int16_t)((c - 32.0) * 0.5555555556);
1318
+      case TEMPUNIT_K:
1319
+        return (int16_t)(c - 273.15);
1320
+      case TEMPUNIT_C:
1321
+      default:
1322
+        return (int16_t)(c);
1323
+    }
1324
+  }
1314
 
1325
 
1315
   int16_t code_value_temp_diff() {
1326
   int16_t code_value_temp_diff() {
1316
     switch (input_temp_units) {
1327
     switch (input_temp_units) {

+ 2
- 2
Marlin/configuration_store.cpp Datei anzeigen

1257
       CONFIG_ECHO_START;
1257
       CONFIG_ECHO_START;
1258
       #if ENABLED(TEMPERATURE_UNITS_SUPPORT)
1258
       #if ENABLED(TEMPERATURE_UNITS_SUPPORT)
1259
         extern TempUnit input_temp_units;
1259
         extern TempUnit input_temp_units;
1260
-        extern float temp_abs(const float &f);
1261
-        #define TEMP_UNIT(N) temp_abs(N)
1260
+        extern float to_temp_units(const float &f);
1261
+        #define TEMP_UNIT(N) to_temp_units(N)
1262
         SERIAL_ECHOPGM("  M149 ");
1262
         SERIAL_ECHOPGM("  M149 ");
1263
         SERIAL_CHAR(input_temp_units == TEMPUNIT_K ? 'K' : input_temp_units == TEMPUNIT_F ? 'F' : 'C');
1263
         SERIAL_CHAR(input_temp_units == TEMPUNIT_K ? 'K' : input_temp_units == TEMPUNIT_F ? 'F' : 'C');
1264
         SERIAL_ECHOPGM(" ; Units in ");
1264
         SERIAL_ECHOPGM(" ; Units in ");

+ 3
- 3
Marlin/example_configurations/Cartesio/Configuration.h Datei anzeigen

473
 /**
473
 /**
474
  * Default Axis Steps Per Unit (steps/mm)
474
  * Default Axis Steps Per Unit (steps/mm)
475
  * Override with M92
475
  * Override with M92
476
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
476
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
477
  */
477
  */
478
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 71.128, 71.128, 640, 152 }
478
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 71.128, 71.128, 640, 152 }
479
 
479
 
480
 /**
480
 /**
481
  * Default Max Feed Rate (mm/s)
481
  * Default Max Feed Rate (mm/s)
482
  * Override with M203
482
  * Override with M203
483
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
483
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
484
  */
484
  */
485
 #define DEFAULT_MAX_FEEDRATE          { 200, 200, 20, 20 }
485
 #define DEFAULT_MAX_FEEDRATE          { 200, 200, 20, 20 }
486
 
486
 
488
  * Default Max Acceleration (change/s) change = mm/s
488
  * Default Max Acceleration (change/s) change = mm/s
489
  * (Maximum start speed for accelerated moves)
489
  * (Maximum start speed for accelerated moves)
490
  * Override with M201
490
  * Override with M201
491
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
491
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
492
  */
492
  */
493
 #define DEFAULT_MAX_ACCELERATION      { 1000, 1000, 100, 10000 }
493
 #define DEFAULT_MAX_ACCELERATION      { 1000, 1000, 100, 10000 }
494
 
494
 

+ 3
- 3
Marlin/example_configurations/Felix/Configuration.h Datei anzeigen

457
 /**
457
 /**
458
  * Default Axis Steps Per Unit (steps/mm)
458
  * Default Axis Steps Per Unit (steps/mm)
459
  * Override with M92
459
  * Override with M92
460
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
460
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
461
  */
461
  */
462
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 76.190476, 76.190476, 1600, 164 }
462
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 76.190476, 76.190476, 1600, 164 }
463
 
463
 
464
 /**
464
 /**
465
  * Default Max Feed Rate (mm/s)
465
  * Default Max Feed Rate (mm/s)
466
  * Override with M203
466
  * Override with M203
467
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
467
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
468
  */
468
  */
469
 #define DEFAULT_MAX_FEEDRATE          { 500, 500, 5, 25 }
469
 #define DEFAULT_MAX_FEEDRATE          { 500, 500, 5, 25 }
470
 
470
 
472
  * Default Max Acceleration (change/s) change = mm/s
472
  * Default Max Acceleration (change/s) change = mm/s
473
  * (Maximum start speed for accelerated moves)
473
  * (Maximum start speed for accelerated moves)
474
  * Override with M201
474
  * Override with M201
475
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
475
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
476
  */
476
  */
477
 #define DEFAULT_MAX_ACCELERATION      { 5000, 5000, 100, 80000 }
477
 #define DEFAULT_MAX_ACCELERATION      { 5000, 5000, 100, 80000 }
478
 
478
 

+ 3
- 3
Marlin/example_configurations/Felix/DUAL/Configuration.h Datei anzeigen

457
 /**
457
 /**
458
  * Default Axis Steps Per Unit (steps/mm)
458
  * Default Axis Steps Per Unit (steps/mm)
459
  * Override with M92
459
  * Override with M92
460
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
460
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
461
  */
461
  */
462
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 76.190476, 76.190476, 1600, 164 }
462
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 76.190476, 76.190476, 1600, 164 }
463
 
463
 
464
 /**
464
 /**
465
  * Default Max Feed Rate (mm/s)
465
  * Default Max Feed Rate (mm/s)
466
  * Override with M203
466
  * Override with M203
467
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
467
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
468
  */
468
  */
469
 #define DEFAULT_MAX_FEEDRATE          { 500, 500, 5, 25 }
469
 #define DEFAULT_MAX_FEEDRATE          { 500, 500, 5, 25 }
470
 
470
 
472
  * Default Max Acceleration (change/s) change = mm/s
472
  * Default Max Acceleration (change/s) change = mm/s
473
  * (Maximum start speed for accelerated moves)
473
  * (Maximum start speed for accelerated moves)
474
  * Override with M201
474
  * Override with M201
475
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
475
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
476
  */
476
  */
477
 #define DEFAULT_MAX_ACCELERATION      { 5000, 5000, 100, 80000 }
477
 #define DEFAULT_MAX_ACCELERATION      { 5000, 5000, 100, 80000 }
478
 
478
 

+ 3
- 3
Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h Datei anzeigen

480
 /**
480
 /**
481
  * Default Axis Steps Per Unit (steps/mm)
481
  * Default Axis Steps Per Unit (steps/mm)
482
  * Override with M92
482
  * Override with M92
483
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
483
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
484
  */
484
  */
485
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 4000, 52.2 }
485
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 4000, 52.2 }
486
 
486
 
487
 /**
487
 /**
488
  * Default Max Feed Rate (mm/s)
488
  * Default Max Feed Rate (mm/s)
489
  * Override with M203
489
  * Override with M203
490
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
490
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
491
  */
491
  */
492
 #define DEFAULT_MAX_FEEDRATE          { 250, 250, 2, 17 }
492
 #define DEFAULT_MAX_FEEDRATE          { 250, 250, 2, 17 }
493
 
493
 
495
  * Default Max Acceleration (change/s) change = mm/s
495
  * Default Max Acceleration (change/s) change = mm/s
496
  * (Maximum start speed for accelerated moves)
496
  * (Maximum start speed for accelerated moves)
497
  * Override with M201
497
  * Override with M201
498
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
498
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
499
  */
499
  */
500
 #define DEFAULT_MAX_ACCELERATION      { 1000, 1000, 4, 750 }
500
 #define DEFAULT_MAX_ACCELERATION      { 1000, 1000, 4, 750 }
501
 
501
 

+ 4
- 4
Marlin/example_configurations/Hephestos/Configuration.h Datei anzeigen

465
 /**
465
 /**
466
  * Default Axis Steps Per Unit (steps/mm)
466
  * Default Axis Steps Per Unit (steps/mm)
467
  * Override with M92
467
  * Override with M92
468
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
468
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
469
  */
469
  */
470
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 4000, 100.47095761381482 }
470
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 4000, 100.47095761381482 }
471
 
471
 
472
 /**
472
 /**
473
  * Default Max Feed Rate (mm/s)
473
  * Default Max Feed Rate (mm/s)
474
  * Override with M203
474
  * Override with M203
475
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
475
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
476
  */
476
  */
477
 #define DEFAULT_MAX_FEEDRATE          { 200, 200, 3.3, 25 }
477
 #define DEFAULT_MAX_FEEDRATE          { 200, 200, 3.3, 25 }
478
 
478
 
480
  * Default Max Acceleration (change/s) change = mm/s
480
  * Default Max Acceleration (change/s) change = mm/s
481
  * (Maximum start speed for accelerated moves)
481
  * (Maximum start speed for accelerated moves)
482
  * Override with M201
482
  * Override with M201
483
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
483
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
484
  */
484
  */
485
 #define DEFAULT_MAX_ACCELERATION      { 1100, 1100, 100, 10000 }
485
 #define DEFAULT_MAX_ACCELERATION      { 1100, 1100, 100, 10000 }
486
 
486
 
1149
  * IMPORTANT: The U8glib library is required for Full Graphic Display!
1149
  * IMPORTANT: The U8glib library is required for Full Graphic Display!
1150
  *            https://github.com/olikraus/U8glib_Arduino
1150
  *            https://github.com/olikraus/U8glib_Arduino
1151
  */
1151
  */
1152
-#define ULTRA_LCD   // Character based
1152
+//#define ULTRA_LCD   // Character based
1153
 //#define DOGLCD      // Full graphics display
1153
 //#define DOGLCD      // Full graphics display
1154
 
1154
 
1155
 /**
1155
 /**

+ 3
- 3
Marlin/example_configurations/Hephestos_2/Configuration.h Datei anzeigen

468
 /**
468
 /**
469
  * Default Axis Steps Per Unit (steps/mm)
469
  * Default Axis Steps Per Unit (steps/mm)
470
  * Override with M92
470
  * Override with M92
471
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
471
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
472
  */
472
  */
473
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 160, 160, 8000, 204 }
473
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 160, 160, 8000, 204 }
474
 
474
 
475
 /**
475
 /**
476
  * Default Max Feed Rate (mm/s)
476
  * Default Max Feed Rate (mm/s)
477
  * Override with M203
477
  * Override with M203
478
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
478
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
479
  */
479
  */
480
 #define DEFAULT_MAX_FEEDRATE          { 250, 250, 2, 200 }
480
 #define DEFAULT_MAX_FEEDRATE          { 250, 250, 2, 200 }
481
 
481
 
483
  * Default Max Acceleration (change/s) change = mm/s
483
  * Default Max Acceleration (change/s) change = mm/s
484
  * (Maximum start speed for accelerated moves)
484
  * (Maximum start speed for accelerated moves)
485
  * Override with M201
485
  * Override with M201
486
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
486
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
487
  */
487
  */
488
 #define DEFAULT_MAX_ACCELERATION      { 800, 800, 20, 1000 }
488
 #define DEFAULT_MAX_ACCELERATION      { 800, 800, 20, 1000 }
489
 
489
 

+ 3
- 3
Marlin/example_configurations/K8200/Configuration.h Datei anzeigen

504
 /**
504
 /**
505
  * Default Axis Steps Per Unit (steps/mm)
505
  * Default Axis Steps Per Unit (steps/mm)
506
  * Override with M92
506
  * Override with M92
507
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
507
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
508
  */
508
  */
509
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 64.25, 64.25, 2560, 600 }
509
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 64.25, 64.25, 2560, 600 }
510
 /**
510
 /**
511
  * Default Max Feed Rate (mm/s)
511
  * Default Max Feed Rate (mm/s)
512
  * Override with M203
512
  * Override with M203
513
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
513
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
514
  */
514
  */
515
 #define DEFAULT_MAX_FEEDRATE          { 500, 500, 5, 25 }
515
 #define DEFAULT_MAX_FEEDRATE          { 500, 500, 5, 25 }
516
 
516
 
518
  * Default Max Acceleration (change/s) change = mm/s
518
  * Default Max Acceleration (change/s) change = mm/s
519
  * (Maximum start speed for accelerated moves)
519
  * (Maximum start speed for accelerated moves)
520
  * Override with M201
520
  * Override with M201
521
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
521
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
522
  */
522
  */
523
 #define DEFAULT_MAX_ACCELERATION      { 9000, 9000, 100, 10000 }
523
 #define DEFAULT_MAX_ACCELERATION      { 9000, 9000, 100, 10000 }
524
 
524
 

+ 4
- 4
Marlin/example_configurations/K8400/Configuration.h Datei anzeigen

474
 /**
474
 /**
475
  * Default Axis Steps Per Unit (steps/mm)
475
  * Default Axis Steps Per Unit (steps/mm)
476
  * Override with M92
476
  * Override with M92
477
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
477
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
478
  */
478
  */
479
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 134.74, 134.74, 4266.66, 148.7 }
479
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 134.74, 134.74, 4266.66, 148.7 }
480
 
480
 
481
 /**
481
 /**
482
  * Default Max Feed Rate (mm/s)
482
  * Default Max Feed Rate (mm/s)
483
  * Override with M203
483
  * Override with M203
484
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
484
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
485
  */
485
  */
486
 #define DEFAULT_MAX_FEEDRATE          { 160, 160, 10, 10000 }
486
 #define DEFAULT_MAX_FEEDRATE          { 160, 160, 10, 10000 }
487
 
487
 
489
  * Default Max Acceleration (change/s) change = mm/s
489
  * Default Max Acceleration (change/s) change = mm/s
490
  * (Maximum start speed for accelerated moves)
490
  * (Maximum start speed for accelerated moves)
491
  * Override with M201
491
  * Override with M201
492
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
492
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
493
  */
493
  */
494
 #define DEFAULT_MAX_ACCELERATION      { 9000, 9000, 100, 10000 }
494
 #define DEFAULT_MAX_ACCELERATION      { 9000, 9000, 100, 10000 }
495
 
495
 
1158
  * IMPORTANT: The U8glib library is required for Full Graphic Display!
1158
  * IMPORTANT: The U8glib library is required for Full Graphic Display!
1159
  *            https://github.com/olikraus/U8glib_Arduino
1159
  *            https://github.com/olikraus/U8glib_Arduino
1160
  */
1160
  */
1161
-#define ULTRA_LCD   // Character based
1161
+//#define ULTRA_LCD   // Character based
1162
 //#define DOGLCD      // Full graphics display
1162
 //#define DOGLCD      // Full graphics display
1163
 
1163
 
1164
 /**
1164
 /**

+ 3
- 3
Marlin/example_configurations/K8400/Dual-head/Configuration.h Datei anzeigen

474
 /**
474
 /**
475
  * Default Axis Steps Per Unit (steps/mm)
475
  * Default Axis Steps Per Unit (steps/mm)
476
  * Override with M92
476
  * Override with M92
477
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
477
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
478
  */
478
  */
479
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 134.74, 134.74, 4266.66, 148.7 }
479
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 134.74, 134.74, 4266.66, 148.7 }
480
 
480
 
481
 /**
481
 /**
482
  * Default Max Feed Rate (mm/s)
482
  * Default Max Feed Rate (mm/s)
483
  * Override with M203
483
  * Override with M203
484
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
484
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
485
  */
485
  */
486
 #define DEFAULT_MAX_FEEDRATE          { 160, 160, 10, 10000 }
486
 #define DEFAULT_MAX_FEEDRATE          { 160, 160, 10, 10000 }
487
 
487
 
489
  * Default Max Acceleration (change/s) change = mm/s
489
  * Default Max Acceleration (change/s) change = mm/s
490
  * (Maximum start speed for accelerated moves)
490
  * (Maximum start speed for accelerated moves)
491
  * Override with M201
491
  * Override with M201
492
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
492
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
493
  */
493
  */
494
 #define DEFAULT_MAX_ACCELERATION      { 9000, 9000, 100, 10000 }
494
 #define DEFAULT_MAX_ACCELERATION      { 9000, 9000, 100, 10000 }
495
 
495
 

+ 3
- 3
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h Datei anzeigen

474
 /**
474
 /**
475
  * Default Axis Steps Per Unit (steps/mm)
475
  * Default Axis Steps Per Unit (steps/mm)
476
  * Override with M92
476
  * Override with M92
477
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
477
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
478
  */
478
  */
479
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 78.7402*2, 78.7402*2, 5120.00, 760*1*1.5 }
479
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 78.7402*2, 78.7402*2, 5120.00, 760*1*1.5 }
480
 
480
 
481
 /**
481
 /**
482
  * Default Max Feed Rate (mm/s)
482
  * Default Max Feed Rate (mm/s)
483
  * Override with M203
483
  * Override with M203
484
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
484
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
485
  */
485
  */
486
 #define DEFAULT_MAX_FEEDRATE          { 300, 300, 5, 25 }
486
 #define DEFAULT_MAX_FEEDRATE          { 300, 300, 5, 25 }
487
 
487
 
489
  * Default Max Acceleration (change/s) change = mm/s
489
  * Default Max Acceleration (change/s) change = mm/s
490
  * (Maximum start speed for accelerated moves)
490
  * (Maximum start speed for accelerated moves)
491
  * Override with M201
491
  * Override with M201
492
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
492
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
493
  */
493
  */
494
 #define DEFAULT_MAX_ACCELERATION      { 3000, 3000, 100, 10000 }
494
 #define DEFAULT_MAX_ACCELERATION      { 3000, 3000, 100, 10000 }
495
 
495
 

+ 3
- 3
Marlin/example_configurations/RigidBot/Configuration.h Datei anzeigen

471
 /**
471
 /**
472
  * Default Axis Steps Per Unit (steps/mm)
472
  * Default Axis Steps Per Unit (steps/mm)
473
  * Override with M92
473
  * Override with M92
474
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
474
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
475
  */
475
  */
476
  // default steps per unit for RigidBot with standard hardware
476
  // default steps per unit for RigidBot with standard hardware
477
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 44.3090, 22.1545, 1600, 53.5 }
477
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 44.3090, 22.1545, 1600, 53.5 }
480
 /**
480
 /**
481
  * Default Max Feed Rate (mm/s)
481
  * Default Max Feed Rate (mm/s)
482
  * Override with M203
482
  * Override with M203
483
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
483
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
484
  */
484
  */
485
 #define DEFAULT_MAX_FEEDRATE          { 500, 500, 5, 25 }
485
 #define DEFAULT_MAX_FEEDRATE          { 500, 500, 5, 25 }
486
 
486
 
488
  * Default Max Acceleration (change/s) change = mm/s
488
  * Default Max Acceleration (change/s) change = mm/s
489
  * (Maximum start speed for accelerated moves)
489
  * (Maximum start speed for accelerated moves)
490
  * Override with M201
490
  * Override with M201
491
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
491
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
492
  */
492
  */
493
 #define DEFAULT_MAX_ACCELERATION      { 800, 800, 100, 10000 }
493
 #define DEFAULT_MAX_ACCELERATION      { 800, 800, 100, 10000 }
494
 
494
 

+ 3
- 3
Marlin/example_configurations/SCARA/Configuration.h Datei anzeigen

489
 /**
489
 /**
490
  * Default Axis Steps Per Unit (steps/mm)
490
  * Default Axis Steps Per Unit (steps/mm)
491
  * Override with M92
491
  * Override with M92
492
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
492
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
493
  */
493
  */
494
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 103.69, 106.65, 200/1.25, 1000 }  // default steps per unit for SCARA
494
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 103.69, 106.65, 200/1.25, 1000 }  // default steps per unit for SCARA
495
 
495
 
496
 /**
496
 /**
497
  * Default Max Feed Rate (mm/s)
497
  * Default Max Feed Rate (mm/s)
498
  * Override with M203
498
  * Override with M203
499
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
499
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
500
  */
500
  */
501
 #define DEFAULT_MAX_FEEDRATE          { 300, 300, 30, 25 }
501
 #define DEFAULT_MAX_FEEDRATE          { 300, 300, 30, 25 }
502
 
502
 
504
  * Default Max Acceleration (change/s) change = mm/s
504
  * Default Max Acceleration (change/s) change = mm/s
505
  * (Maximum start speed for accelerated moves)
505
  * (Maximum start speed for accelerated moves)
506
  * Override with M201
506
  * Override with M201
507
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
507
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
508
  */
508
  */
509
 #define DEFAULT_MAX_ACCELERATION      { 300, 300, 20, 1000 }
509
 #define DEFAULT_MAX_ACCELERATION      { 300, 300, 20, 1000 }
510
 
510
 

+ 3
- 3
Marlin/example_configurations/TAZ4/Configuration.h Datei anzeigen

494
 /**
494
 /**
495
  * Default Axis Steps Per Unit (steps/mm)
495
  * Default Axis Steps Per Unit (steps/mm)
496
  * Override with M92
496
  * Override with M92
497
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
497
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
498
  */
498
  */
499
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 100.5, 100.5, 400, 850 }
499
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 100.5, 100.5, 400, 850 }
500
 
500
 
501
 /**
501
 /**
502
  * Default Max Feed Rate (mm/s)
502
  * Default Max Feed Rate (mm/s)
503
  * Override with M203
503
  * Override with M203
504
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
504
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
505
  */
505
  */
506
 #define DEFAULT_MAX_FEEDRATE          { 800, 800, 8, 50 }
506
 #define DEFAULT_MAX_FEEDRATE          { 800, 800, 8, 50 }
507
 
507
 
509
  * Default Max Acceleration (change/s) change = mm/s
509
  * Default Max Acceleration (change/s) change = mm/s
510
  * (Maximum start speed for accelerated moves)
510
  * (Maximum start speed for accelerated moves)
511
  * Override with M201
511
  * Override with M201
512
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
512
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
513
  */
513
  */
514
 #define DEFAULT_MAX_ACCELERATION      { 9000, 9000, 100, 10000 }
514
 #define DEFAULT_MAX_ACCELERATION      { 9000, 9000, 100, 10000 }
515
 
515
 

+ 3
- 3
Marlin/example_configurations/TinyBoy2/Configuration.h Datei anzeigen

525
 /**
525
 /**
526
  * Default Axis Steps Per Unit (steps/mm)
526
  * Default Axis Steps Per Unit (steps/mm)
527
  * Override with M92
527
  * Override with M92
528
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
528
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
529
  */
529
  */
530
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 100, 100, 6400, 88.16 }
530
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 100, 100, 6400, 88.16 }
531
 
531
 
532
 /**
532
 /**
533
  * Default Max Feed Rate (mm/s)
533
  * Default Max Feed Rate (mm/s)
534
  * Override with M203
534
  * Override with M203
535
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
535
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
536
  */
536
  */
537
 #define DEFAULT_MAX_FEEDRATE          { 300, 300, 7, 35 }
537
 #define DEFAULT_MAX_FEEDRATE          { 300, 300, 7, 35 }
538
 
538
 
540
  * Default Max Acceleration (change/s) change = mm/s
540
  * Default Max Acceleration (change/s) change = mm/s
541
  * (Maximum start speed for accelerated moves)
541
  * (Maximum start speed for accelerated moves)
542
  * Override with M201
542
  * Override with M201
543
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
543
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
544
  */
544
  */
545
 #define DEFAULT_MAX_ACCELERATION      { 3000, 3000, 100, 10000 }
545
 #define DEFAULT_MAX_ACCELERATION      { 3000, 3000, 100, 10000 }
546
 
546
 

+ 3
- 3
Marlin/example_configurations/WITBOX/Configuration.h Datei anzeigen

465
 /**
465
 /**
466
  * Default Axis Steps Per Unit (steps/mm)
466
  * Default Axis Steps Per Unit (steps/mm)
467
  * Override with M92
467
  * Override with M92
468
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
468
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
469
  */
469
  */
470
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 600.0*8/3, 102.073 }
470
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 600.0*8/3, 102.073 }
471
 
471
 
472
 /**
472
 /**
473
  * Default Max Feed Rate (mm/s)
473
  * Default Max Feed Rate (mm/s)
474
  * Override with M203
474
  * Override with M203
475
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
475
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
476
  */
476
  */
477
 #define DEFAULT_MAX_FEEDRATE          { 350, 350, 7.2, 80 }
477
 #define DEFAULT_MAX_FEEDRATE          { 350, 350, 7.2, 80 }
478
 
478
 
480
  * Default Max Acceleration (change/s) change = mm/s
480
  * Default Max Acceleration (change/s) change = mm/s
481
  * (Maximum start speed for accelerated moves)
481
  * (Maximum start speed for accelerated moves)
482
  * Override with M201
482
  * Override with M201
483
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
483
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
484
  */
484
  */
485
 #define DEFAULT_MAX_ACCELERATION      { 1000, 1000, 10, 1000 }
485
 #define DEFAULT_MAX_ACCELERATION      { 1000, 1000, 10, 1000 }
486
 
486
 

+ 3
- 3
Marlin/example_configurations/adafruit/ST7565/Configuration.h Datei anzeigen

474
 /**
474
 /**
475
  * Default Axis Steps Per Unit (steps/mm)
475
  * Default Axis Steps Per Unit (steps/mm)
476
  * Override with M92
476
  * Override with M92
477
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
477
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
478
  */
478
  */
479
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 4000, 500 }
479
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 4000, 500 }
480
 
480
 
481
 /**
481
 /**
482
  * Default Max Feed Rate (mm/s)
482
  * Default Max Feed Rate (mm/s)
483
  * Override with M203
483
  * Override with M203
484
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
484
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
485
  */
485
  */
486
 #define DEFAULT_MAX_FEEDRATE          { 300, 300, 5, 25 }
486
 #define DEFAULT_MAX_FEEDRATE          { 300, 300, 5, 25 }
487
 
487
 
489
  * Default Max Acceleration (change/s) change = mm/s
489
  * Default Max Acceleration (change/s) change = mm/s
490
  * (Maximum start speed for accelerated moves)
490
  * (Maximum start speed for accelerated moves)
491
  * Override with M201
491
  * Override with M201
492
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
492
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
493
  */
493
  */
494
 #define DEFAULT_MAX_ACCELERATION      { 3000, 3000, 100, 10000 }
494
 #define DEFAULT_MAX_ACCELERATION      { 3000, 3000, 100, 10000 }
495
 
495
 

+ 3
- 3
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h Datei anzeigen

542
 /**
542
 /**
543
  * Default Axis Steps Per Unit (steps/mm)
543
  * Default Axis Steps Per Unit (steps/mm)
544
  * Override with M92
544
  * Override with M92
545
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
545
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
546
  */
546
  */
547
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 100, 100, 100, 100 }  // default steps per unit for Kossel (GT2, 20 tooth)
547
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 100, 100, 100, 100 }  // default steps per unit for Kossel (GT2, 20 tooth)
548
 
548
 
549
 /**
549
 /**
550
  * Default Max Feed Rate (mm/s)
550
  * Default Max Feed Rate (mm/s)
551
  * Override with M203
551
  * Override with M203
552
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
552
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
553
  */
553
  */
554
 #define DEFAULT_MAX_FEEDRATE          { 200, 200, 200, 25 }
554
 #define DEFAULT_MAX_FEEDRATE          { 200, 200, 200, 25 }
555
 
555
 
557
  * Default Max Acceleration (change/s) change = mm/s
557
  * Default Max Acceleration (change/s) change = mm/s
558
  * (Maximum start speed for accelerated moves)
558
  * (Maximum start speed for accelerated moves)
559
  * Override with M201
559
  * Override with M201
560
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
560
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
561
  */
561
  */
562
 #define DEFAULT_MAX_ACCELERATION      { 4000, 4000, 4000, 4000 }
562
 #define DEFAULT_MAX_ACCELERATION      { 4000, 4000, 4000, 4000 }
563
 
563
 

+ 3
- 3
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h Datei anzeigen

549
 /**
549
 /**
550
  * Default Axis Steps Per Unit (steps/mm)
550
  * Default Axis Steps Per Unit (steps/mm)
551
  * Override with M92
551
  * Override with M92
552
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
552
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
553
  */
553
  */
554
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 100, 100, 100, 90 }  // default steps per unit for Kossel (GT2, 20 tooth)
554
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 100, 100, 100, 90 }  // default steps per unit for Kossel (GT2, 20 tooth)
555
 
555
 
556
 /**
556
 /**
557
  * Default Max Feed Rate (mm/s)
557
  * Default Max Feed Rate (mm/s)
558
  * Override with M203
558
  * Override with M203
559
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
559
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
560
  */
560
  */
561
 #define DEFAULT_MAX_FEEDRATE          { 200, 200, 200, 200 }
561
 #define DEFAULT_MAX_FEEDRATE          { 200, 200, 200, 200 }
562
 
562
 
564
  * Default Max Acceleration (change/s) change = mm/s
564
  * Default Max Acceleration (change/s) change = mm/s
565
  * (Maximum start speed for accelerated moves)
565
  * (Maximum start speed for accelerated moves)
566
  * Override with M201
566
  * Override with M201
567
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
567
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
568
  */
568
  */
569
 #define DEFAULT_MAX_ACCELERATION      { 4000, 4000, 4000, 4000 }
569
 #define DEFAULT_MAX_ACCELERATION      { 4000, 4000, 4000, 4000 }
570
 
570
 

+ 3
- 3
Marlin/example_configurations/delta/generic/Configuration.h Datei anzeigen

538
 /**
538
 /**
539
  * Default Axis Steps Per Unit (steps/mm)
539
  * Default Axis Steps Per Unit (steps/mm)
540
  * Override with M92
540
  * Override with M92
541
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
541
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
542
  */
542
  */
543
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 80, 760*1.1 }  // default steps per unit for Kossel (GT2, 20 tooth)
543
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 80, 760*1.1 }  // default steps per unit for Kossel (GT2, 20 tooth)
544
 
544
 
545
 /**
545
 /**
546
  * Default Max Feed Rate (mm/s)
546
  * Default Max Feed Rate (mm/s)
547
  * Override with M203
547
  * Override with M203
548
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
548
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
549
  */
549
  */
550
 #define DEFAULT_MAX_FEEDRATE          { 500, 500, 500, 25 }
550
 #define DEFAULT_MAX_FEEDRATE          { 500, 500, 500, 25 }
551
 
551
 
553
  * Default Max Acceleration (change/s) change = mm/s
553
  * Default Max Acceleration (change/s) change = mm/s
554
  * (Maximum start speed for accelerated moves)
554
  * (Maximum start speed for accelerated moves)
555
  * Override with M201
555
  * Override with M201
556
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
556
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
557
  */
557
  */
558
 #define DEFAULT_MAX_ACCELERATION      { 9000, 9000, 9000, 10000 }
558
 #define DEFAULT_MAX_ACCELERATION      { 9000, 9000, 9000, 10000 }
559
 
559
 

+ 3
- 3
Marlin/example_configurations/delta/kossel_mini/Configuration.h Datei anzeigen

538
 /**
538
 /**
539
  * Default Axis Steps Per Unit (steps/mm)
539
  * Default Axis Steps Per Unit (steps/mm)
540
  * Override with M92
540
  * Override with M92
541
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
541
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
542
  */
542
  */
543
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 80, 760*1.1 }  // default steps per unit for Kossel (GT2, 20 tooth)
543
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 80, 760*1.1 }  // default steps per unit for Kossel (GT2, 20 tooth)
544
 
544
 
545
 /**
545
 /**
546
  * Default Max Feed Rate (mm/s)
546
  * Default Max Feed Rate (mm/s)
547
  * Override with M203
547
  * Override with M203
548
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
548
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
549
  */
549
  */
550
 #define DEFAULT_MAX_FEEDRATE          { 500, 500, 500, 25 }
550
 #define DEFAULT_MAX_FEEDRATE          { 500, 500, 500, 25 }
551
 
551
 
553
  * Default Max Acceleration (change/s) change = mm/s
553
  * Default Max Acceleration (change/s) change = mm/s
554
  * (Maximum start speed for accelerated moves)
554
  * (Maximum start speed for accelerated moves)
555
  * Override with M201
555
  * Override with M201
556
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
556
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
557
  */
557
  */
558
 #define DEFAULT_MAX_ACCELERATION      { 9000, 9000, 9000, 10000 }
558
 #define DEFAULT_MAX_ACCELERATION      { 9000, 9000, 9000, 10000 }
559
 
559
 

+ 3
- 3
Marlin/example_configurations/delta/kossel_pro/Configuration.h Datei anzeigen

532
 /**
532
 /**
533
  * Default Axis Steps Per Unit (steps/mm)
533
  * Default Axis Steps Per Unit (steps/mm)
534
  * Override with M92
534
  * Override with M92
535
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
535
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
536
  */
536
  */
537
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { XYZ_STEPS, XYZ_STEPS, XYZ_STEPS, 184.8 }
537
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { XYZ_STEPS, XYZ_STEPS, XYZ_STEPS, 184.8 }
538
 
538
 
539
 /**
539
 /**
540
  * Default Max Feed Rate (mm/s)
540
  * Default Max Feed Rate (mm/s)
541
  * Override with M203
541
  * Override with M203
542
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
542
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
543
  */
543
  */
544
 #define DEFAULT_MAX_FEEDRATE          { 200, 200, 200, 200 }
544
 #define DEFAULT_MAX_FEEDRATE          { 200, 200, 200, 200 }
545
 
545
 
547
  * Default Max Acceleration (change/s) change = mm/s
547
  * Default Max Acceleration (change/s) change = mm/s
548
  * (Maximum start speed for accelerated moves)
548
  * (Maximum start speed for accelerated moves)
549
  * Override with M201
549
  * Override with M201
550
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
550
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
551
  */
551
  */
552
 #define DEFAULT_MAX_ACCELERATION      { 9000, 9000, 9000, 9000 }
552
 #define DEFAULT_MAX_ACCELERATION      { 9000, 9000, 9000, 9000 }
553
 
553
 

+ 3
- 3
Marlin/example_configurations/delta/kossel_xl/Configuration.h Datei anzeigen

551
 /**
551
 /**
552
  * Default Axis Steps Per Unit (steps/mm)
552
  * Default Axis Steps Per Unit (steps/mm)
553
  * Override with M92
553
  * Override with M92
554
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
554
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
555
  */
555
  */
556
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { XYZ_STEPS, XYZ_STEPS, XYZ_STEPS, 158 }   // default steps per unit for PowerWasp
556
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { XYZ_STEPS, XYZ_STEPS, XYZ_STEPS, 158 }   // default steps per unit for PowerWasp
557
 
557
 
558
 /**
558
 /**
559
  * Default Max Feed Rate (mm/s)
559
  * Default Max Feed Rate (mm/s)
560
  * Override with M203
560
  * Override with M203
561
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
561
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
562
  */
562
  */
563
 #define DEFAULT_MAX_FEEDRATE          { 200, 200, 200, 25 }
563
 #define DEFAULT_MAX_FEEDRATE          { 200, 200, 200, 25 }
564
 
564
 
566
  * Default Max Acceleration (change/s) change = mm/s
566
  * Default Max Acceleration (change/s) change = mm/s
567
  * (Maximum start speed for accelerated moves)
567
  * (Maximum start speed for accelerated moves)
568
  * Override with M201
568
  * Override with M201
569
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
569
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
570
  */
570
  */
571
 #define DEFAULT_MAX_ACCELERATION      { 9000, 9000, 9000, 10000 }
571
 #define DEFAULT_MAX_ACCELERATION      { 9000, 9000, 9000, 10000 }
572
 
572
 

+ 3
- 3
Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h Datei anzeigen

488
 /**
488
 /**
489
  * Default Axis Steps Per Unit (steps/mm)
489
  * Default Axis Steps Per Unit (steps/mm)
490
  * Override with M92
490
  * Override with M92
491
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
491
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
492
  */
492
  */
493
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 400, 96 }
493
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 400, 96 }
494
 
494
 
495
 /**
495
 /**
496
  * Default Max Feed Rate (mm/s)
496
  * Default Max Feed Rate (mm/s)
497
  * Override with M203
497
  * Override with M203
498
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
498
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
499
  */
499
  */
500
 #define DEFAULT_MAX_FEEDRATE          { 500, 500, 25, 25 }
500
 #define DEFAULT_MAX_FEEDRATE          { 500, 500, 25, 25 }
501
 
501
 
503
  * Default Max Acceleration (change/s) change = mm/s
503
  * Default Max Acceleration (change/s) change = mm/s
504
  * (Maximum start speed for accelerated moves)
504
  * (Maximum start speed for accelerated moves)
505
  * Override with M201
505
  * Override with M201
506
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
506
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
507
  */
507
  */
508
 #define DEFAULT_MAX_ACCELERATION      { 800, 800, 700, 10000 }
508
 #define DEFAULT_MAX_ACCELERATION      { 800, 800, 700, 10000 }
509
 
509
 

+ 3
- 3
Marlin/example_configurations/makibox/Configuration.h Datei anzeigen

477
 /**
477
 /**
478
  * Default Axis Steps Per Unit (steps/mm)
478
  * Default Axis Steps Per Unit (steps/mm)
479
  * Override with M92
479
  * Override with M92
480
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
480
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
481
  */
481
  */
482
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 400, 400, 400, 163 }     // default steps per unit for ***** MakiBox A6 *****
482
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 400, 400, 400, 163 }     // default steps per unit for ***** MakiBox A6 *****
483
 
483
 
484
 /**
484
 /**
485
  * Default Max Feed Rate (mm/s)
485
  * Default Max Feed Rate (mm/s)
486
  * Override with M203
486
  * Override with M203
487
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
487
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
488
  */
488
  */
489
 #define DEFAULT_MAX_FEEDRATE          { 60, 60, 20, 45 }
489
 #define DEFAULT_MAX_FEEDRATE          { 60, 60, 20, 45 }
490
 
490
 
492
  * Default Max Acceleration (change/s) change = mm/s
492
  * Default Max Acceleration (change/s) change = mm/s
493
  * (Maximum start speed for accelerated moves)
493
  * (Maximum start speed for accelerated moves)
494
  * Override with M201
494
  * Override with M201
495
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
495
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
496
  */
496
  */
497
 #define DEFAULT_MAX_ACCELERATION      { 2000, 2000, 30, 10000 }
497
 #define DEFAULT_MAX_ACCELERATION      { 2000, 2000, 30, 10000 }
498
 
498
 

+ 3
- 3
Marlin/example_configurations/tvrrug/Round2/Configuration.h Datei anzeigen

464
 /**
464
 /**
465
  * Default Axis Steps Per Unit (steps/mm)
465
  * Default Axis Steps Per Unit (steps/mm)
466
  * Override with M92
466
  * Override with M92
467
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
467
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
468
  */
468
  */
469
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 71.1, 71.1, 2560, 600 } // David TVRR
469
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 71.1, 71.1, 2560, 600 } // David TVRR
470
 
470
 
475
 /**
475
 /**
476
  * Default Max Feed Rate (mm/s)
476
  * Default Max Feed Rate (mm/s)
477
  * Override with M203
477
  * Override with M203
478
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
478
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
479
  */
479
  */
480
 #define DEFAULT_MAX_FEEDRATE          { 500, 500, 5, 45 } // David TVRR
480
 #define DEFAULT_MAX_FEEDRATE          { 500, 500, 5, 45 } // David TVRR
481
 
481
 
483
  * Default Max Acceleration (change/s) change = mm/s
483
  * Default Max Acceleration (change/s) change = mm/s
484
  * (Maximum start speed for accelerated moves)
484
  * (Maximum start speed for accelerated moves)
485
  * Override with M201
485
  * Override with M201
486
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
486
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
487
  */
487
  */
488
 #define DEFAULT_MAX_ACCELERATION      { 9000, 9000, 100, 10000 }
488
 #define DEFAULT_MAX_ACCELERATION      { 9000, 9000, 100, 10000 }
489
 
489
 

+ 3
- 3
Marlin/example_configurations/wt150/Configuration.h Datei anzeigen

479
 /**
479
 /**
480
  * Default Axis Steps Per Unit (steps/mm)
480
  * Default Axis Steps Per Unit (steps/mm)
481
  * Override with M92
481
  * Override with M92
482
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
482
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
483
  */
483
  */
484
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 71.699959, 71.699959, 71.699959, 100.470955 }
484
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 71.699959, 71.699959, 71.699959, 100.470955 }
485
 
485
 
486
 /**
486
 /**
487
  * Default Max Feed Rate (mm/s)
487
  * Default Max Feed Rate (mm/s)
488
  * Override with M203
488
  * Override with M203
489
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
489
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
490
  */
490
  */
491
 #define DEFAULT_MAX_FEEDRATE          { 83.333333, 83.333333, 19.5, 26.666666 }
491
 #define DEFAULT_MAX_FEEDRATE          { 83.333333, 83.333333, 19.5, 26.666666 }
492
 
492
 
494
  * Default Max Acceleration (change/s) change = mm/s
494
  * Default Max Acceleration (change/s) change = mm/s
495
  * (Maximum start speed for accelerated moves)
495
  * (Maximum start speed for accelerated moves)
496
  * Override with M201
496
  * Override with M201
497
- *                                      X, Y, Z, E0 [, E1[, E2[, E3]]]
497
+ *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
498
  */
498
  */
499
 #define DEFAULT_MAX_ACCELERATION      { 1200, 1200, 100, 10000 }
499
 #define DEFAULT_MAX_ACCELERATION      { 1200, 1200, 100, 10000 }
500
 
500
 

+ 5
- 5
Marlin/ubl.cpp Datei anzeigen

136
 
136
 
137
   void unified_bed_leveling::display_map(const int map_type) {
137
   void unified_bed_leveling::display_map(const int map_type) {
138
     const bool map0 = map_type == 0;
138
     const bool map0 = map_type == 0;
139
-    const uint8_t spaces = 11;
139
+    constexpr uint8_t spaces = 11 * (GRID_MAX_POINTS_X - 2);
140
 
140
 
141
     if (map0) {
141
     if (map0) {
142
       SERIAL_PROTOCOLLNPGM("\nBed Topography Report:\n");
142
       SERIAL_PROTOCOLLNPGM("\nBed Topography Report:\n");
143
       serial_echo_xy(0, GRID_MAX_POINTS_Y - 1);
143
       serial_echo_xy(0, GRID_MAX_POINTS_Y - 1);
144
-      SERIAL_ECHO_SP(spaces * (GRID_MAX_POINTS_X - 2) + 3);
144
+      SERIAL_ECHO_SP(spaces + 3);
145
       serial_echo_xy(GRID_MAX_POINTS_X - 1, GRID_MAX_POINTS_Y - 1);
145
       serial_echo_xy(GRID_MAX_POINTS_X - 1, GRID_MAX_POINTS_Y - 1);
146
       SERIAL_EOL;
146
       SERIAL_EOL;
147
       serial_echo_xy(UBL_MESH_MIN_X, UBL_MESH_MAX_Y);
147
       serial_echo_xy(UBL_MESH_MIN_X, UBL_MESH_MAX_Y);
148
-      SERIAL_ECHO_SP(spaces * (GRID_MAX_POINTS_X - 2)-3);
148
+      SERIAL_ECHO_SP(spaces - 3);
149
       serial_echo_xy(UBL_MESH_MAX_X, UBL_MESH_MAX_Y);
149
       serial_echo_xy(UBL_MESH_MAX_X, UBL_MESH_MAX_Y);
150
       SERIAL_EOL;
150
       SERIAL_EOL;
151
     }
151
     }
190
 
190
 
191
     if (map0) {
191
     if (map0) {
192
       serial_echo_xy(UBL_MESH_MIN_X, UBL_MESH_MIN_Y);
192
       serial_echo_xy(UBL_MESH_MIN_X, UBL_MESH_MIN_Y);
193
-      SERIAL_ECHO_SP(spaces * (GRID_MAX_POINTS_X - 2) + 1);
193
+      SERIAL_ECHO_SP(spaces + 1);
194
       serial_echo_xy(UBL_MESH_MAX_X, UBL_MESH_MIN_Y);
194
       serial_echo_xy(UBL_MESH_MAX_X, UBL_MESH_MIN_Y);
195
       SERIAL_EOL;
195
       SERIAL_EOL;
196
       serial_echo_xy(0, 0);
196
       serial_echo_xy(0, 0);
197
-      SERIAL_ECHO_SP(spaces * (GRID_MAX_POINTS_X - 2) + 5);
197
+      SERIAL_ECHO_SP(spaces + 5);
198
       serial_echo_xy(GRID_MAX_POINTS_X - 1, 0);
198
       serial_echo_xy(GRID_MAX_POINTS_X - 1, 0);
199
       SERIAL_EOL;
199
       SERIAL_EOL;
200
     }
200
     }

+ 2
- 2
Marlin/ubl_G29.cpp Datei anzeigen

389
     }
389
     }
390
 
390
 
391
     if (code_seen('P')) {
391
     if (code_seen('P')) {
392
-      if (WITHIN(phase_value,0,1) && ubl.state.eeprom_storage_slot==-1) {
393
-        ubl.state.eeprom_storage_slot=0;
392
+      if (WITHIN(phase_value, 0, 1) && ubl.state.eeprom_storage_slot == -1) {
393
+        ubl.state.eeprom_storage_slot = 0;
394
         SERIAL_PROTOCOLLNPGM("Default storage slot 0 selected.\n");
394
         SERIAL_PROTOCOLLNPGM("Default storage slot 0 selected.\n");
395
       }
395
       }
396
 
396
 

+ 1
- 1
buildroot/share/git/mfdoc Datei anzeigen

37
 echo "Previewing MarlinDocumentation..."
37
 echo "Previewing MarlinDocumentation..."
38
 
38
 
39
 # wait to open the url for about 8s
39
 # wait to open the url for about 8s
40
-( sleep 8; opensite ) &
40
+( sleep 45; opensite ) &
41
 
41
 
42
 bundle exec jekyll serve --watch --incremental
42
 bundle exec jekyll serve --watch --incremental
43
 
43
 

+ 15
- 2
buildroot/share/git/mfqp Datei anzeigen

8
 MFINFO=$(mfinfo) || exit
8
 MFINFO=$(mfinfo) || exit
9
 IFS=' ' read -a INFO <<< "$MFINFO"
9
 IFS=' ' read -a INFO <<< "$MFINFO"
10
 
10
 
11
+if [[ ${INFO[4]} == "(no" ]]; then
12
+  echo "Branch is unavailable!" ; exit 1
13
+fi
14
+
11
 case "$#" in
15
 case "$#" in
12
   0 ) ;;
16
   0 ) ;;
13
   * ) echo "Usage: `basename $0`" 1>&2 ; exit 1 ;;
17
   * ) echo "Usage: `basename $0`" 1>&2 ; exit 1 ;;
15
 
19
 
16
 git add * .travis.yml
20
 git add * .travis.yml
17
 git commit -m "patch"
21
 git commit -m "patch"
18
-mfrb
19
-git push -f
22
+
23
+if [[ ${INFO[3]} == ${INFO[4]} ]]; then
24
+  if [[ ${INFO[2]} == "MarlinDocumentation" ]]; then
25
+    git rebase -i HEAD~2
26
+  else
27
+    echo "Don't alter the PR target branch."; exit 1
28
+  fi
29
+else
30
+  mfrb
31
+  git push -f
32
+fi

Laden…
Abbrechen
Speichern