diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 5250e22..b8ba6b4 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -123,7 +123,7 @@ * * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] */ -#define BAUDRATE 250000 +#define BAUDRATE 115200 // Enable the Bluetooth serial interface on AT90USB devices //#define BLUETOOTH @@ -238,7 +238,7 @@ * * :{ 0:'No power switch', 1:'ATX', 2:'X-Box 360' } */ -#define POWER_SUPPLY 1 +//#define POWER_SUPPLY 1 #if POWER_SUPPLY > 0 // Enable this option to leave the PSU off at startup. @@ -380,9 +380,9 @@ // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it // i3 Mega - #define DEFAULT_Kp 22.2 - #define DEFAULT_Ki 3.5 - #define DEFAULT_Kd 154 + #define DEFAULT_Kp 17.5 + #define DEFAULT_Ki 1.06 + #define DEFAULT_Kd 72.39 // Ultimaker //#define DEFAULT_Kp 22.2 @@ -418,7 +418,7 @@ * heater. If your configuration is significantly different than this and you don't understand * the issues involved, don't use bed PID until someone else verifies that your hardware works. */ -//#define PIDTEMPBED +#define PIDTEMPBED //#define BED_LIMIT_SWITCHING @@ -434,11 +434,10 @@ //#define PID_BED_DEBUG // Sends debug data to the serial port. - //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) - //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10) - #define DEFAULT_bedKp 10.00 - #define DEFAULT_bedKi .023 - #define DEFAULT_bedKd 305.4 + //Anycubic i3 Mega 160W Ultrabase + #define DEFAULT_bedKp 198.55 + #define DEFAULT_bedKi 39.09 + #define DEFAULT_bedKd 252.11 //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) //from pidautotune @@ -1083,7 +1082,7 @@ //=========================================================================== #define MESH_INSET 10 // Set Mesh bounds as an inset region of the bed - #define GRID_MAX_POINTS_X 3 // Don't use more than 7 points per axis, implementation limited. + #define GRID_MAX_POINTS_X 5 // Don't use more than 7 points per axis, implementation limited. #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS @@ -1401,7 +1400,7 @@ * * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'cz_utf8':'Czech (UTF8)', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'es_utf8':'Spanish (UTF8)', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'fr_utf8':'French (UTF8)', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'sk_utf8':'Slovak (UTF8)', 'tr':'Turkish', 'uk':'Ukrainian', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Taiwan)', 'test':'TEST' } */ -#define LCD_LANGUAGE en +//#define LCD_LANGUAGE en /** * LCD Character Set @@ -1425,7 +1424,7 @@ * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ -#define DISPLAY_CHARSET_HD44780 JAPANESE +//#define DISPLAY_CHARSET_HD44780 JAPANESE /** * SD CARD @@ -1935,6 +1934,6 @@ // Enable Anycubic TFT #define ANYCUBIC_TFT_MODEL #define ANYCUBIC_FILAMENT_RUNOUT_SENSOR -#define ANYCUBIC_TFT_DEBUG +//#define ANYCUBIC_TFT_DEBUG #endif // CONFIGURATION_H