Skip to content

Commit f318af7

Browse files
authored
Merge pull request #57 from DerAndere1/Marlin2ForPipetBot_dev
fix config
2 parents ba064c9 + d22015b commit f318af7

File tree

6 files changed

+7319
-102
lines changed

6 files changed

+7319
-102
lines changed

Marlin/Configuration.h

+55-33
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
*/
2626
#pragma once
2727

28+
#define CONFIG_EXAMPLES_DIR "Anet/A8"
29+
2830
/**
2931
* Configuration.h
3032
*
@@ -119,7 +121,7 @@
119121
*
120122
* :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000]
121123
*/
122-
#define BAUDRATE 250000
124+
#define BAUDRATE 115200
123125
//#define BAUD_RATE_GCODE // Enable G-code M575 to set the baud rate
124126

125127
/**
@@ -147,7 +149,7 @@
147149
#endif
148150

149151
// Name displayed in the LCD "Ready" message and Info menu
150-
//#define CUSTOM_MACHINE_NAME "3D Printer"
152+
//#define CUSTOM_MACHINE_NAME "PipetBot-A8"
151153

152154
// Printer's unique ID, used by some programs to differentiate between machines.
153155
// Choose your own or use a service like https://www.uuidgenerator.net/version4
@@ -491,7 +493,7 @@
491493
* 999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
492494
*
493495
*/
494-
#define TEMP_SENSOR_0 1
496+
#define TEMP_SENSOR_0 999
495497
#define TEMP_SENSOR_1 0
496498
#define TEMP_SENSOR_2 0
497499
#define TEMP_SENSOR_3 0
@@ -516,11 +518,11 @@
516518
//#define MAX31865_SENSOR_OHMS_1 100
517519
//#define MAX31865_CALIBRATION_OHMS_1 430
518520

519-
#define TEMP_RESIDENCY_TIME 10 // (seconds) Time to wait for hotend to "settle" in M109
521+
#define TEMP_RESIDENCY_TIME 6 // (seconds) Time to wait for hotend to "settle" in M109
520522
#define TEMP_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer
521523
#define TEMP_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target
522524

523-
#define TEMP_BED_RESIDENCY_TIME 10 // (seconds) Time to wait for bed to "settle" in M190
525+
#define TEMP_BED_RESIDENCY_TIME 6 // (seconds) Time to wait for bed to "settle" in M190
524526
#define TEMP_BED_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer
525527
#define TEMP_BED_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target
526528

@@ -598,16 +600,18 @@
598600
//#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
599601
// Set/get with gcode: M301 E[extruder number, 0-2]
600602

603+
// ANET A8 Standard Extruder at 210 Degree Celsius and 100% Fan
604+
// (measured after M106 S255 with M303 E0 S210 C8)
601605
#if ENABLED(PID_PARAMS_PER_HOTEND)
602606
// Specify between 1 and HOTENDS values per array.
603607
// If fewer than EXTRUDER values are provided, the last element will be repeated.
604-
#define DEFAULT_Kp_LIST { 22.20, 22.20 }
605-
#define DEFAULT_Ki_LIST { 1.08, 1.08 }
606-
#define DEFAULT_Kd_LIST { 114.00, 114.00 }
608+
#define DEFAULT_Kp_LIST { 21.00, 20.00 }
609+
#define DEFAULT_Ki_LIST { 1.25, 1.25 }
610+
#define DEFAULT_Kd_LIST { 86.00, 86.00 }
607611
#else
608612
#define DEFAULT_Kp 21.00
609613
#define DEFAULT_Ki 1.25
610-
#define DEFAULT_Kd 86.0
614+
#define DEFAULT_Kd 86.00
611615
#endif
612616
#endif // PIDTEMP
613617

@@ -644,11 +648,11 @@
644648
//#define MIN_BED_POWER 0
645649
//#define PID_BED_DEBUG // Sends debug data to the serial port.
646650

