Quellcode durchsuchen

Hephestos config updates (#10960)

Scott Lahteine vor 6 Jahren
Ursprung
Commit
334341c632
Es ist kein Account mit der E-Mail-Adresse des Committers verbunden

+ 45
- 57
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h Datei anzeigen

@@ -342,7 +342,7 @@
342 342
 #define TEMP_WINDOW     1       // (degC) Window around target to start the residency timer x degC early.
343 343
 
344 344
 // Bed temperature must be close to target for this long before M190 returns success
345
-#define TEMP_BED_RESIDENCY_TIME 0   // (seconds)
345
+#define TEMP_BED_RESIDENCY_TIME 10  // (seconds)
346 346
 #define TEMP_BED_HYSTERESIS 3       // (degC) range of +/- temperatures considered "close" to the target one
347 347
 #define TEMP_BED_WINDOW     1       // (degC) Window around target to start the residency timer x degC early.
348 348
 
@@ -359,12 +359,12 @@
359 359
 // When temperature exceeds max temp, your heater will be switched off.
360 360
 // This feature exists to protect your hotend from overheating accidentally, but *NOT* from thermistor short/failure!
361 361
 // You should use MINTEMP for thermistor short/failure protection.
362
-#define HEATER_0_MAXTEMP 275
362
+#define HEATER_0_MAXTEMP 230
363 363
 #define HEATER_1_MAXTEMP 275
364 364
 #define HEATER_2_MAXTEMP 275
365 365
 #define HEATER_3_MAXTEMP 275
366 366
 #define HEATER_4_MAXTEMP 275
367
-#define BED_MAXTEMP      110
367
+#define BED_MAXTEMP      100
368 368
 
369 369
 //===========================================================================
370 370
 //============================= PID Settings ================================
@@ -383,13 +383,13 @@
383 383
   //#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
384 384
   //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
385 385
                                   // Set/get with gcode: M301 E[extruder number, 0-2]
386
-  #define PID_FUNCTIONAL_RANGE 50 // If the temperature difference between the target temperature and the actual temperature
387
-                                    // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
386
+  #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
387
+                                  // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
388 388
 
389 389
   // Tuned PID values using M303
390
-  #define DEFAULT_Kp 19.18
391
-  #define DEFAULT_Ki 1.36
392
-  #define DEFAULT_Kd 67.42
390
+  #define DEFAULT_Kp 23.75
391
+  #define DEFAULT_Ki  2.12
392
+  #define DEFAULT_Kd 66.63
393 393
 
394 394
   // BQ firmware stock PID values
395 395
   //#define DEFAULT_Kp 10.7
@@ -597,14 +597,14 @@
597 597
  * Override with M92
598 598
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
599 599
  */
600
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 160, 160, 8000, 210.02 }
600
+#define DEFAULT_AXIS_STEPS_PER_UNIT   { 160, 160, 8000, 218.77 }
601 601
 
602 602
 /**
603 603
  * Default Max Feed Rate (mm/s)
604 604
  * Override with M203
605 605
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
606 606
  */
607
-#define DEFAULT_MAX_FEEDRATE          { 167, 167, 3.3, 167 }
607
+#define DEFAULT_MAX_FEEDRATE          { 300, 300, 3, 120 }
608 608
 
609 609
 /**
610 610
  * Default Max Acceleration (change/s) change = mm/s
@@ -612,7 +612,7 @@
612 612
  * Override with M201
613 613
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
614 614
  */
615
-#define DEFAULT_MAX_ACCELERATION      { 1000, 1000, 100, 3000 }
615
+#define DEFAULT_MAX_ACCELERATION      { 3000, 3000, 100, 3000 }
616 616
 
617 617
 /**
618 618
  * Default Acceleration (change/s) change = mm/s
@@ -622,9 +622,9 @@
622 622
  *   M204 R    Retract Acceleration
623 623
  *   M204 T    Travel Acceleration
624 624
  */
625
-#define DEFAULT_ACCELERATION          1000    // X, Y, Z and E acceleration for printing moves
626
-#define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration for retracts
627
-#define DEFAULT_TRAVEL_ACCELERATION   1000    // X, Y, Z acceleration for travel (non printing) moves
625
+#define DEFAULT_ACCELERATION           900    // X, Y, Z and E acceleration for printing moves
626
+#define DEFAULT_RETRACT_ACCELERATION  1300    // E acceleration for retracts
627
+#define DEFAULT_TRAVEL_ACCELERATION   1500    // X, Y, Z acceleration for travel (non printing) moves
628 628
 
629 629
 /**
630 630
  * Default Jerk (mm/s)
@@ -634,10 +634,10 @@
634 634
  * When changing speed and direction, if the difference is less than the
635 635
  * value set here, it may happen instantaneously.
636 636
  */
637
-#define DEFAULT_XJERK                 10.0
638
-#define DEFAULT_YJERK                 10.0
637
+#define DEFAULT_XJERK                  5.0
638
+#define DEFAULT_YJERK                  5.0
639 639
 #define DEFAULT_ZJERK                  0.3
640
-#define DEFAULT_EJERK                  1.0
640
+#define DEFAULT_EJERK                 10.0
641 641
 
642 642
 /**
643 643
  * S-Curve Acceleration
@@ -766,7 +766,7 @@
766 766
  */
767 767
 #define X_PROBE_OFFSET_FROM_EXTRUDER 34  // X offset: -left  +right  [of the nozzle]
768 768
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 15  // Y offset: -front +behind [the nozzle]
769
-#define Z_PROBE_OFFSET_FROM_EXTRUDER -4  // Z offset: -below +above  [the nozzle]
769
+#define Z_PROBE_OFFSET_FROM_EXTRUDER  0  // Z offset: -below +above  [the nozzle]
770 770
 
771 771
 // Certain types of probes need to stay away from edges
772 772
 #define MIN_PROBE_EDGE 10
