Преглед изворни кода

Bring Sidewinder X1 config up to date (#14271)

thisiskeithb пре 6 година
родитељ
комит
f93c60a6f0

+ 25
- 28
config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration.h Прегледај датотеку

@@ -137,7 +137,7 @@
137 137
 
138 138
 // Optional custom name for your RepStrap or other custom machine
139 139
 // Displayed in the LCD "Ready" message
140
-//#define CUSTOM_MACHINE_NAME "Sidewinder X1"
140
+#define CUSTOM_MACHINE_NAME "Sidewinder X1"
141 141
 
142 142
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
143 143
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
@@ -359,6 +359,7 @@
359 359
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
360 360
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
361 361
  *    15 : 100k thermistor calibration for JGAurora A5 hotend
362
+ *    18 : ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327
362 363
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
363 364
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
364 365
  *    61 : 100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup
@@ -384,7 +385,7 @@
384 385
  *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
385 386
  *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
386 387
  *
387
- * :{ '0':"Not used", '1':"100k / 4.7k - EPCOS", '2':"200k / 4.7k - ATC Semitec 204GT-2", '3':"Mendel-parts / 4.7k", '4':"10k !! do not use for a hotend. Bad resolution at high temp. !!", '5':"100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '501':"100K Zonestar (Tronxy X3A)", '6':"100k / 4.7k EPCOS - Not as accurate as Table 1", '7':"100k / 4.7k Honeywell 135-104LAG-J01", '8':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9':"100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10':"100k / 4.7k RS 198-961", '11':"100k / 4.7k beta 3950 1%", '12':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13':"100k Hisens 3950  1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '20':"PT100 (Ultimainboard V2.x)", '51':"100k / 1k - EPCOS", '52':"200k / 1k - ATC Semitec 204GT-2", '55':"100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '60':"100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '61':"100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup", '66':"Dyze Design 4.7M High Temperature thermistor", '67':"Slice Engineering 450C High Temperature thermistor", '70':"the 100K thermistor found in the bq Hephestos 2", '71':"100k / 4.7k Honeywell 135-104LAF-J01", '147':"Pt100 / 4.7k", '1047':"Pt1000 / 4.7k", '110':"Pt100 / 1k (non-standard)", '1010':"Pt1000 / 1k (non standard)", '-4':"Thermocouple + AD8495", '-3':"Thermocouple + MAX31855 (only for sensor 0)", '-2':"Thermocouple + MAX6675 (only for sensor 0)", '-1':"Thermocouple + AD595", '998':"Dummy 1", '999':"Dummy 2", '1000':"Custom thermistor params" }
388
+ * :{ '0':"Not used", '1':"100k / 4.7k - EPCOS", '2':"200k / 4.7k - ATC Semitec 204GT-2", '3':"Mendel-parts / 4.7k", '4':"10k !! do not use for a hotend. Bad resolution at high temp. !!", '5':"100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '501':"100K Zonestar (Tronxy X3A)", '6':"100k / 4.7k EPCOS - Not as accurate as Table 1", '7':"100k / 4.7k Honeywell 135-104LAG-J01", '8':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9':"100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10':"100k / 4.7k RS 198-961", '11':"100k / 4.7k beta 3950 1%", '12':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13':"100k Hisens 3950  1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '18':"ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327" '20':"PT100 (Ultimainboard V2.x)", '51':"100k / 1k - EPCOS", '52':"200k / 1k - ATC Semitec 204GT-2", '55':"100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '60':"100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '61':"100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup", '66':"Dyze Design 4.7M High Temperature thermistor", '67':"Slice Engineering 450C High Temperature thermistor", '70':"the 100K thermistor found in the bq Hephestos 2", '71':"100k / 4.7k Honeywell 135-104LAF-J01", '147':"Pt100 / 4.7k", '1047':"Pt1000 / 4.7k", '110':"Pt100 / 1k (non-standard)", '1010':"Pt1000 / 1k (non standard)", '-4':"Thermocouple + AD8495", '-3':"Thermocouple + MAX31855 (only for sensor 0)", '-2':"Thermocouple + MAX6675 (only for sensor 0)", '-1':"Thermocouple + AD595", '998':"Dummy 1", '999':"Dummy 2", '1000':"Custom thermistor params" }
388 389
  */
389 390
 #define TEMP_SENSOR_0 1
390 391
 #define TEMP_SENSOR_1 0
@@ -512,6 +513,12 @@
512 513
   #define DEFAULT_bedKd 325.08
513 514
 
514 515
   //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
516
+  //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
517
+  //#define DEFAULT_bedKp 10.00
518
+  //#define DEFAULT_bedKi .023
519
+  //#define DEFAULT_bedKd 305.4
520
+
521
+  //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
515 522
   //from pidautotune
516 523
   //#define DEFAULT_bedKp 97.1
517 524
   //#define DEFAULT_bedKi 1.41
@@ -826,16 +833,6 @@
826 833
  * The BLTouch probe uses a Hall effect sensor and emulates a servo.
827 834
  */
828 835
 //#define BLTOUCH
829
-#if ENABLED(BLTOUCH)
830
-  //#define BLTOUCH_DELAY 500   // Minimum Command delay (ms). Enable and increase if needed
831
-
832
-  /**
833
-   * BLTouch V3.0 and newer smart series
834
-   * For genuine BLTouch 3.0 sensors. Clones may be confused by 3.0 command angles. YMMV.
835
-   * If the pin trigger is not detected, first try swapping the black and white wires then toggle this.
836
-   */
837
-  //#define BLTOUCH_FORCE_5V_MODE
838
-#endif
839 836
 
840 837
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)
841 838
 //#define SOLENOID_PROBE
@@ -856,23 +853,23 @@
856 853
 //
857 854
 
858 855
 /**
859
- *   Z Probe to nozzle (X,Y) offset, relative to (0, 0).
860
- *   X and Y offsets must be integers.
856
+ * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
857
+ * X and Y offsets must be integers.
861 858
  *
862
- *   In the following example the X and Y offsets are both positive:
863
- *   #define X_PROBE_OFFSET_FROM_EXTRUDER 10
864
- *   #define Y_PROBE_OFFSET_FROM_EXTRUDER 10
859
+ * In the following example the X and Y offsets are both positive:
860
+ * #define X_PROBE_OFFSET_FROM_EXTRUDER 10
861
+ * #define Y_PROBE_OFFSET_FROM_EXTRUDER 10
865 862
  *
866
- *      +-- BACK ---+
867
- *      |           |
868
- *    L |    (+) P  | R <-- probe (20,20)
869
- *    E |           | I
870
- *    F | (-) N (+) | G <-- nozzle (10,10)
871
- *    T |           | H
872
- *      |    (-)    | T
873
- *      |           |
874
- *      O-- FRONT --+
875
- *    (0,0)
863
+ *     +-- BACK ---+
864
+ *     |           |
865
+ *   L |    (+) P  | R <-- probe (20,20)
866
+ *   E |           | I
867
+ *   F | (-) N (+) | G <-- nozzle (10,10)
868
+ *   T |           | H
869
+ *     |    (-)    | T
870
+ *     |           |
871
+ *     O-- FRONT --+
872
+ *   (0,0)
876 873
  */
877 874
 #define X_PROBE_OFFSET_FROM_EXTRUDER 10  // X offset: -left  +right  [of the nozzle]
878 875
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
@@ -1368,7 +1365,7 @@
1368 1365
  *   M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes)
1369 1366
  *   M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.)