647-
// 120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
648-
// from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
649-
#define DEFAULT_bedKp 10.00
650-
#define DEFAULT_bedKi .023
651-
#define DEFAULT_bedKd 305.4
651+
// ANET A8
652+
// original Bed + 0.3mm Heat conducting into 4mm borosilicate (PID-Autotune: M303 E-1 S60 C5):
653+
#define DEFAULT_bedKp 295.00
654+
#define DEFAULT_bedKi 35.65
655+
#define DEFAULT_bedKd 610.21
652656

653657
// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
654658
#endif // PIDTEMPBED
@@ -701,7 +705,7 @@
701705
//#define PID_DEBUG // Sends debug data to the serial port. Use 'M303 D' to toggle activation.
702706
//#define PID_OPENLOOP // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
703707
//#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
704-
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
708+
#define PID_FUNCTIONAL_RANGE 15 // If the temperature difference between the target temperature and the actual temperature
705709
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
706710
#endif
707711

@@ -714,8 +718,8 @@
714718
*
715719
* *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! ***
716720
*/
717-
#define PREVENT_COLD_EXTRUSION
718-
#define EXTRUDE_MINTEMP 170
721+
//#define PREVENT_COLD_EXTRUSION
722+
#define EXTRUDE_MINTEMP 5
719723

720724
/**
721725
* Prevent a single extrusion longer than EXTRUDE_MAXLENGTH.
@@ -762,6 +766,9 @@
762766
//#define COREZY
763767
//#define MARKFORGED_XY // MarkForged. See https://reprap.org/forum/read.php?152,504042
764768

769+
// Enable for a belt style printer with endless "Z" motion
770+
//#define BELTPRINTER
771+
765772
//===========================================================================
766773
//============================== Endstop Settings ===========================
767774
//===========================================================================
@@ -823,10 +830,10 @@
823830
#endif
824831

825832
// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
826-
#define X_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
827-
#define Y_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
828-
#define Z_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
829-
#define I_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
833+
#define X_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
834+
#define Y_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
835+
#define Z_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
836+
#define I_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
830837
#define J_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
831838
#define K_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
832839
#define X_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
@@ -921,14 +928,14 @@
921928
* Override with M92
922929
* X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]]
923930
*/
924-
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 400 }
931+
#define DEFAULT_AXIS_STEPS_PER_UNIT { 100, 100, 400, 400 }
925932

926933
/**
927934
* Default Max Feed Rate (mm/s)
928935
* Override with M203
929936
* X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]]
930937
*/
931-
#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 5 }
938+
#define DEFAULT_MAX_FEEDRATE { 400, 400, 8, 8 }
932939

933940
//#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
934941
#if ENABLED(LIMITED_MAX_FR_EDITING)
@@ -956,7 +963,7 @@
956963
* M204 R Retract Acceleration
957964
* M204 T Travel Acceleration
958965
*/
959-
#define DEFAULT_ACCELERATION 400 // X, Y, Z and E acceleration for printing moves
966+
#define DEFAULT_ACCELERATION 400 // X, Y, Z and E acceleration for printing moves
960967
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
961968
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
962969

@@ -995,7 +1002,7 @@
9951002
* https://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
9961003
*/
9971004
#if DISABLED(CLASSIC_JERK)
998-
#define JUNCTION_DEVIATION_MM 0.013 // (mm) Distance from real junction edge
1005+
#define JUNCTION_DEVIATION_MM 0.10 // (mm) Distance from real junction edge
9991006
#define JD_HANDLE_SMALL_SEGMENTS // Use curvature estimation instead of just the junction angle
10001007
// for small segments (< 1mm) with large junction angles (> 135°).
10011008
#endif
@@ -1180,7 +1187,7 @@
11801187
#define PROBING_MARGIN 10
11811188

11821189
// X and Y axis travel speed (mm/min) between probes
1183-
#define XY_PROBE_FEEDRATE (133*60)
1190+
#define XY_PROBE_FEEDRATE (100*60)
11841191

11851192
// Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
11861193
#define Z_PROBE_FEEDRATE_FAST (4*60)
@@ -1739,7 +1746,7 @@
17391746
#endif
17401747

17411748
// Homing speeds (mm/min)
1742-
#define HOMING_FEEDRATE_MM_M { (50*60), (50*60), (4*60), (4*60) }
1749+
#define HOMING_FEEDRATE_MM_M { (100*60), (100*60), (4*60), (4*60) }
17431750