@@ -801,16 +801,16 @@
801 801
  */
802 802
 #define Z_CLEARANCE_DEPLOY_PROBE   0 // Z Clearance for Deploy/Stow
803 803
 #define Z_CLEARANCE_BETWEEN_PROBES 2 // Z Clearance between probe points
804
-//#define Z_AFTER_PROBING          2 // Z position after probing is done
804
+//#define Z_AFTER_PROBING          5 // Z position after probing is done
805 805
 
806
-#define Z_PROBE_LOW_POINT          -2 // Farthest distance below the trigger-point to go before stopping
806
+#define Z_PROBE_LOW_POINT         -2 // Farthest distance below the trigger-point to go before stopping
807 807
 
808 808
 // For M851 give a range for adjusting the Z probe offset
809
-#define Z_PROBE_OFFSET_RANGE_MIN -5.5
810
-#define Z_PROBE_OFFSET_RANGE_MAX -3
809
+#define Z_PROBE_OFFSET_RANGE_MIN -20
810
+#define Z_PROBE_OFFSET_RANGE_MAX  20
811 811
 
812 812
 // Enable the M48 repeatability test to test probe accuracy
813
-#define Z_MIN_PROBE_REPEATABILITY_TEST
813
+//#define Z_MIN_PROBE_REPEATABILITY_TEST
814 814
 
815 815
 // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
816 816
 // :{ 0:'Low', 1:'High' }
@@ -853,11 +853,11 @@
853 853
 
854 854
 // @section homing
855 855
 
856
-//#define NO_MOTION_BEFORE_HOMING  // Inhibit movement until all axes have been homed
856
+#define NO_MOTION_BEFORE_HOMING  // Inhibit movement until all axes have been homed
857 857
 
858 858
 //#define UNKNOWN_Z_NO_RAISE // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off.
859 859
 
860
-#define Z_HOMING_HEIGHT 5    // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
860
+//#define Z_HOMING_HEIGHT 3  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
861 861
                              // Be sure you have this distance over your Z_MAX_POS in case.
862 862
 
863 863
 // Direction of endstops when homing; 1=MAX, -1=MIN
@@ -922,7 +922,6 @@
922 922
   #define NUM_RUNOUT_SENSORS   1     // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
923 923
   #define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
924 924
   #define FIL_RUNOUT_PULLUP          // Use internal pullup for filament runout pins.
925
-  //#define FIL_RUNOUT_PULLDOWN      // Use internal pulldown for filament runout pins.
926 925
   #define FILAMENT_RUNOUT_SCRIPT "M600"
927 926
 #endif
928 927
 
@@ -1002,8 +1001,8 @@
1002 1001
   #if ENABLED(G26_MESH_VALIDATION)
1003 1002
     #define MESH_TEST_NOZZLE_SIZE    0.4  // (mm) Diameter of primary nozzle.
1004 1003
     #define MESH_TEST_LAYER_HEIGHT   0.2  // (mm) Default layer height for the G26 Mesh Validation Tool.
1005
-    #define MESH_TEST_HOTEND_TEMP  205.0  // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
1006
-    #define MESH_TEST_BED_TEMP      60.0  // (°C) Default bed temperature for the G26 Mesh Validation Tool.
1004
+    #define MESH_TEST_HOTEND_TEMP  185.0  // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
1005
+    #define MESH_TEST_BED_TEMP      50.0  // (°C) Default bed temperature for the G26 Mesh Validation Tool.
1007 1006
   #endif
1008 1007
 
1009 1008
 #endif
@@ -1011,8 +1010,8 @@
1011 1010
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
1012 1011
 
1013 1012
   // Set the number of grid points per dimension.
1014
-  #define GRID_MAX_POINTS_X 3
1015
-  #define GRID_MAX_POINTS_Y 4
1013
+  #define GRID_MAX_POINTS_X 5
1014
+  #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1016 1015
 
1017 1016
   // Set the boundaries for probing (where the probe can reach).
1018 1017
   //#define LEFT_PROBE_BED_POSITION  X_MIN_POS + (X_PROBE_OFFSET_FROM_EXTRUDER)
@@ -1027,7 +1026,7 @@
1027 1026
 
1028 1027
     // Beyond the probed grid, continue the implied tilt?
1029 1028
     // Default is to maintain the height of the nearest edge.
1030
-    //#define EXTRAPOLATE_BEYOND_GRID
1029
+    #define EXTRAPOLATE_BEYOND_GRID
1031 1030
 
1032 1031
     //
1033 1032
     // Experimental Subdivision of the grid by Catmull-Rom method.
@@ -1041,17 +1040,6 @@
1041 1040
 
1042 1041
   #endif
1043 1042
 
1044
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
1045
-
1046
-  // 3 arbitrary points to probe.
1047
-  // A simple cross-product is used to estimate the plane of the bed.
1048
-  #define PROBE_PT_1_X X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER
1049
-  #define PROBE_PT_1_Y Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER
1050
-  #define PROBE_PT_2_X X_MAX_POS - (X_PROBE_OFFSET_FROM_EXTRUDER)
1051
-  #define PROBE_PT_2_Y Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER
1052
-  #define PROBE_PT_3_X ((X_MIN_POS + X_MAX_POS) / 2)
1053
-  #define PROBE_PT_3_Y Y_MAX_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)
1054
-
1055 1043
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
1056 1044
 
1057 1045
   //===========================================================================
@@ -1120,7 +1108,7 @@
1120 1108
  * Commands to execute at the end of G29 probing.
1121 1109
  * Useful to retract or move the Z probe out of the way.
1122 1110
  */
1123
-//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10"
1111
+#define Z_PROBE_END_SCRIPT "G27 P0"
1124 1112
 
1125 1113
 
1126 1114
 // @section homing
@@ -1151,8 +1139,8 @@
1151 1139
 #endif
1152 1140
 
1153 1141
 // Homing speeds (mm/m)