1370 1367
  */
1371
-#define EEPROM_SETTINGS     // Persistent storage with M500 and M501
1368
+#define EEPROM_SETTINGS       // Persistent storage with M500 and M501
1372 1369
 //#define DISABLE_M503        // Saves ~2700 bytes of PROGMEM. Disable for release!
1373 1370
 #define EEPROM_CHITCHAT       // Give feedback on EEPROM commands. Disable to save PROGMEM.
1374 1371
 #if ENABLED(EEPROM_SETTINGS)

+ 84
- 10
config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration_adv.h Прегледај датотеку

@@ -375,17 +375,14 @@
375 375
   #define INVERT_CASE_LIGHT false             // Set true if Case Light is ON when pin is LOW
376 376
   #define CASE_LIGHT_DEFAULT_ON true          // Set default power-up state on
377 377
   #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105   // Set default power-up brightness (0-255, requires PWM pin)
378
-  //#define MENU_ITEM_CASE_LIGHT              // Add a Case Light option to the LCD main menu
378
+  //#define CASE_LIGHT_MENU                   // Add Case Light options to the LCD menu
379
+  //#define CASE_LIGHT_NO_BRIGHTNESS          // Disable brightness control. Enable for non-PWM lighting.
379 380
   //#define CASE_LIGHT_USE_NEOPIXEL           // Use Neopixel LED as case light, requires NEOPIXEL_LED.