17441751
// Validate that endstops are triggered on homing moves
17451752
#define VALIDATE_HOMING_ENDSTOPS
@@ -1816,9 +1823,9 @@
18161823
* M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes)
18171824
* M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.)
18181825
*/
1819-
#define EEPROM_SETTINGS // Persistent storage with M500 and M501
1826+
#define EEPROM_SETTINGS // Persistent storage with M500 and M501
18201827
//#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release!
1821-
#define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM.
1828+
//#define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM.
18221829
#define EEPROM_BOOT_SILENT // Keep M503 quiet and only give errors during first load
18231830
#if ENABLED(EEPROM_SETTINGS)
18241831
//#define EEPROM_AUTO_INIT // Init EEPROM automatically on any errors.
@@ -1832,7 +1839,7 @@
18321839
//
18331840
#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages
18341841
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
1835-
#define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating
1842+
//#define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating
18361843

18371844
//
18381845
// G20/G21 Inch mode support
@@ -1851,12 +1858,13 @@
18511858
//
18521859
#define PREHEAT_1_LABEL "PLA"
18531860
#define PREHEAT_1_TEMP_HOTEND 110
1854-
#define PREHEAT_1_TEMP_BED 70
1861+
#define PREHEAT_1_TEMP_BED 60
1862+
#define PREHEAT_1_TEMP_CHAMBER 35
18551863
#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255
18561864

18571865
#define PREHEAT_2_LABEL "ABS"
18581866
#define PREHEAT_2_TEMP_HOTEND 110
1859-
#define PREHEAT_2_TEMP_BED 110
1867+
#define PREHEAT_2_TEMP_BED 90
18601868
#define PREHEAT_2_TEMP_CHAMBER 35
18611869
#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
18621870

@@ -2347,6 +2355,8 @@
23472355
// RepRapDiscount FULL GRAPHIC Smart Controller
23482356
// https://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
23492357
//
2358+
// Note: Details on connecting to the Anet V1.0 controller are in the file pins_ANET_10.h
2359+
//
23502360
//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
23512361

23522362
//
@@ -2572,6 +2582,11 @@
25722582
#define USE_MKS_GREEN_UI
25732583
#endif
25742584

2585+
//
2586+
// CR-6 OEM touch screen. A DWIN display with touch.
2587+
//
2588+
//#define DWIN_CREALITY_TOUCHLCD
2589+
25752590
//
25762591
// Touch-screen LCD for Malyan M200/M300 printers
25772592
//
@@ -2604,6 +2619,12 @@
26042619
#define LCD_SERIAL_PORT 1 // Default is 1 for Nextion
26052620
#endif
26062621

2622+
//
2623+
// PanelDue touch controller by Escher3D
2624+
// http://escher3d.com/pages/order/products/product2.php
2625+
//
2626+
//#define PANELDUE
2627+
26072628
//
26082629
// Third-party or vendor-customized controller interfaces.
26092630
// Sources should be installed in 'src/lcd/extui'.
@@ -2710,6 +2731,7 @@
27102731
//#define TFT_RES_320x240
27112732
//#define TFT_RES_480x272
27122733
//#define TFT_RES_480x320
2734+
//#define TFT_RES_1024x600
27132735
#endif
27142736

27152737
/**
@@ -2870,7 +2892,7 @@
28702892
//#define NEOPIXEL_LED
28712893
#if ENABLED(NEOPIXEL_LED)
28722894
#define NEOPIXEL_TYPE NEO_GRBW // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
2873-
#define NEOPIXEL_PIN 4 // LED driving pin
2895+
//#define NEOPIXEL_PIN 4 // LED driving pin
28742896
//#define NEOPIXEL2_TYPE NEOPIXEL_TYPE
28752897
//#define NEOPIXEL2_PIN 5
28762898
#define NEOPIXEL_PIXELS 30 // Number of LEDs in the strip. (Longest strip when NEOPIXEL2_SEPARATE is disabled.)

0 commit comments

Comments
 (0)