Browse Source

Bring configs up to date

Scott Lahteine 5 years ago
parent
commit
dd06017f64

+ 2
- 2
Marlin/Configuration_adv.h View File

@@ -917,7 +917,7 @@
917 917
    */
918 918
   //#define POWER_LOSS_RECOVERY
919 919
   #if ENABLED(POWER_LOSS_RECOVERY)
920
-    //#define POWER_LOSS_PIN         44 // Pin to detect power loss (optional)
920
+    //#define POWER_LOSS_PIN         44 // Pin to detect power loss
921 921
     //#define POWER_LOSS_STATE     HIGH // State of pin indicating power loss
922 922
     //#define POWER_LOSS_PURGE_LEN   20 // (mm) Length of filament to purge on resume
923 923
     //#define POWER_LOSS_RETRACT_LEN 10 // (mm) Length of filament to retract on fail. Requires backup power.
@@ -1159,7 +1159,7 @@
1159 1159
   #if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING)
1160 1160
     #define DOUBLECLICK_MAX_INTERVAL 1250   // Maximum interval between clicks, in milliseconds.
1161 1161
                                             // Note: Extra time may be added to mitigate controller latency.
1162
-    #define BABYSTEP_ALWAYS_AVAILABLE     // Allow babystepping at all times (not just during movement).
1162
+    //#define BABYSTEP_ALWAYS_AVAILABLE     // Allow babystepping at all times (not just during movement).
1163 1163
     //#define MOVE_Z_WHEN_IDLE              // Jump to the move Z menu on doubleclick when printer is idle.
1164 1164
     #if ENABLED(MOVE_Z_WHEN_IDLE)
1165 1165
       #define MOVE_Z_IDLE_MULTIPLICATOR 1   // Multiply 1mm by this factor for the move step size.

+ 1
- 2
config/examples/Anet/A6/Configuration.h View File

@@ -989,15 +989,14 @@
989 989
 #if 1 // 0 for less clearance
990 990
   #define Z_CLEARANCE_DEPLOY_PROBE   10 // Z Clearance for Deploy/Stow
991 991
   #define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
992
-#define Z_CLEARANCE_MULTI_PROBE     5 // Z Clearance between multiple probes
993 992
   //#define Z_AFTER_PROBING           5 // Z position after probing is done
994 993
 #else
995 994
   #define Z_CLEARANCE_DEPLOY_PROBE    5 // Z Clearance for Deploy/Stow
996 995
   #define Z_CLEARANCE_BETWEEN_PROBES  3 // Z Clearance between probe points
997
-#define Z_CLEARANCE_MULTI_PROBE     5 // Z Clearance between multiple probes
998 996
   //#define Z_AFTER_PROBING           3 // Z position after probing is done
999 997
 #endif
1000 998
 
999
+#define Z_CLEARANCE_MULTI_PROBE       5 // Z Clearance between multiple probes
1001 1000
 #define Z_PROBE_LOW_POINT          -2 // Farthest distance below the trigger-point to go before stopping
1002 1001
 
1003 1002
 // For M851 give a range for adjusting the Z probe offset

+ 1
- 1
config/examples/BQ/Hephestos_2/Configuration.h View File

@@ -1299,7 +1299,7 @@
1299 1299
 
1300 1300
 // Homing speeds (mm/m)
1301 1301
 #define HOMING_FEEDRATE_XY (50*60)
1302
-#define HOMING_FEEDRATE_Z  ( 4*60)
1302
+#define HOMING_FEEDRATE_Z  (4*60)
1303 1303
 
1304 1304
 // Validate that endstops are triggered on homing moves
1305 1305
 #define VALIDATE_HOMING_ENDSTOPS

+ 1
- 1
config/examples/Dagoma/Disco Ultimate/Configuration_adv.h View File

@@ -917,7 +917,7 @@
917 917
    */
918 918
   //#define POWER_LOSS_RECOVERY
919 919
   #if ENABLED(POWER_LOSS_RECOVERY)
920
-    //#define POWER_LOSS_PIN         44 // Pin to detect power loss (optional)
920
+    //#define POWER_LOSS_PIN         44 // Pin to detect power loss
921 921
     //#define POWER_LOSS_STATE     HIGH // State of pin indicating power loss
922 922
     //#define POWER_LOSS_PURGE_LEN   20 // (mm) Length of filament to purge on resume
923 923
     //#define POWER_LOSS_RETRACT_LEN 10 // (mm) Length of filament to retract on fail. Requires backup power.