380 381
   #if ENABLED(CASE_LIGHT_USE_NEOPIXEL)
381 382
     #define CASE_LIGHT_NEOPIXEL_COLOR { 255, 255, 255, 255 } // { Red, Green, Blue, White }
382 383
   #endif
383 384
 #endif
384 385
 
385
-//===========================================================================
386
-//============================ Mechanical Settings ==========================
387
-//===========================================================================
388
-
389 386
 // @section homing
390 387
 
391 388
 // If you want endstops to stay on (by default) even when not homing
@@ -518,7 +515,7 @@
518 515
 #define Y_HOME_BUMP_MM 5
519 516
 #define Z_HOME_BUMP_MM 2
520 517
 #define HOMING_BUMP_DIVISOR { 2, 2, 4 }  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
521
-#define QUICK_HOME                     // If homing includes X and Y, do a diagonal move initially
518
+#define QUICK_HOME                       // If homing includes X and Y, do a diagonal move initially
522 519
 //#define HOMING_BACKOFF_MM { 2, 2, 2 }  // (mm) Move away from the endstops after homing
523 520
 
524 521
 // When G28 is called, this option will make Y home before X
@@ -527,6 +524,73 @@
527 524
 // Enable this if X or Y can't home without homing the other axis first.
528 525
 //#define CODEPENDENT_XY_HOMING
529 526
 
527
+#if ENABLED(BLTOUCH)
528
+  /**
529
+   * Either: Use the defaults (recommended) or: For special purposes, use the following DEFINES
530
+   * Do not activate settings that the probe might not understand. Clones might misunderstand
531
+   * advanced commands.
532
+   *
533
+   * Note: If the probe is not deploying, check a "Cmd: Reset" and "Cmd: Self-Test" and then
534
+   *       check the wiring of the BROWN, RED and ORANGE wires.
535
+   *
536
+   * Note: If the trigger signal of your probe is not being recognized, it has been very often
537
+   *       because the BLACK and WHITE wires needed to be swapped. They are not "interchangeable"
538
+   *       like they would be with a real switch. So please check the wiring first.
539
+   *
540
+   * Settings for all BLTouch and clone probes:
541
+   */
542
+
543
+  // Safety: The probe needs time to recognize the command.
544
+  //         Minimum command delay (ms). Enable and increase if needed.
545
+  //#define BLTOUCH_DELAY 500
546
+
547
+  /**
548
+   * Settings for BLTOUCH Classic 1.2, 1.3 or BLTouch Smart 1.0, 2.0, 2.2, 3.0, 3.1, and most clones:
549
+   */
550
+
551
+  // Feature: Switch into SW mode after a deploy. It makes the output pulse longer. Can be useful
552
+  //          in special cases, like noisy or filtered input configurations.
553
+  //#define BLTOUCH_FORCE_SW_MODE
554
+
555
+  /**
556
+   * Settings for BLTouch Smart 3.0 and 3.1
557
+   * Summary:
558
+   *   - Voltage modes: 5V and OD (open drain - "logic voltage free") output modes
559
+   *   - High-Speed mode
560
+   *   - Disable LCD voltage options
561
+   */
562
+
563
+  /**
564
+   * Danger: Don't activate 5V mode unless attached to a 5V-tolerant controller!
565
+   * V3.0 or 3.1: Set default mode to 5V mode at Marlin startup.
566
+   * If disabled, OD mode is the hard-coded default on 3.0
567
+   * On startup, Marlin will compare its eeprom to this vale. If the selected mode
568
+   * differs, a mode set eeprom write will be completed at initialization.
569
+   * Use the option below to force an eeprom write to a V3.1 probe regardless.
570
+   */
571
+  //#define BLTOUCH_SET_5V_MODE
572
+
573
+  /**
574
+   * Safety: Activate if connecting a probe with an unknown voltage mode.
575
+   * V3.0: Set a probe into mode selected above at Marlin startup. Required for 5V mode on 3.0
576
+   * V3.1: Force a probe with unknown mode into selected mode at Marlin startup ( = Probe EEPROM write )
577
+   * To preserve the life of the probe, use this once then turn it off and re-flash.
578
+   */
579
+  //#define BLTOUCH_FORCE_MODE_SET
580
+
581
+  /**
582
+   * Use "HIGH SPEED" mode for probing.
583
+   * Danger: Disable if your probe sometimes fails. Only suitable for stable well-adjusted systems.
584
+   * This feature was designed for Delta's with very fast Z moves however higher speed cartesians may function
585
+   * If the machine cannot raise the probe fast enough after a trigger, it may enter a fault state.
586
+   */
587
+  //#define BLTOUCH_HS_MODE
588
+
589
+  // Safety: Enable voltage mode settings in the LCD menu.
590
+  //#define BLTOUCH_LCD_VOLTAGE_MENU
591
+
592
+#endif // BLTOUCH
593
+
530 594
 /**
531 595
  * Z Steppers Auto-Alignment
532 596
  * Add the G34 command to align multiple Z steppers using a bed probe.
@@ -577,8 +641,11 @@
577 641
 
578 642
 // @section lcd
579 643
 
644
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
645
+  #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 2*60} // Feedrates for manual moves along X, Y, Z, E from panel
646
+#endif
647
+
580 648
 #if ENABLED(ULTIPANEL)
581
-  #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
582 649
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
583 650
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
584 651
 #endif
@@ -851,7 +918,7 @@
851 918
    */
