|
@@ -680,7 +680,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
|
680
|
680
|
|
681
|
681
|
// The RepRapDiscount Smart Controller (white PCB)
|
682
|
682
|
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
|
683
|
|
-#define REPRAP_DISCOUNT_SMART_CONTROLLER
|
|
683
|
+//#define REPRAP_DISCOUNT_SMART_CONTROLLER
|
684
|
684
|
|
685
|
685
|
// The GADGETS3D G3D LCD/SD Controller (blue PCB)
|
686
|
686
|
// http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
|
|
@@ -791,13 +791,13 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
|
791
|
791
|
// Uncomment below to enable
|
792
|
792
|
//#define FILAMENT_SENSOR
|
793
|
793
|
|
794
|
|
-#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
795
|
|
-#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
|
794
|
+#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
|
795
|
+#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
796
|
796
|
|
797
|
|
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
798
|
|
-#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
799
|
|
-#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
800
|
|
-#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
|
797
|
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
|
798
|
+#define MEASURED_UPPER_LIMIT 3.3 //upper limit factor used for sensor reading validation in mm
|
|
799
|
+#define MEASURED_LOWER_LIMIT 1.9 //lower limit factor for sensor reading validation in mm
|
|
800
|
+#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
801
|
801
|
|
802
|
802
|
//defines used in the code
|
803
|
803
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|