1154
-#define HOMING_FEEDRATE_XY (60*60)
1155
-#define HOMING_FEEDRATE_Z  120
1142
+#define HOMING_FEEDRATE_XY (50*60)
1143
+#define HOMING_FEEDRATE_Z  ( 4*60)
1156 1144
 
1157 1145
 // @section calibrate
1158 1146
 
@@ -1236,7 +1224,7 @@
1236 1224
 // every couple of seconds when it can't accept commands.
1237 1225
 //
1238 1226
 #define HOST_KEEPALIVE_FEATURE        // Disable this if your host doesn't like keepalive messages
1239
-#define DEFAULT_KEEPALIVE_INTERVAL 10 // Number of seconds between "busy" messages. Set with M113.
1227
+#define DEFAULT_KEEPALIVE_INTERVAL 5  // Number of seconds between "busy" messages. Set with M113.
1240 1228
 #define BUSY_WHILE_HEATING            // Some hosts require "busy" messages even during heating
1241 1229
 
1242 1230
 //
@@ -1257,12 +1245,12 @@
1257 1245
 // @section temperature
1258 1246
 
1259 1247
 // Preheat Constants
1260
-#define PREHEAT_1_TEMP_HOTEND 205
1248
+#define PREHEAT_1_TEMP_HOTEND 180
1261 1249
 #define PREHEAT_1_TEMP_BED     50
1262 1250
 #define PREHEAT_1_FAN_SPEED     0 // Value from 0 to 255
1263 1251
 
1264
-#define PREHEAT_2_TEMP_HOTEND 245
1265
-#define PREHEAT_2_TEMP_BED     50
1252
+#define PREHEAT_2_TEMP_HOTEND 210
1253
+#define PREHEAT_2_TEMP_BED     60
1266 1254
 #define PREHEAT_2_FAN_SPEED     0 // Value from 0 to 255
1267 1255
 
1268 1256
 /**
@@ -1323,7 +1311,7 @@
1323 1311
  * Attention: EXPERIMENTAL. G-code arguments may change.
1324 1312
  *
1325 1313
  */
1326
-#define NOZZLE_CLEAN_FEATURE
1314
+//#define NOZZLE_CLEAN_FEATURE
1327 1315
 
1328 1316
 #if ENABLED(NOZZLE_CLEAN_FEATURE)
1329 1317
   // Default number of pattern repetitions
@@ -1333,8 +1321,8 @@
1333 1321
   #define NOZZLE_CLEAN_TRIANGLES  3
1334 1322
 
1335 1323
   // Specify positions as { X, Y, Z }
1336
-  #define NOZZLE_CLEAN_START_POINT { X_MIN_POS + 10, Y_MAX_POS - 9, (Z_MIN_POS + 0.5)}
1337
-  #define NOZZLE_CLEAN_END_POINT   { X_MIN_POS + 90, Y_MAX_POS - 0, (Z_MIN_POS + 0.5)}
1324
+  #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
1325
+  #define NOZZLE_CLEAN_END_POINT   {100, 60, (Z_MIN_POS + 1)}
1338 1326
 
1339 1327
   // Circular pattern radius
1340 1328
   #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5
@@ -1344,7 +1332,7 @@
1344 1332
   #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT
1345 1333
 
1346 1334
   // Moves the nozzle to the initial position
1347
-  //#define NOZZLE_CLEAN_GOBACK
1335
+  #define NOZZLE_CLEAN_GOBACK
1348 1336
 #endif
1349 1337
 
1350 1338
 /**
@@ -1445,7 +1433,7 @@
1445 1433
  *
1446 1434
  * Use CRC checks and retries on the SD communication.
1447 1435
  */
1448
-#define SD_CHECK_AND_RETRY
1436
+//#define SD_CHECK_AND_RETRY
1449 1437
 