852 919
   //#define POWER_LOSS_RECOVERY
853 920
   #if ENABLED(POWER_LOSS_RECOVERY)
854
-    //#define POWER_LOSS_PIN         44 // Pin to detect power loss (optional)
921
+    //#define POWER_LOSS_PIN         44 // Pin to detect power loss
855 922
     //#define POWER_LOSS_STATE     HIGH // State of pin indicating power loss
856 923
     //#define POWER_LOSS_PURGE_LEN   20 // (mm) Length of filament to purge on resume
857 924
     //#define POWER_LOSS_RETRACT_LEN 10 // (mm) Length of filament to retract on fail. Requires backup power.
@@ -913,7 +980,7 @@
913 980
    * This feature must be enabled with "M540 S1" or from the LCD menu.
914 981
    * To have any effect, endstops must be enabled during SD printing.
915 982
    */
916
-  //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
983
+  //#define SD_ABORT_ON_ENDSTOP_HIT
917 984
 
918 985
   /**
919 986
    * This option makes it easier to print the same SD Card file again.
@@ -1043,6 +1110,7 @@
1043 1110
   #define STATUS_HOTEND_INVERTED      // Show solid nozzle bitmaps when heating (Requires STATUS_HOTEND_ANIM)
1044 1111
   #define STATUS_HOTEND_ANIM          // Use a second bitmap to indicate hotend heating
1045 1112
   #define STATUS_BED_ANIM             // Use a second bitmap to indicate bed heating
1113
+  #define STATUS_CHAMBER_ANIM         // Use a second bitmap to indicate chamber heating
1046 1114
   //#define STATUS_ALT_BED_BITMAP     // Use the alternative bed bitmap
1047 1115
   //#define STATUS_ALT_FAN_BITMAP     // Use the alternative fan bitmap
1048 1116
   //#define STATUS_FAN_FRAMES 3       // :[0,1,2,3,4] Number of fan animation frames
@@ -1129,7 +1197,7 @@
1129 1197
 #define LIN_ADVANCE
1130 1198
 #if ENABLED(LIN_ADVANCE)
1131 1199
   //#define EXTRA_LIN_ADVANCE_K // Enable for second linear advance constants
1132
-  #define LIN_ADVANCE_K 0.08    // Unit: mm compression per 1mm/s extruder speed
1200
+  #define LIN_ADVANCE_K 0.0    // Unit: mm compression per 1mm/s extruder speed
1133 1201
   //#define LA_DEBUG            // If enabled, this will generate debug information output over USB.
1134 1202
 #endif
1135 1203
 
@@ -1764,6 +1832,12 @@
1764 1832
   #endif
1765 1833
 
1766 1834
   /**
1835
+   * Beta feature!
1836
+   * Create a 50/50 square wave step pulse optimal for stepper drivers.
1837
+   */
1838
+  //#define SQUARE_WAVE_STEPPING
1839
+
1840
+  /**
1767 1841
    * Enable M122 debugging command for TMC stepper drivers.
1768 1842
    * M122 S0/1 will enable continous reporting.
1769 1843
    */

Loading…
Откажи
Сачувај