+ 14
- 3
config/examples/Einstart-S/Configuration.h View File

@@ -379,13 +379,13 @@
379 379
  *   147 : Pt100 with 4k7 pullup
380 380
  *   110 : Pt100 with 1k pullup (non standard)
381 381
  *
382
+ *  1000 : Custom - Specify parameters in Configuration_adv.h
383
+ *
382 384
  *         Use these for Testing or Development purposes. NEVER for production machine.
383 385
  *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
384 386
  *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
385 387
  *
386
- *   666 : Custom table generated for 200K thermistor with 10k pullup on Einstart S
387
- *
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'", '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" }
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" }
389 389
  */
390 390
 #define TEMP_SENSOR_0 666
391 391
 #define TEMP_SENSOR_1 0
@@ -820,6 +820,7 @@
820 820
  * or (with LCD_BED_LEVELING) the LCD controller.
821 821
  */
822 822
 //#define PROBE_MANUALLY
823
+//#define MANUAL_PROBE_START_Z 0.2
823 824
 
824 825
 /**
825 826
  * A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
@@ -928,6 +929,7 @@
928 929
  */
929 930
 #define Z_CLEARANCE_DEPLOY_PROBE   10 // Z Clearance for Deploy/Stow
930 931
 #define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
932
+#define Z_CLEARANCE_MULTI_PROBE     5 // Z Clearance between multiple probes
931 933
 //#define Z_AFTER_PROBING           5 // Z position after probing is done
932 934
 
933 935
 #define Z_PROBE_LOW_POINT          -2 // Farthest distance below the trigger-point to go before stopping
@@ -1971,6 +1973,15 @@
1971 1973
 //#define SILVER_GATE_GLCD_CONTROLLER
1972 1974
 
1973 1975
 //
1976
+// Extensible UI
1977
+//
1978
+// Enable third-party or vendor customized user interfaces that aren't
1979
+// packaged with Marlin. Source code for the user interface will need to
1980
+// be placed in "src/lcd/extensible_ui/lib"
1981
+//
1982
+//#define EXTENSIBLE_UI
1983
+
1984
+//
1974 1985
 // Einstart S OLED SSD1306
1975 1986
 //
1976 1987
 #define U8GLIB_SH1106_EINSTART

+ 9
- 9
config/examples/Formbot/Raptor/Configuration_adv.h View File

@@ -2255,25 +2255,25 @@
2255 2255
   #define CUSTOM_USER_MENUS
2256 2256
 #endif
2257 2257
 #if ENABLED(CUSTOM_USER_MENUS)
2258
- #define CUSTOM_USER_MENU_TITLE "Commissioning"
2259
- //#define USER_SCRIPT_DONE "M117 User Script Done"
2258
+  #define CUSTOM_USER_MENU_TITLE "Commissioning"
2259
+  //#define USER_SCRIPT_DONE "M117 User Script Done"
2260 2260
   #define USER_SCRIPT_AUDIBLE_FEEDBACK
2261 2261
   #define USER_SCRIPT_RETURN  // Return to status screen after a script
2262 2262
 
2263 2263
   #define USER_DESC_1 "UBL Commission Step 1"
2264
-  #define USER_GCODE_1 "M502 \n M500 \n M501 \n M190 S75 \n G28 \n G29 P1 \n G29 S1 \n M117 Run Step 2 \n"
2264
+  #define USER_GCODE_1 "M502\nM500\nM501\nM190 S75\nG28\nG29 P1\nG29 S1\nM117 Run Step 2"
2265 2265
 
2266 2266
   #define USER_DESC_2 "UBL Commission Step 2"
2267
-  #define USER_GCODE_2 "G29 S1 \n G29 S0 \n G29 F 10.0 \n G29 A \n M500 \n G28 \n G29 L1 \n M109 S225 \n G1 X150 Y 150 \n G1 Z0 \n M117 Set Z Offset \n"
2267
+  #define USER_GCODE_2 "G29 S1\nG29 S0\nG29 F 10.0\nG29 A\nM500\nG28\nG29 L1\nM109 S225\nG1 X150 Y 150\nG1 Z0\nM117 Set Z Offset"
2268 2268
 
2269 2269
   #define USER_DESC_3 "Prep for Z Adjust"
2270
-  #define USER_GCODE_3 "M190 75 \n M104 235 \n G28 \n G29 L1 \n G1 X150 Y 150 \n G1 Z0 \n"
2270
+  #define USER_GCODE_3 "M190 75\nM104 235\nG28\nG29 L1\nG1 X150 Y 150\nG1 Z0"
2271 2271
 