1450 1438
 /**
1451 1439
  * LCD Menu Items
@@ -1462,13 +1450,13 @@
1462 1450
 // This option overrides the default number of encoder pulses needed to
1463 1451
 // produce one step. Should be increased for high-resolution encoders.
1464 1452
 //
1465
-//#define ENCODER_PULSES_PER_STEP 4
1453
+#define ENCODER_PULSES_PER_STEP 1
1466 1454
 
1467 1455
 //
1468 1456
 // Use this option to override the number of step signals required to
1469 1457
 // move between next/prev menu items.
1470 1458
 //
1471
-//#define ENCODER_STEPS_PER_MENU_ITEM 1
1459
+#define ENCODER_STEPS_PER_MENU_ITEM 5
1472 1460
 
1473 1461
 /**
1474 1462
  * Encoder Direction Options
@@ -1818,7 +1806,7 @@
1818 1806
 // @section extras
1819 1807
 
1820 1808
 // Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
1821
-//#define FAST_PWM_FAN
1809
+#define FAST_PWM_FAN
1822 1810
 
1823 1811
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
1824 1812
 // which is not as annoying as with the hardware PWM. On the other hand, if this frequency

+ 44
- 36
Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h Datei anzeigen

@@ -172,10 +172,10 @@
172 172
 // Extruder runout prevention.
173 173
 // If the machine is idle and the temperature over MINTEMP
174 174
 // then extrude some filament every couple of SECONDS.
175
-#define EXTRUDER_RUNOUT_PREVENT
175
+//#define EXTRUDER_RUNOUT_PREVENT
176 176
 #if ENABLED(EXTRUDER_RUNOUT_PREVENT)
177
-  #define EXTRUDER_RUNOUT_MINTEMP 170
178
-  #define EXTRUDER_RUNOUT_SECONDS 60
177
+  #define EXTRUDER_RUNOUT_MINTEMP 190
178
+  #define EXTRUDER_RUNOUT_SECONDS 30
179 179
   #define EXTRUDER_RUNOUT_SPEED 1500  // mm/m
180 180
   #define EXTRUDER_RUNOUT_EXTRUDE 5   // mm
181 181
 #endif
@@ -206,7 +206,7 @@
206 206
 // When first starting the main fan, run it at full speed for the
207 207
 // given number of milliseconds.  This gets the fan spinning reliably
208 208
 // before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
209
-//#define FAN_KICKSTART_TIME 100
209
+#define FAN_KICKSTART_TIME 800
210 210
 
211 211
 /**
212 212
  * PWM Fan Scaling
@@ -379,7 +379,7 @@
379 379
 // Homing hits each endstop, retracts by these distances, then does a slower bump.
380 380
 #define X_HOME_BUMP_MM 5
381 381
 #define Y_HOME_BUMP_MM 5
382
-#define Z_HOME_BUMP_MM 2
382
+#define Z_HOME_BUMP_MM 1
383 383
 #define HOMING_BUMP_DIVISOR { 2, 2, 4 }  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
384 384
 #define QUICK_HOME                       // If homing includes X and Y, do a diagonal move initially
385 385
 
@@ -405,10 +405,10 @@
405 405
 // Default stepper release if idle. Set to 0 to deactivate.
406 406
 // Steppers will shut down DEFAULT_STEPPER_DEACTIVE_TIME seconds after the last move when DISABLE_INACTIVE_? is true.
407 407
 // Time can be set by M18 and M84.
408
-#define DEFAULT_STEPPER_DEACTIVE_TIME 120
409
-#define DISABLE_INACTIVE_X true
410
-#define DISABLE_INACTIVE_Y true
411
-#define DISABLE_INACTIVE_Z true  // set to false if the nozzle will fall down on your printed part when print has finished.
408
+#define DEFAULT_STEPPER_DEACTIVE_TIME 300
409
+#define DISABLE_INACTIVE_X false
410
+#define DISABLE_INACTIVE_Y false
411
+#define DISABLE_INACTIVE_Z false  // set to false if the nozzle will fall down on your printed part when print has finished.
412 412
 #define DISABLE_INACTIVE_E true
413 413
 
414 414
 #define DEFAULT_MINIMUMFEEDRATE       0.0     // minimum feedrate
@@ -419,7 +419,7 @@
419 419
 // @section lcd
420 420
 
421 421
 #if ENABLED(ULTIPANEL)
422
-  #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
422
+  #define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 60 } // Feedrates for manual moves along X, Y, Z, E from panel
423 423
   //#define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
424 424
 #endif
425 425
 
@@ -474,7 +474,15 @@
474 474
  *    M909, M910 & LCD - only PRINTRBOARD_REVF & RIGIDBOARD_V2
475 475
  */
476 476
 //#define PWM_MOTOR_CURRENT { 1300, 1300, 1250 }            // Values in milliamps
477
-#define DIGIPOT_MOTOR_CURRENT { 150, 170, 180, 190, 180 }   // Values 0-255 (bq ZUM Mega 3D (default): X = 150 [~1.17A]; Y = 170 [~1.33A]; Z = 180 [~1.41A]; E0 = 190 [~1.49A])
477
+
478
+#define DIGIPOT_MOTOR_CURRENT { 170, 170, 180, 190, 180 }   // Values 0-255
479
+                                                            //
480
+                                                            // bq ZUM Mega 3D defaults:
481
+                                                            //  X  = 150 [~1.17A]
482
+                                                            //  Y  = 170 [~1.33A]
483
+                                                            //  Z  = 180 [~1.41A]
484
+                                                            //  E0 = 190 [~1.49A]
485
+
478 486
 //#define DAC_MOTOR_CURRENT_DEFAULT { 70, 80, 90, 80 }      // Default drive percent - X, Y, Z, E axis
479 487
 
480 488
 // Use an I2C based DIGIPOT (e.g., Azteeg X3 Pro)
@@ -502,17 +510,17 @@
502 510
 //=============================Additional Features===========================
503 511
 //===========================================================================
504 512
 
505
-//#define ENCODER_RATE_MULTIPLIER         // If defined, certain menu edit operations automatically multiply the steps when the encoder is moved quickly
506
-//#define ENCODER_10X_STEPS_PER_SEC 75    // If the encoder steps per sec exceeds this value, multiply steps moved x10 to quickly advance the value
507
-//#define ENCODER_100X_STEPS_PER_SEC 160  // If the encoder steps per sec exceeds this value, multiply steps moved x100 to really quickly advance the value
513
+#define ENCODER_RATE_MULTIPLIER       // If defined, certain menu edit operations automatically multiply the steps when the encoder is moved quickly
514
+#define ENCODER_10X_STEPS_PER_SEC  30 // If the encoder steps per sec exceeds this value, multiply steps moved x10 to quickly advance the value
515
+#define ENCODER_100X_STEPS_PER_SEC 50 // If the encoder steps per sec exceeds this value, multiply steps moved x100 to really quickly advance the value
508 516
 
509 517
 //#define CHDK 4        //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
510
-//#define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again
518
+#define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again
511 519
 
512 520
 // @section lcd
513 521
 
514 522
 // Include a page of printer information in the LCD Main Menu
515
-#define LCD_INFO_MENU
523
+//#define LCD_INFO_MENU
516 524
 
517 525
 // Scroll a longer status message into view
518 526
 #define STATUS_MESSAGE_SCROLLING
@@ -521,7 +529,7 @@
521 529
 #define LCD_DECIMAL_SMALL_XY
522 530
 
523 531
 // The timeout (in ms) to return to the status screen from sub-menus
524
-//#define LCD_TIMEOUT_TO_STATUS 15000
532
+#define LCD_TIMEOUT_TO_STATUS 60000
525 533
 
526 534
 // Add an 'M73' G-code to set the current percentage
527 535
 //#define LCD_SET_PROGRESS_MANUALLY
@@ -563,8 +571,8 @@
563 571
   // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
564 572
   #define SD_DETECT_INVERTED
565 573
 
566
-  #define SD_FINISHED_STEPPERRELEASE true          // Disable steppers when SD Print is finished
567
-  #define SD_FINISHED_RELEASECOMMAND "M104 S0\nM84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.
574
+  #define SD_FINISHED_STEPPERRELEASE false         // Disable steppers when SD Print is finished
575
+  #define SD_FINISHED_RELEASECOMMAND "G27 P0"      // You might want to keep the z enabled so your bed stays in place.
568 576
 
569 577
   // Reverse SD sort to show "more recent" files first, according to the card's FAT.
570 578
   // Since the FAT gets out of order with usage, SDCARD_SORT_ALPHA is recommended.
@@ -622,7 +630,7 @@
622 630
   #endif
623 631
 
624 632
   // This allows hosts to request long names for files and folders with M33
625
-  #define LONG_FILENAME_HOST_SUPPORT
633
+  //#define LONG_FILENAME_HOST_SUPPORT
626 634
 
627 635
   // Enable this option to scroll long filenames in the SD card menu
628 636
   //#define SCROLL_LONG_FILENAMES
@@ -665,18 +673,18 @@
665 673
   //#define DOGM_SD_PERCENT
666 674
 
667 675
   // Enable to save many cycles by drawing a hollow frame on the Info Screen
668
-  #define XYZ_HOLLOW_FRAME
676
+  //#define XYZ_HOLLOW_FRAME
669 677
 
670 678
   // Enable to save many cycles by drawing a hollow frame on Menu Screens
671 679
   #define MENU_HOLLOW_FRAME
672 680
 
673 681
   // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
674 682
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
675
-  #define USE_BIG_EDIT_FONT
683
+  //#define USE_BIG_EDIT_FONT
676 684
 
677 685
   // A smaller font may be used on the Info Screen. Costs 2300 bytes of PROGMEM.
678 686
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
679
-  #define USE_SMALL_INFOFONT
687
+  //#define USE_SMALL_INFOFONT
680 688
 
681 689
   // Enable this option and reduce the value to optimize screen updates.
682 690
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
@@ -728,16 +736,16 @@
728 736
  *
729 737
  * Warning: Does not respect endstops!
730 738
  */
731
-//#define BABYSTEPPING
739
+#define BABYSTEPPING
732 740
 #if ENABLED(BABYSTEPPING)
733
-  //#define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
734
-  #define BABYSTEP_INVERT_Z false    // Change if Z babysteps should go the other way
735
-  #define BABYSTEP_MULTIPLICATOR 1   // Babysteps are very small. Increase for faster motion.
736
-  //#define BABYSTEP_ZPROBE_OFFSET   // Enable to combine M851 and Babystepping
737
-  //#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
738
-  #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
739
-                                        // Note: Extra time may be added to mitigate controller latency.
740
-  //#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor
741
+  //#define BABYSTEP_XY                   // Also enable X/Y Babystepping. Not supported on DELTA!
742
+  #define BABYSTEP_INVERT_Z false         // Change if Z babysteps should go the other way
743
+  #define BABYSTEP_MULTIPLICATOR 2        // Babysteps are very small. Increase for faster motion.
744
+  //#define BABYSTEP_ZPROBE_OFFSET          // Enable to combine M851 and Babystepping
745
+  //#define DOUBLECLICK_FOR_Z_BABYSTEPPING  // Double-click on the Status Screen for Z Babystepping.
746
+  #define DOUBLECLICK_MAX_INTERVAL  1500  // Maximum interval between clicks, in milliseconds.
747
+                                          // Note: Extra time may be added to mitigate controller latency.
748
+  //#define BABYSTEP_ZPROBE_GFX_OVERLAY   // Enable graphical overlay on Z-offset editor
741 749
 #endif
742 750
 
743 751
 // @section extruder
@@ -803,7 +811,7 @@
803 811
 //
804 812
 // G2/G3 Arc Support
805 813
 //
806
-#define ARC_SUPPORT               // Disable this feature to save ~3226 bytes
814
+//#define ARC_SUPPORT               // Disable this feature to save ~3226 bytes
807 815
 #if ENABLED(ARC_SUPPORT)
808 816
   #define MM_PER_ARC_SEGMENT  1   // Length of each arc segment
809 817
   #define N_ARC_CORRECTION   25   // Number of intertpolated segments between corrections
@@ -843,7 +851,7 @@
843 851
 // The number of linear motions that can be in the plan at any give time.
844 852
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2 (e.g. 8, 16, 32) because shifts and ors are used to do the ring-buffering.
845 853
 #if ENABLED(SDSUPPORT)
846
-  #define BLOCK_BUFFER_SIZE 32 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
854
+  #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
847 855
 #else
848 856
   #define BLOCK_BUFFER_SIZE 64 // maximize block buffer
849 857
 #endif
@@ -889,13 +897,13 @@
889 897
 // enter the serial receive buffer, so they cannot be blocked.
890 898
 // Currently handles M108, M112, M410
891 899
 // Does not work on boards using AT90USB (USBCON) processors!
892
-#define EMERGENCY_PARSER
900
+//#define EMERGENCY_PARSER
893 901
 
894 902
 // Bad Serial-connections can miss a received command by sending an 'ok'
895 903
 // Therefore some clients abort after 30 seconds in a timeout.
896 904
 // Some other clients start sending commands while receiving a 'wait'.
897 905
 // This "wait" is only sent when the buffer is empty. 1 second is a good value here.
898
-//#define NO_TIMEOUTS 1000 // Milliseconds
906
+#define NO_TIMEOUTS 1000 // Milliseconds
899 907
 
900 908
 // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary.
901 909
 #define ADVANCED_OK

+ 20
- 13
Marlin/src/config/examples/BQ/Hephestos_2/README.md Datei anzeigen

@@ -1,22 +1,29 @@
1 1
 # Example Configuration for BQ [Hephestos 2](http://www.bq.com/uk/hephestos-2)