2272
-   #define USER_DESC_4 "Fill Mesh Points"
2273
-  #define USER_GCODE_4 "G29 P3 \n G29 P3 \n G29 P3 \n G29 T \n"
2272
+  #define USER_DESC_4 "Fill Mesh Points"
2273
+  #define USER_GCODE_4 "G29 P3\nG29 P3\nG29 P3\nG29 T"
2274 2274
 
2275
-   #define USER_DESC_5 "Run Mesh Validation"
2276
-  #define USER_GCODE_5 "G26 \n"
2275
+  #define USER_DESC_5 "Run Mesh Validation"
2276
+  #define USER_GCODE_5 "G26"
2277 2277
 #endif
2278 2278
 
2279 2279
 /**

+ 1
- 1
config/examples/Geeetech/A10/Configuration_adv.h View File

@@ -917,7 +917,7 @@
917 917
    */
918 918
   //#define POWER_LOSS_RECOVERY
919 919
   #if ENABLED(POWER_LOSS_RECOVERY)
920
-    //#define POWER_LOSS_PIN         44 // Pin to detect power loss (optional)
920
+    //#define POWER_LOSS_PIN         44 // Pin to detect power loss
921 921
     //#define POWER_LOSS_STATE     HIGH // State of pin indicating power loss
922 922
     //#define POWER_LOSS_PURGE_LEN   20 // (mm) Length of filament to purge on resume
923 923
     //#define POWER_LOSS_RETRACT_LEN 10 // (mm) Length of filament to retract on fail. Requires backup power.

+ 0
- 1
config/examples/Geeetech/A20M/Configuration.h View File

@@ -1694,7 +1694,6 @@
1694 1694
 // ULTIPANEL as seen on Thingiverse.
1695 1695
 //
1696 1696
 #define ULTIPANEL
1697
-#define NEWPANEL
1698 1697
 
1699 1698
 //
1700 1699
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)

+ 15
- 0
config/examples/Geeetech/MeCreator2/Configuration_adv.h View File

@@ -2219,6 +2219,21 @@
2219 2219
 #define FASTER_GCODE_PARSER
2220 2220
 
2221 2221
 /**
2222
+ * CNC G-code options
2223
+ * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
2224
+ * Note that G0 feedrates should be used with care for 3D printing (if used at all).
2225
+ * High feedrates may cause ringing and harm print quality.
2226
+ */
2227
+//#define PAREN_COMMENTS      // Support for parentheses-delimited comments
2228
+//#define GCODE_MOTION_MODES  // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
2229
+
2230
+// Enable and set a (default) feedrate for all G0 moves
2231
+//#define G0_FEEDRATE 3000 // (mm/m)
2232
+#ifdef G0_FEEDRATE
2233
+  //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
2234
+#endif
2235
+
2236
+/**
2222 2237
  * G-code Macros
2223 2238
  *
2224 2239
  * Add G-codes M810-M819 to define and run G-code macros.

+ 1
- 0
config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h View File

@@ -321,6 +321,7 @@
321 321
     #define AUTO_POWER_FANS           // Turn on PSU if fans need power
322 322
     #define AUTO_POWER_E_FANS
323 323
     #define AUTO_POWER_CONTROLLERFAN
324
+    #define AUTO_POWER_CHAMBER_FAN
324 325
     #define POWER_TIMEOUT 30
325 326
   #endif
326 327
 

+ 0
- 1
config/examples/JGAurora/A1/Configuration.h View File

@@ -1982,7 +1982,6 @@
1982 1982
 // MKS Robin 320x240 color display
1983 1983
 // Also used for JGAurora A5S & A1 TFT LCD's (16-bit Parallel LCD via FSMC)
1984 1984
 #define MKS_ROBIN_TFT
1985
-#define PRINTER_EVENT_LEDS
1986 1985
 
1987 1986
 //=============================================================================
1988 1987
 //============================  Other Controllers  ============================

+ 1
- 1
config/examples/JGAurora/A1/Configuration_adv.h View File

@@ -922,7 +922,7 @@
922 922
    */
923 923
   //#define POWER_LOSS_RECOVERY
924 924
   #if ENABLED(POWER_LOSS_RECOVERY)
925
-    //#define POWER_LOSS_PIN         44 // Pin to detect power loss (optional)
925
+    //#define POWER_LOSS_PIN         44 // Pin to detect power loss
926 926
     //#define POWER_LOSS_STATE     HIGH // State of pin indicating power loss
927 927
     //#define POWER_LOSS_PURGE_LEN   20 // (mm) Length of filament to purge on resume
928 928
     //#define POWER_LOSS_RETRACT_LEN 10 // (mm) Length of filament to retract on fail. Requires backup power.

+ 1
- 1
config/examples/JGAurora/A5S/Configuration_adv.h View File

@@ -922,7 +922,7 @@
922 922
    */
923 923
   //#define POWER_LOSS_RECOVERY
924 924
   #if ENABLED(POWER_LOSS_RECOVERY)
925
-    //#define POWER_LOSS_PIN         44 // Pin to detect power loss (optional)
925
+    //#define POWER_LOSS_PIN         44 // Pin to detect power loss
926 926
     //#define POWER_LOSS_STATE     HIGH // State of pin indicating power loss
927 927
     //#define POWER_LOSS_PURGE_LEN   20 // (mm) Length of filament to purge on resume
928 928
     //#define POWER_LOSS_RETRACT_LEN 10 // (mm) Length of filament to retract on fail. Requires backup power.

+ 2
- 0
config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h View File

@@ -1166,6 +1166,8 @@
1166 1166
     #endif
1167 1167
   #endif
1168 1168
 
1169
+  //#define BABYSTEP_DISPLAY_TOTAL          // Display total babysteps since last G28
1170
+
1169 1171
   //#define BABYSTEP_ZPROBE_OFFSET          // Combine M851 Z and Babystepping
1170 1172
   #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
1171 1173
     //#define BABYSTEP_HOTEND_Z_OFFSET      // For multiple hotends, babystep relative Z offsets

+ 2
- 1
config/examples/Tronxy/X5S/Configuration.h View File

@@ -445,7 +445,8 @@
445 445
 #define PID_MAX BANG_MAX // Limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
446 446
 #define PID_K1 0.95      // Smoothing factor within any PID loop
447 447
 #if ENABLED(PIDTEMP)
448
-  #define PID_AUTOTUNE_MENU   // Add PID Autotune to the LCD "Temperature" menu to run M303 and apply the result.
448
+  //#define PID_EDIT_MENU         // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM)
449
+  #define PID_AUTOTUNE_MENU       // Add PID Autotune to the LCD "Temperature" menu to run M303 and apply the result.
449 450
   //#define PID_DEBUG             // Sends debug data to the serial port.
450 451
   //#define PID_OPENLOOP 1        // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
451 452
   //#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

+ 1
- 0
config/examples/delta/Anycubic/Kossel/Configuration.h View File

@@ -1311,6 +1311,7 @@
1311 1311
 //#define AUTO_BED_LEVELING_UBL
1312 1312
 //#define MESH_BED_LEVELING
1313 1313
 #endif
1314
+
1314 1315
 /**
1315 1316
  * Normally G28 leaves leveling disabled on completion. Enable
1316 1317
  * this option to have G28 restore the prior leveling state.

+ 12
- 0
config/examples/delta/Tevo Little Monster/Configuration_adv.h View File

@@ -2237,6 +2237,18 @@
2237 2237
 #endif
2238 2238
 
2239 2239
 /**
2240
+ * G-code Macros
2241
+ *
2242
+ * Add G-codes M810-M819 to define and run G-code macros.
2243
+ * Macros are not saved to EEPROM.
2244
+ */
2245
+//#define GCODE_MACROS
2246
+#if ENABLED(GCODE_MACROS)
2247
+  #define GCODE_MACROS_SLOTS       5  // Up to 10 may be used
2248
+  #define GCODE_MACROS_SLOT_SIZE  50  // Maximum length of a single macro
2249
+#endif
2250
+
2251
+/**
2240 2252
  * User-defined menu items that execute custom GCode
2241 2253
  */
2242 2254
 //#define CUSTOM_USER_MENUS

+ 1
- 0
config/examples/delta/kossel_mini/Configuration_adv.h View File

@@ -754,6 +754,7 @@
754 754
     #define CALIBRATION_PIN_PULLUP
755 755
   #endif
756 756
 #endif
757
+
757 758
 /**
758 759
  * Adaptive Step Smoothing increases the resolution of multi-axis moves, particularly at step frequencies
759 760
  * below 1kHz (for AVR) or 10kHz (for ARM), where aliasing between axes in multi-axis moves causes audible

Loading…
Cancel
Save