2
-This configuration file is based on the original configuration file shipped with the heavily modified Marlin fork by BQ. The original firmware and configuration file can be found at [BQ Github repository](https://github.com/bq/Marlin).
2
+Based on the original configuration file shipped with the heavily modified Marlin fork by BQ.
3
+The forked firmware and configuration files can be found at the [BQ Github repository](https://github.com/bq/Marlin).
3 4
 
4
-NOTE: The look and feel of the Hephestos 2 while navigating the LCD menu will change by using the original Marlin firmware.
5
+NOTE: The look and feel of the LCD menu will change dramatically when using the original Marlin firmware.
5 6
 
6 7
 ## Changelog
7
- * 2016/03/01 - Initial release
8
+ * 2018/05/30 - Configuration updated to the latest Marlin version (43a55a9af).
9
+                ABL Bilinear 5x5 is active by default.
8 10
 
9
- * 2016/03/21 - Activated 4-point auto leveling by default
10
-                Updated miscellaneous z-probe values
11
+ * 2017/07/06 - Configuration updated to the latest Marlin version and added support for the
12
+                official BQ heated bed upgrade kit.
11 13
 
12
- * 2016/06/21 - Disabled hot bed related options
13
-                Activated software endstops
14
-                SD printing now disables the heater when finished
14
+ * 2016/12/13 - Configuration updated to the latest Marlin version.
15 15
 
16
- * 2016/07/13 - Update the `DEFAULT_AXIS_STEPS_PER_UNIT` for the Z axis
17
-                Increased the `DEFAULT_XYJERK`
16
+ * 2016/07/13 - Configuration updated to the latest Marlin version.
18 17
 
19
- * 2016/12/13 - Configuration updated.
18
+ * 2016/06/21 - Disabled heated bed related options, activated software endstops and SD printing now
19
+               disables the heater when finishes printing.
20 20
 
21
- * 2017/07/06 - Configuration updated to the latest Marlin version.
22
-                Added support for the official BQ heated bed kit.
21
+ * 2016/03/21 - Activated 4-point auto leveling by default and updated miscellaneous z-probe values.
22
+
23
+ * 2016/03/01 - The first release of Marlin's configuration file for the
24
+                BQ Hephestos 2 3D printer.
25
+
26
+
27
+## Support
28
+This configuration should work easily with the stock Hephestos 2, nevertheless if you encounter any
29
+issues you may contact me on [Github](https://github.com/jbrazio), [Twitter](https://twitter.com/jbrazio) or by mail.

+ 50
- 50
Marlin/src/config/examples/BQ/Hephestos_2/_Bootscreen.h Datei anzeigen

@@ -30,38 +30,39 @@
30 30
  * http://marlinfw.org/tools/u8glib/converter.html
31 31
  */
32 32
 
33
-#define CUSTOM_BOOTSCREEN_BMPWIDTH  62
33
+#define CUSTOM_BOOTSCREEN_BMPWIDTH  64
34 34
 
35 35
 const unsigned char custom_start_bmp[] PROGMEM = {
36
-  B00000000,B00000000,B00000000,B00001111,B11110000,B00000000,B00000000,B00000000,
37
-  B00000000,B00000000,B00000000,B00011111,B11111000,B00000000,B00000000,B00000000,
38
-  B00000000,B00000000,B00000000,B00011111,B11111000,B00000000,B00000000,B00000000,
39
-  B00000000,B00000000,B00000000,B00011111,B11111000,B00000000,B00000000,B00000000,
40
-  B00000000,B00000000,B00000000,B00011111,B11111000,B00000000,B00000000,B00000000,
41
-  B00000000,B00000000,B00000000,B00011111,B11111000,B00000000,B00000000,B00000000,
42
-  B00000000,B00000011,B11000000,B00001111,B11110000,B00000111,B10000000,B00000000,
43
-  B00000000,B00000111,B11100000,B00000111,B11100000,B00001111,B11000000,B00000000,
44
-  B00000000,B00001111,B11110000,B00000011,B11000000,B00011111,B11100000,B00000000,
45
-  B00000000,B00011111,B11111000,B00000000,B00000000,B00111111,B11110000,B00000000,
46
-  B00000000,B00011111,B11111000,B00000000,B00000000,B00111111,B11110000,B00000000,
47
-  B00000000,B00011111,B11111000,B00000000,B00000000,B00111111,B11110000,B00000000,
48
-  B00000000,B00011111,B11111000,B00000000,B00000000,B00111111,B11110000,B00000000,
49
-  B00000000,B00011111,B11111000,B00000000,B00000000,B00111111,B11110000,B00000000,
50
-  B00000000,B00001111,B11110000,B00000000,B00000000,B00011111,B11100000,B00000000,
51
-  B00000000,B00000111,B11100000,B00000000,B00000000,B00001111,B11000000,B00000000,
52
-  B00000000,B00000011,B11000000,B00000000,B00000000,B00000111,B10000000,B00000000,
53 36
   B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
54
-  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11110000,
37
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
38
+  B00000000,B00000000,B00000000,B00000011,B11110000,B00000000,B00000000,B00000000,
39
+  B00000000,B00000000,B00000000,B00000111,B11111000,B00000000,B00000000,B00000000,
40
+  B00000000,B00000000,B00000000,B00000111,B11111000,B00000000,B00000000,B00000000,
41
+  B00000000,B00000000,B00000000,B00001111,B11111100,B00000000,B00000000,B00000000,
42
+  B00000000,B00000000,B00000000,B00001111,B11111100,B00000000,B00000000,B00000000,
43
+  B00000000,B00000000,B00000000,B00000111,B11111000,B00000000,B00000000,B00000000,
44
+  B00000000,B00000000,B11111000,B00000111,B11111000,B00000111,B11000000,B00000000,
45
+  B00000000,B00000001,B11111100,B00000011,B11110000,B00001111,B11100000,B00000000,
46
+  B00000000,B00000011,B11111110,B00000000,B11000000,B00011111,B11110000,B00000000,
47
+  B00000000,B00000011,B11111110,B00000000,B00000000,B00011111,B11110000,B00000000,
48
+  B00000000,B00000011,B11111110,B00000000,B00000000,B00011111,B11110000,B00000000,
49
+  B00000000,B00000011,B11111110,B00000000,B00000000,B00011111,B11110000,B00000000,
50
+  B00000000,B00000011,B11111100,B00000000,B00000000,B00001111,B11100000,B00000000,
51
+  B00000000,B00000001,B11111000,B00000000,B00000000,B00001111,B11100000,B00000000,
52
+  B00000000,B00000000,B01110000,B00000000,B00000000,B00000011,B10000000,B00000000,
53
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
54
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
55
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
56
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01100000,
55 57
   B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11111000,
56 58
   B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111100,
59
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111100,
57 60
   B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111100,
58 61
   B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111100,
59
-  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111100,
60
-  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111100,
61
-  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111100,
62
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111100,
62 63
   B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111100,
63 64
   B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11111000,
64
-  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11110000,
65
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01000000,
65 66
   B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
66 67
   B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
67 68
   B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
@@ -69,32 +70,31 @@ const unsigned char custom_start_bmp[] PROGMEM = {
69 70
   B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
70 71
   B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
71 72
   B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
73
+  B00001111,B10000000,B00000000,B00000000,B01110000,B00000000,B00000000,B00000000,
74
+  B00011111,B11000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00000000,
75
+  B00111111,B11000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00000000,
76
+  B00111111,B11100000,B00000000,B00000000,B01111000,B00000000,B00000000,B00000000,
77
+  B00111111,B11100000,B00000000,B00000000,B01111000,B00000000,B00000000,B00000000,
78
+  B00111111,B11100000,B00000000,B00000000,B01111011,B11000000,B00001111,B00000000,
79
+  B00111111,B11000000,B00000000,B00000000,B01111111,B11110000,B00111111,B11000000,
80
+  B00011111,B10000000,B00000000,B00000000,B01111111,B11111000,B01111111,B11100000,
81
+  B00001111,B00000000,B00000000,B00000000,B01111110,B11111100,B11111001,B11110000,
82
+  B00000000,B00000000,B00000000,B00000000,B01111000,B00111100,B11100000,B11110000,
83
+  B00000000,B00000000,B00000000,B00000000,B01111000,B00011101,B11100000,B01110000,
84
+  B00000000,B00000000,B00000000,B00000000,B01111000,B00011101,B11100000,B01110000,
85
+  B00000000,B00000000,B00000000,B00000000,B01111000,B00011101,B11100000,B01110000,
86
+  B00000000,B00000000,B00000000,B00000000,B01111000,B00011101,B11100000,B01110000,
87
+  B00000000,B00000000,B00000000,B00000000,B01111000,B00011101,B11100000,B01110000,
88
+  B00000000,B00000000,B00000000,B00000000,B01111000,B00111100,B11100000,B11110000,
89
+  B00000000,B00000000,B00000000,B00000000,B01111100,B01111100,B11111001,B11110000,
90
+  B00000000,B00000000,B00000000,B00000000,B00011111,B11111000,B11111111,B11110000,
91
+  B00000000,B00000000,B00000000,B00000000,B00001111,B11110000,B01111111,B11110000,
92
+  B00000000,B00000000,B00000000,B00000000,B00000111,B11100000,B00011111,B01110000,
93
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01110000,
94
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01110000,
95
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01110000,
96
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01110000,
97
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01110000,
72 98
   B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
73
-  B00011110,B00000000,B00000000,B00000000,B11110000,B00000000,B00000000,B00000000,
74
-  B00111111,B00000000,B00000000,B00000000,B11110000,B00000000,B00000000,B00000000,
75
-  B01111111,B10000000,B00000000,B00000000,B11110000,B00000000,B00000000,B00000000,
76
-  B11111111,B11000000,B00000000,B00000000,B11110000,B00000000,B00000000,B00000000,
77
-  B11111111,B11000000,B00000000,B00000000,B11110000,B00000000,B00000000,B00000000,
78
-  B11111111,B11000000,B00000000,B00000000,B11110000,B00000000,B00000000,B00000000,
79
-  B11111111,B11000000,B00000000,B00000000,B11110111,B11000000,B00011111,B10000000,
80
-  B11111111,B11000000,B00000000,B00000000,B11111111,B11110000,B01111111,B11000000,
81
-  B01111111,B10000000,B00000000,B00000000,B11111111,B11111000,B11111111,B11100000,
82
-  B00111111,B00000000,B00000000,B00000000,B11111100,B11111000,B11110000,B11111000,
83
-  B00011110,B00000000,B00000000,B00000000,B11111000,B01111101,B11100000,B01111000,
84
-  B00000000,B00000000,B00000000,B00000000,B11110000,B00111101,B11100000,B01111000,
85
-  B00000000,B00000000,B00000000,B00000000,B11110000,B00111101,B11100000,B01111000,
86
-  B00000000,B00000000,B00000000,B00000000,B11110000,B00111101,B11100000,B01111000,
87
-  B00000000,B00000000,B00000000,B00000000,B11110000,B00111101,B11100000,B01111000,
88
-  B00000000,B00000000,B00000000,B00000000,B11110000,B00111101,B11100000,B01111000,
89
-  B00000000,B00000000,B00000000,B00000000,B11110000,B00111101,B11100000,B01111000,
90
-  B00000000,B00000000,B00000000,B00000000,B11111000,B01111001,B11110000,B11111000,
91
-  B00000000,B00000000,B00000000,B00000000,B11111111,B11111000,B11111111,B11111000,
92
-  B00000000,B00000000,B00000000,B00000000,B00111111,B11110000,B01111111,B11111000,
93
-  B00000000,B00000000,B00000000,B00000000,B00001111,B11100000,B00111111,B11111000,
94
-  B00000000,B00000000,B00000000,B00000000,B00000011,B10000000,B00001110,B01111000,
95
-  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,
96
-  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,
97
-  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,
98
-  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,
99
-  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000
99
+  B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000 
100 100
 };

+ 0
- 18
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h Datei anzeigen

@@ -1173,17 +1173,6 @@
1173 1173
 
1174 1174
   #endif
1175 1175
 
1176
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
1177
-
1178
-  // 3 arbitrary points to probe.
1179
-  // A simple cross-product is used to estimate the plane of the bed.
1180
-  //#define PROBE_PT_1_X 15
1181
-  //#define PROBE_PT_1_Y 180
1182
-  //#define PROBE_PT_2_X 15
1183
-  //#define PROBE_PT_2_Y 20
1184
-  //#define PROBE_PT_3_X 170
1185
-  //#define PROBE_PT_3_Y 20
1186
-
1187 1176
 #elif ENABLED(AUTO_BED_LEVELING_UBL)
1188 1177
 
1189 1178
   //===========================================================================
@@ -1196,13 +1185,6 @@
1196 1185
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1197 1186
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1198 1187
 
1199
-  //#define PROBE_PT_1_X 15
1200
-  //#define PROBE_PT_1_Y 180
1201
-  //#define PROBE_PT_2_X 15
1202
-  //#define PROBE_PT_2_Y 20
1203
-  //#define PROBE_PT_3_X 170
1204
-  //#define PROBE_PT_3_Y 20
1205
-
1206 1188
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
1207 1189
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
1208 1190
 

+ 4
- 0
Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp Datei anzeigen

@@ -68,6 +68,10 @@
68 68
   #define CPU_ST7920_DELAY_1 DELAY_NS(0)
69 69
   #define CPU_ST7920_DELAY_2 DELAY_NS(0)
70 70
   #define CPU_ST7920_DELAY_3 DELAY_NS(0)
71
+#elif MB(BQ_ZUM_MEGA_3D)
72
+  #define CPU_ST7920_DELAY_1 DELAY_NS(0)
73
+  #define CPU_ST7920_DELAY_2 DELAY_NS(0)
74
+  #define CPU_ST7920_DELAY_3 DELAY_NS(189)
71 75
 #elif F_CPU == 16000000
72 76
   #define CPU_ST7920_DELAY_1 DELAY_NS(0)
73 77
   #define CPU_ST7920_DELAY_2 DELAY_NS(0)

+ 15
- 56
Marlin/src/module/thermistor/thermistor_70.h Datei anzeigen

@@ -20,64 +20,23 @@
20 20
  *
21 21
  */
22 22
 
23
+// Stock BQ Hephestos 2 100k thermistor.
24
+// Created on 29/12/2017 with an ambient temperature of 20C.
25
+// ANENG AN8009 DMM with a K-type probe used for measurements.
26
+
23 27
 // R25 = 100 kOhm, beta25 = 4100 K, 4.7 kOhm pull-up, bqh2 stock thermistor
24 28
 const short temptable_70[][2] PROGMEM = {
25
-  { OV(  22), 300 },
26
-  { OV(  24), 295 },
27
-  { OV(  25), 290 },
28
-  { OV(  27), 285 },
29
-  { OV(  29), 280 },
30
-  { OV(  32), 275 },
31
-  { OV(  34), 270 },
32
-  { OV(  37), 265 },
33
-  { OV(  40), 260 },
34
-  { OV(  43), 255 },
35
-  { OV(  46), 250 },
36
-  { OV(  50), 245 },
37
-  { OV(  54), 240 },
38
-  { OV(  59), 235 },
39
-  { OV(  64), 230 },
40
-  { OV(  70), 225 },
41
-  { OV(  76), 220 },
42
-  { OV(  83), 215 },
43
-  { OV(  90), 210 },
44
-  { OV(  99), 205 },
45
-  { OV( 108), 200 },
46
-  { OV( 118), 195 },
47
-  { OV( 129), 190 },
48
-  { OV( 141), 185 },
49
-  { OV( 154), 180 },
50
-  { OV( 169), 175 },
51
-  { OV( 185), 170 },
52
-  { OV( 203), 165 },
53
-  { OV( 222), 160 },
54
-  { OV( 243), 155 },
55
-  { OV( 266), 150 },
56
-  { OV( 290), 145 },
57
-  { OV( 317), 140 },
58
-  { OV( 346), 135 },
59
-  { OV( 376), 130 },
60
-  { OV( 408), 125 },
61
-  { OV( 442), 120 },
62
-  { OV( 477), 115 },
63
-  { OV( 513), 110 },
64
-  { OV( 551), 105 },
65
-  { OV( 588), 100 },
66
-  { OV( 626),  95 },
67
-  { OV( 663),  90 },
68
-  { OV( 699),  85 },
69
-  { OV( 735),  80 },
70
-  { OV( 768),  75 },
71
-  { OV( 800),  70 },
72
-  { OV( 829),  65 },
73
-  { OV( 856),  60 },
74
-  { OV( 881),  55 },
75
-  { OV( 903),  50 },
76
-  { OV( 922),  45 },
77
-  { OV( 939),  40 },
78
-  { OV( 954),  35 },
79
-  { OV( 966),  30 },
80
-  { OV( 977),  25 },
29
+  { OV(  18), 270 },
30
+  { OV(  27), 248 },
31
+  { OV(  34), 234 },
32
+  { OV(  45), 220 },
33
+  { OV(  61), 205 },
34
+  { OV(  86), 188 },
35
+  { OV( 123), 172 },
36
+  { OV( 420), 110 },
37
+  { OV( 590),  90 },
38
+  { OV( 845),  56 },
39
+  { OV( 970),  25 },
81 40
   { OV( 986),  20 },
82 41
   { OV( 994),  15 },
83 42
   { OV(1000),  10 },

Laden…
Abbrechen
Speichern