From 3ff214c4bfa7bbf09c7918616ff2ad1a8bddaab4 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Sat, 26 Sep 2020 07:43:30 +0300 Subject: [PATCH 01/24] Revert "Revert "Update Configuration_adv.h"" This reverts commit c0704a1c9754cdc4e9f4e0cba2520732a7a465a3. --- Marlin/Configuration_adv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index b27932bb8e..a6f65368cf 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -487,7 +487,7 @@ #define CASE_LIGHT_DEFAULT_BRIGHTNESS 255 // Set default power-up brightness (0-255, requires PWM pin) #define CASE_LIGHT_MAX_PWM 255 // Limit pwm #define CASE_LIGHT_MENU // Add Case Light options to the LCD menu - //#define CASE_LIGHT_NO_BRIGHTNESS // Disable brightness control. Enable for non-PWM lighting. + #define CASE_LIGHT_NO_BRIGHTNESS // Disable brightness control. Enable for non-PWM lighting. //#define CASE_LIGHT_USE_NEOPIXEL // Use Neopixel LED as case light, requires NEOPIXEL_LED. #if ENABLED(CASE_LIGHT_USE_NEOPIXEL) #define CASE_LIGHT_NEOPIXEL_COLOR { 255, 255, 255, 255 } // { Red, Green, Blue, White } From c6189c155b537c880b36a6093f1233793406bb28 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Sat, 26 Sep 2020 07:43:53 +0300 Subject: [PATCH 02/24] Revert "Revert "Nano2_Config"" This reverts commit bd2cea18a2a15d5988aee7c837dfb7bd79c03ee8. --- Marlin/Configuration.h | 57 +++++++++++++++++++------------------- Marlin/Configuration_adv.h | 2 +- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index ff07c4eed0..103131b15a 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -123,13 +123,14 @@ * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] */ #define BAUDRATE 115200 +//#define BAUDRATE 250000 // Enable the Bluetooth serial interface on AT90USB devices //#define BLUETOOTH // Choose the name from boards.h that matches your setup #ifndef MOTHERBOARD - #define MOTHERBOARD BOARD_MKS_ROBIN_NANO + #define MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2 #endif // Name displayed in the LCD "Ready" message and Info menu @@ -678,7 +679,7 @@ #define X_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. #define Y_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. #define Z_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. -#define Z_MIN_PROBE_ENDSTOP_INVERTING true // Set to true to invert the logic of the probe. +#define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe. /** * Stepper Drivers @@ -696,15 +697,15 @@ * TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] */ -#define X_DRIVER_TYPE A4988 -#define Y_DRIVER_TYPE A4988 -#define Z_DRIVER_TYPE A4988 +#define X_DRIVER_TYPE TMC2209 +#define Y_DRIVER_TYPE TMC2208_STANDALONE +#define Z_DRIVER_TYPE TMC2208_STANDALONE //#define X2_DRIVER_TYPE A4988 //#define Y2_DRIVER_TYPE A4988 //#define Z2_DRIVER_TYPE A4988 //#define Z3_DRIVER_TYPE A4988 //#define Z4_DRIVER_TYPE A4988 -#define E0_DRIVER_TYPE A4988 +#define E0_DRIVER_TYPE TMC2209 //#define E1_DRIVER_TYPE A4988 //#define E2_DRIVER_TYPE A4988 //#define E3_DRIVER_TYPE A4988 @@ -759,7 +760,7 @@ * Override with M92 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 421 } +#define DEFAULT_AXIS_STEPS_PER_UNIT { 80.5, 80.5, 400, 415 } /** * Default Max Feed Rate (mm/s) @@ -779,7 +780,7 @@ * Override with M201 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_MAX_ACCELERATION { 1000, 1000, 100, 800 } +#define DEFAULT_MAX_ACCELERATION { 1500, 1500, 100, 800 } #define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2 #if ENABLED(LIMITED_MAX_ACCEL_EDITING) @@ -795,7 +796,7 @@ * M204 T Travel Acceleration */ // @efim-a-efim - decreased E0 acceleration to make it less noisy (yes, even with TMC2208 drivers) -#define DEFAULT_ACCELERATION 1000 // X, Y, Z and E acceleration for printing moves +#define DEFAULT_ACCELERATION 1150 // X, Y, Z and E acceleration for printing moves #define DEFAULT_RETRACT_ACCELERATION 800 // E acceleration for retracts #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves @@ -809,15 +810,15 @@ */ #define CLASSIC_JERK #if ENABLED(CLASSIC_JERK) - #define DEFAULT_XJERK 10.0 - #define DEFAULT_YJERK 10.0 + #define DEFAULT_XJERK 20.0 + #define DEFAULT_YJERK 20.0 #define DEFAULT_ZJERK 0.5 //#define TRAVEL_EXTRA_XYJERK 0.0 // Additional jerk allowance for all travel moves #define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2 #if ENABLED(LIMITED_JERK_EDITING) - #define MAX_JERK_EDIT_VALUES { 20, 20, 2, 20 } // ...or, set your own edit limits + #define MAX_JERK_EDIT_VALUES { 30, 30, 2, 20 } // ...or, set your own edit limits #endif #endif @@ -860,7 +861,7 @@ * The probe replaces the Z-MIN endstop and is used for Z homing. * (Automatically enables USE_PROBE_FOR_Z_HOMING.) */ -//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN // Force the use of the probe for Z-axis homing //#define USE_PROBE_FOR_Z_HOMING @@ -881,7 +882,7 @@ * - normally-open switches to 5V and D32. * */ -#define Z_MIN_PROBE_PIN BL_TOUCH_Z_PIN // Pin 32 is the RAMPS default +//#define Z_MIN_PROBE_PIN BL_TOUCH_Z_PIN // Pin 32 is the RAMPS default /** * Probe Type @@ -1010,10 +1011,10 @@ // Most probes should stay away from the edges of the bed, but // with NOZZLE_AS_PROBE this can be negative for a wider probing area. -#define PROBING_MARGIN 30 +#define PROBING_MARGIN 5 // X and Y axis travel speed (mm/min) between probes -#define XY_PROBE_SPEED (1000) +#define XY_PROBE_SPEED 3000 // Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2) #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z @@ -1030,7 +1031,7 @@ * A total of 2 does fast/slow probes with a weighted average. * A total of 3 or more adds more slow probes, taking the average. */ -#define MULTIPLE_PROBING 5 +#define MULTIPLE_PROBING 2 //#define EXTRA_PROBING 1 /** @@ -1049,7 +1050,7 @@ */ #define Z_CLEARANCE_DEPLOY_PROBE 5 // Z Clearance for Deploy/Stow #define Z_CLEARANCE_BETWEEN_PROBES 3 // Z Clearance between probe points -#define Z_CLEARANCE_MULTI_PROBE 1 // Z Clearance between multiple probes +#define Z_CLEARANCE_MULTI_PROBE 3 // Z Clearance between multiple probes #define Z_AFTER_PROBING 5 // Z position after probing is done #define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping @@ -1157,7 +1158,7 @@ #define Z_HOMING_HEIGHT 2 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ... // Be sure to have this much clearance over your Z_MAX_POS to prevent grinding. -#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing Z +//#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing Z // Direction of endstops when homing; 1=MAX, -1=MIN // :[-1,1] @@ -1168,7 +1169,7 @@ // @section machine // The size of the print bed -#define X_BED_SIZE 255 +#define X_BED_SIZE 250 #define Y_BED_SIZE 210 // Travel limits (mm) after homing, corresponding to endstop positions. @@ -1434,8 +1435,8 @@ #define Z_SAFE_HOMING #if ENABLED(Z_SAFE_HOMING) - #define Z_SAFE_HOMING_X_POINT (0) // X point for Z homing when homing all axes (G28). - #define Z_SAFE_HOMING_Y_POINT (0) // Y point for Z homing when homing all axes (G28). + #define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axes (G28). + #define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2) // Y point for Z homing when homing all axes (G28). #endif // Homing speeds (mm/m) @@ -1580,9 +1581,9 @@ EEPROM_W25Q // @section temperature // Preheat Constants -#define PREHEAT_1_LABEL "ABS" -#define PREHEAT_1_TEMP_HOTEND 250 -#define PREHEAT_1_TEMP_BED 100 +#define PREHEAT_1_LABEL "PLA" +#define PREHEAT_1_TEMP_HOTEND 190 +#define PREHEAT_1_TEMP_BED 50 #define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255 #define PREHEAT_2_LABEL "PETG" @@ -1715,7 +1716,7 @@ EEPROM_W25Q * * View the current statistics with M78. */ -//#define PRINTCOUNTER +#define PRINTCOUNTER /** * Password @@ -2279,8 +2280,8 @@ EEPROM_W25Q // //#define TFT_320x240 //#define TFT_320x240_SPI -#define TFT_480x320 -//#define TFT_480x320_SPI +//#define TFT_480x320 +#define TFT_480x320_SPI // // Skip autodetect and force specific TFT driver diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index a6f65368cf..c4219b2015 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -479,7 +479,7 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE +#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN LED_CASE_PIN // Override the default pin if needed #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW From c4f9f67605aae02f6f08c9961c19d5918ff3ba3f Mon Sep 17 00:00:00 2001 From: X-Dron Date: Sat, 26 Sep 2020 07:44:21 +0300 Subject: [PATCH 03/24] Revert "Revert "USB_BAUDRATE 230400"" This reverts commit 676c8733c4b773766d283cca9a19332fedf236c3. --- Marlin/Configuration.h | 4 ++-- Marlin/src/MarlinCore.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 103131b15a..6d714798e3 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -123,7 +123,7 @@ * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] */ #define BAUDRATE 115200 -//#define BAUDRATE 250000 +#define USB_BAUDRATE 230400 // Enable the Bluetooth serial interface on AT90USB devices //#define BLUETOOTH @@ -428,7 +428,7 @@ #define TEMP_SENSOR_7 0 #define TEMP_SENSOR_BED 1 #define TEMP_SENSOR_PROBE 0 -#define TEMP_SENSOR_CHAMBER 0 +#define TEMP_SENSOR_CHAMBER 1 // Dummy thermistor constant temperature readings, for use with 998 and 999 #define DUMMY_THERMISTOR_998_VALUE 25 diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index 29f2783b28..cd87a3b33f 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -909,7 +909,7 @@ void setup() { #endif #if NUM_SERIAL > 0 - MYSERIAL0.begin(BAUDRATE); + MYSERIAL0.begin(USB_BAUDRATE); uint32_t serial_connect_timeout = millis() + 1000UL; while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } #if HAS_MULTI_SERIAL From 58afb98ef16c9a88af686bd3bdacb87e32e525a9 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Sun, 27 Sep 2020 07:38:05 +0300 Subject: [PATCH 04/24] Update Configuration.h --- Marlin/Configuration.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 6d714798e3..0af5674df9 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -798,7 +798,7 @@ // @efim-a-efim - decreased E0 acceleration to make it less noisy (yes, even with TMC2208 drivers) #define DEFAULT_ACCELERATION 1150 // X, Y, Z and E acceleration for printing moves #define DEFAULT_RETRACT_ACCELERATION 800 // E acceleration for retracts -#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves +#define DEFAULT_TRAVEL_ACCELERATION 1200 // X, Y, Z acceleration for travel (non printing) moves /** * Default Jerk limits (mm/s) @@ -810,8 +810,8 @@ */ #define CLASSIC_JERK #if ENABLED(CLASSIC_JERK) - #define DEFAULT_XJERK 20.0 - #define DEFAULT_YJERK 20.0 + #define DEFAULT_XJERK 17.0 + #define DEFAULT_YJERK 17.0 #define DEFAULT_ZJERK 0.5 //#define TRAVEL_EXTRA_XYJERK 0.0 // Additional jerk allowance for all travel moves @@ -1170,7 +1170,7 @@ // The size of the print bed #define X_BED_SIZE 250 -#define Y_BED_SIZE 210 +#define Y_BED_SIZE 207 // Travel limits (mm) after homing, corresponding to endstop positions. #define X_MIN_POS 0 From 4a1c69960f78bc889cc9d1e7ebc5df1102c65a98 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Tue, 29 Sep 2020 22:55:20 +0300 Subject: [PATCH 05/24] Update Config --- Marlin/Configuration.h | 69 ++++++++++--------- Marlin/src/MarlinCore.cpp | 20 +++--- .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 1 - 3 files changed, 46 insertions(+), 44 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 23f142ebac..b3432590eb 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -121,13 +121,14 @@ * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] */ #define BAUDRATE 115200 +#define USB_BAUDRATE 230400 // Enable the Bluetooth serial interface on AT90USB devices //#define BLUETOOTH // Choose the name from boards.h that matches your setup #ifndef MOTHERBOARD - #define MOTHERBOARD BOARD_MKS_ROBIN_NANO + #define MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2 #endif // Name displayed in the LCD "Ready" message and Info menu @@ -426,7 +427,7 @@ #define TEMP_SENSOR_7 0 #define TEMP_SENSOR_BED 1 #define TEMP_SENSOR_PROBE 0 -#define TEMP_SENSOR_CHAMBER 0 +#define TEMP_SENSOR_CHAMBER 1 // Dummy thermistor constant temperature readings, for use with 998 and 999 #define DUMMY_THERMISTOR_998_VALUE 25 @@ -661,7 +662,7 @@ #define X_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. #define Y_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. #define Z_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. -#define Z_MIN_PROBE_ENDSTOP_INVERTING true // Set to true to invert the logic of the probe. +#define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe. /** * Stepper Drivers @@ -679,15 +680,15 @@ * TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] */ -#define X_DRIVER_TYPE A4988 -#define Y_DRIVER_TYPE A4988 -#define Z_DRIVER_TYPE A4988 +#define X_DRIVER_TYPE TMC2209 +#define Y_DRIVER_TYPE TMC2208_STANDALONE +#define Z_DRIVER_TYPE TMC2208_STANDALONE //#define X2_DRIVER_TYPE A4988 //#define Y2_DRIVER_TYPE A4988 //#define Z2_DRIVER_TYPE A4988 //#define Z3_DRIVER_TYPE A4988 //#define Z4_DRIVER_TYPE A4988 -#define E0_DRIVER_TYPE A4988 +#define E0_DRIVER_TYPE TMC2209 //#define E1_DRIVER_TYPE A4988 //#define E2_DRIVER_TYPE A4988 //#define E3_DRIVER_TYPE A4988 @@ -742,7 +743,7 @@ * Override with M92 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 421 } +#define DEFAULT_AXIS_STEPS_PER_UNIT { 80.5, 80.5, 400, 415 } /** * Default Max Feed Rate (mm/s) @@ -762,7 +763,7 @@ * Override with M201 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_MAX_ACCELERATION { 1000, 1000, 100, 800 } +#define DEFAULT_MAX_ACCELERATION { 1500, 1500, 100, 800 } #define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2 #if ENABLED(LIMITED_MAX_ACCEL_EDITING) @@ -778,9 +779,9 @@ * M204 T Travel Acceleration */ // @efim-a-efim - decreased E0 acceleration to make it less noisy (yes, even with TMC2208 drivers) -#define DEFAULT_ACCELERATION 1000 // X, Y, Z and E acceleration for printing moves +#define DEFAULT_ACCELERATION 1150 // X, Y, Z and E acceleration for printing moves #define DEFAULT_RETRACT_ACCELERATION 800 // E acceleration for retracts -#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves +#define DEFAULT_TRAVEL_ACCELERATION 1200 // X, Y, Z acceleration for travel (non printing) moves /** * Default Jerk limits (mm/s) @@ -792,15 +793,15 @@ */ #define CLASSIC_JERK #if ENABLED(CLASSIC_JERK) - #define DEFAULT_XJERK 10.0 - #define DEFAULT_YJERK 10.0 + #define DEFAULT_XJERK 17.0 + #define DEFAULT_YJERK 17.0 #define DEFAULT_ZJERK 0.5 //#define TRAVEL_EXTRA_XYJERK 0.0 // Additional jerk allowance for all travel moves #define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2 #if ENABLED(LIMITED_JERK_EDITING) - #define MAX_JERK_EDIT_VALUES { 20, 20, 2, 20 } // ...or, set your own edit limits + #define MAX_JERK_EDIT_VALUES { 30, 30, 2, 20 } // ...or, set your own edit limits #endif #endif @@ -843,7 +844,7 @@ * The probe replaces the Z-MIN endstop and is used for Z homing. * (Automatically enables USE_PROBE_FOR_Z_HOMING.) */ -//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN // Force the use of the probe for Z-axis homing //#define USE_PROBE_FOR_Z_HOMING @@ -863,7 +864,7 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. */ -#define Z_MIN_PROBE_PIN BL_TOUCH_Z_PIN // Pin 32 is the RAMPS default +//#define Z_MIN_PROBE_PIN BL_TOUCH_Z_PIN // Pin 32 is the RAMPS default /** * Probe Type @@ -992,10 +993,10 @@ // Most probes should stay away from the edges of the bed, but // with NOZZLE_AS_PROBE this can be negative for a wider probing area. -#define PROBING_MARGIN 30 +#define PROBING_MARGIN 5 // X and Y axis travel speed (mm/min) between probes -#define XY_PROBE_SPEED (1000) +#define XY_PROBE_SPEED 3000 // Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2) #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z @@ -1012,7 +1013,7 @@ * A total of 2 does fast/slow probes with a weighted average. * A total of 3 or more adds more slow probes, taking the average. */ -#define MULTIPLE_PROBING 5 +#define MULTIPLE_PROBING 2 //#define EXTRA_PROBING 1 /** @@ -1031,7 +1032,7 @@ */ #define Z_CLEARANCE_DEPLOY_PROBE 5 // Z Clearance for Deploy/Stow #define Z_CLEARANCE_BETWEEN_PROBES 3 // Z Clearance between probe points -#define Z_CLEARANCE_MULTI_PROBE 1 // Z Clearance between multiple probes +#define Z_CLEARANCE_MULTI_PROBE 3 // Z Clearance between multiple probes #define Z_AFTER_PROBING 5 // Z position after probing is done #define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping @@ -1139,7 +1140,7 @@ #define Z_HOMING_HEIGHT 2 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ... // Be sure to have this much clearance over your Z_MAX_POS to prevent grinding. -#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing Z +//#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing Z // Direction of endstops when homing; 1=MAX, -1=MIN // :[-1,1] @@ -1150,8 +1151,8 @@ // @section machine // The size of the print bed -#define X_BED_SIZE 255 -#define Y_BED_SIZE 210 +#define X_BED_SIZE 250 +#define Y_BED_SIZE 207 // Travel limits (mm) after homing, corresponding to endstop positions. #define X_MIN_POS 0 @@ -1416,8 +1417,8 @@ #define Z_SAFE_HOMING #if ENABLED(Z_SAFE_HOMING) - #define Z_SAFE_HOMING_X_POINT (0) // X point for Z homing when homing all axes (G28). - #define Z_SAFE_HOMING_Y_POINT (0) // Y point for Z homing when homing all axes (G28). + #define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axes (G28). + #define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2) // Y point for Z homing when homing all axes (G28). #endif // Homing speeds (mm/m) @@ -1562,14 +1563,14 @@ EEPROM_W25Q // @section temperature // Preheat Constants -#define PREHEAT_1_LABEL "PETG" -#define PREHEAT_1_TEMP_HOTEND 235 -#define PREHEAT_1_TEMP_BED 80 +#define PREHEAT_1_LABEL "PLA" +#define PREHEAT_1_TEMP_HOTEND 190 +#define PREHEAT_1_TEMP_BED 50 #define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255 -#define PREHEAT_2_LABEL "ABS" -#define PREHEAT_2_TEMP_HOTEND 250 -#define PREHEAT_2_TEMP_BED 100 +#define PREHEAT_2_LABEL "PETG" +#define PREHEAT_2_TEMP_HOTEND 235 +#define PREHEAT_2_TEMP_BED 80 #define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255 /** @@ -1696,7 +1697,7 @@ EEPROM_W25Q * * View the current statistics with M78. */ -//#define PRINTCOUNTER +#define PRINTCOUNTER /** * Password @@ -2270,8 +2271,8 @@ EEPROM_W25Q // //#define TFT_320x240 //#define TFT_320x240_SPI -#define TFT_480x320 -//#define TFT_480x320_SPI +//#define TFT_480x320 +#define TFT_480x320_SPI // // Skip autodetect and force specific TFT driver diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index 49a38aef2c..e91b3f091c 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -965,15 +965,17 @@ void setup() { #endif #endif - MYSERIAL0.begin(BAUDRATE); - uint32_t serial_connect_timeout = millis() + 1000UL; - while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } - #if HAS_MULTI_SERIAL - MYSERIAL1.begin(BAUDRATE); - serial_connect_timeout = millis() + 1000UL; - while (!MYSERIAL1 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } - #endif - SERIAL_ECHO_MSG("start"); + #if NUM_SERIAL > 0 + MYSERIAL0.begin(USB_BAUDRATE); + uint32_t serial_connect_timeout = millis() + 1000UL; + while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } + #if HAS_MULTI_SERIAL + MYSERIAL1.begin(BAUDRATE); + serial_connect_timeout = millis() + 1000UL; + while (!MYSERIAL1 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } + #endif + SERIAL_ECHO_MSG("start"); +#endif #if BOTH(HAS_TFT_LVGL_UI, USE_WIFI_FUNCTION) mks_esp_wifi_init(); diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h index 65abb7a998..3fa07f1a5d 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h @@ -188,7 +188,6 @@ https://easyeda.com/sst78rust/fb4s-led-control // Heaters / Fans // #define HEATER_0_PIN PC3 // HEATER1 -#define HEATER_1_PIN PB0 // HEATER2 #define HEATER_BED_PIN PA0 // HOT BED #if HOTENDS == 1 From b3bc33a1ce2df4d185d4ce21684ecd6bb9044340 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Thu, 8 Oct 2020 09:15:38 +0300 Subject: [PATCH 06/24] TMC2208 UART --- Marlin/Configuration.h | 4 ++-- Marlin/Configuration_adv.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index b3432590eb..0e0d007a6b 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -681,8 +681,8 @@ * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] */ #define X_DRIVER_TYPE TMC2209 -#define Y_DRIVER_TYPE TMC2208_STANDALONE -#define Z_DRIVER_TYPE TMC2208_STANDALONE +#define Y_DRIVER_TYPE TMC2208 +#define Z_DRIVER_TYPE TMC2208 //#define X2_DRIVER_TYPE A4988 //#define Y2_DRIVER_TYPE A4988 //#define Z2_DRIVER_TYPE A4988 diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index e55f0de744..e28a770095 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -769,7 +769,7 @@ // // Add the G35 command to read bed corners to help adjust screws. Requires a bed probe. // -#define ASSISTED_TRAMMING +//#define ASSISTED_TRAMMING #if ENABLED(ASSISTED_TRAMMING) // Define positions for probing points, use the hotend as reference not the sensor. #define TRAMMING_POINT_XY { { 20, 20 }, { 200, 20 }, { 200, 200 }, { 20, 200 } } From f1c265a0c2a374bb9c852c490577b881ab9969b3 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Fri, 9 Oct 2020 20:17:23 +0300 Subject: [PATCH 07/24] 32 micro --- Marlin/Configuration.h | 20 ++++++++++---------- Marlin/Configuration_adv.h | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 0e0d007a6b..165e21cc5f 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -743,7 +743,7 @@ * Override with M92 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_AXIS_STEPS_PER_UNIT { 80.5, 80.5, 400, 415 } +#define DEFAULT_AXIS_STEPS_PER_UNIT { 161.0, 161.0, 800, 830 } /** * Default Max Feed Rate (mm/s) @@ -763,7 +763,7 @@ * Override with M201 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_MAX_ACCELERATION { 1500, 1500, 100, 800 } +#define DEFAULT_MAX_ACCELERATION { 1300, 1300, 100, 800 } #define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2 #if ENABLED(LIMITED_MAX_ACCEL_EDITING) @@ -779,7 +779,7 @@ * M204 T Travel Acceleration */ // @efim-a-efim - decreased E0 acceleration to make it less noisy (yes, even with TMC2208 drivers) -#define DEFAULT_ACCELERATION 1150 // X, Y, Z and E acceleration for printing moves +#define DEFAULT_ACCELERATION 1100 // X, Y, Z and E acceleration for printing moves #define DEFAULT_RETRACT_ACCELERATION 800 // E acceleration for retracts #define DEFAULT_TRAVEL_ACCELERATION 1200 // X, Y, Z acceleration for travel (non printing) moves @@ -793,15 +793,15 @@ */ #define CLASSIC_JERK #if ENABLED(CLASSIC_JERK) - #define DEFAULT_XJERK 17.0 - #define DEFAULT_YJERK 17.0 + #define DEFAULT_XJERK 13.0 + #define DEFAULT_YJERK 13.0 #define DEFAULT_ZJERK 0.5 //#define TRAVEL_EXTRA_XYJERK 0.0 // Additional jerk allowance for all travel moves #define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2 #if ENABLED(LIMITED_JERK_EDITING) - #define MAX_JERK_EDIT_VALUES { 30, 30, 2, 20 } // ...or, set your own edit limits + #define MAX_JERK_EDIT_VALUES { 20, 20, 2, 20 } // ...or, set your own edit limits #endif #endif @@ -1152,14 +1152,14 @@ // The size of the print bed #define X_BED_SIZE 250 -#define Y_BED_SIZE 207 +#define Y_BED_SIZE 206 // Travel limits (mm) after homing, corresponding to endstop positions. #define X_MIN_POS 0 -#define Y_MIN_POS 0 +#define Y_MIN_POS -4 #define Z_MIN_POS 0 -#define X_MAX_POS X_BED_SIZE -#define Y_MAX_POS Y_BED_SIZE +#define X_MAX_POS X_BED_SIZE + X_MIN_POS +#define Y_MAX_POS Y_BED_SIZE + Y_MIN_POS #define Z_MAX_POS 210 /** diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index e28a770095..2cdf6f433b 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -2232,7 +2232,7 @@ #if AXIS_IS_TMC(X) #define X_CURRENT 800 // (mA) RMS current. Multiply by 1.414 for peak current. #define X_CURRENT_HOME X_CURRENT // (mA) RMS current for sensorless homing - #define X_MICROSTEPS 16 // 0..256 + #define X_MICROSTEPS 32 // 0..256 #define X_RSENSE 0.11 #define X_CHAIN_POS -1 // <=0 : Not chained. 1 : MCU MOSI connected. 2 : Next in chain, ... #endif @@ -2248,7 +2248,7 @@ #if AXIS_IS_TMC(Y) #define Y_CURRENT 800 #define Y_CURRENT_HOME Y_CURRENT - #define Y_MICROSTEPS 16 + #define Y_MICROSTEPS 32 #define Y_RSENSE 0.11 #define Y_CHAIN_POS -1 #endif @@ -2264,7 +2264,7 @@ #if AXIS_IS_TMC(Z) #define Z_CURRENT 800 #define Z_CURRENT_HOME Z_CURRENT - #define Z_MICROSTEPS 16 + #define Z_MICROSTEPS 32 #define Z_RSENSE 0.11 #define Z_CHAIN_POS -1 #endif @@ -2295,7 +2295,7 @@ #if AXIS_IS_TMC(E0) #define E0_CURRENT 800 - #define E0_MICROSTEPS 16 + #define E0_MICROSTEPS 32 #define E0_RSENSE 0.11 #define E0_CHAIN_POS -1 #endif From d47085f7aac3261fa57371e0b9268bd34f149765 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Sat, 10 Oct 2020 18:24:25 +0300 Subject: [PATCH 08/24] USB_BAUDRATE 250000 --- Marlin/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 165e21cc5f..edaaf4c233 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -121,7 +121,7 @@ * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] */ #define BAUDRATE 115200 -#define USB_BAUDRATE 230400 +#define USB_BAUDRATE 250000 // Enable the Bluetooth serial interface on AT90USB devices //#define BLUETOOTH From b02fab84919950ced5105d03e5f39afb36eb3c5f Mon Sep 17 00:00:00 2001 From: X-Dron Date: Sun, 18 Oct 2020 11:57:54 +0300 Subject: [PATCH 09/24] Update MarlinCore.cpp --- Marlin/src/MarlinCore.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index e91b3f091c..3d1ce1d383 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -965,7 +965,6 @@ void setup() { #endif #endif - #if NUM_SERIAL > 0 MYSERIAL0.begin(USB_BAUDRATE); uint32_t serial_connect_timeout = millis() + 1000UL; while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } @@ -975,7 +974,6 @@ void setup() { while (!MYSERIAL1 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } #endif SERIAL_ECHO_MSG("start"); -#endif #if BOTH(HAS_TFT_LVGL_UI, USE_WIFI_FUNCTION) mks_esp_wifi_init(); From 5d33eed461ca0e9507b46e417947776b36191d0c Mon Sep 17 00:00:00 2001 From: X-Dron Date: Sun, 1 Nov 2020 20:51:10 +0300 Subject: [PATCH 10/24] PID range/Home Offset Menu --- Marlin/Configuration.h | 2 +- Marlin/Configuration_adv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 56f512f13f..f4b57b4ad7 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -559,7 +559,7 @@ //#define PID_DEBUG // Sends debug data to the serial port. Use 'M303 D' to toggle activation. //#define PID_OPENLOOP // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX //#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 - #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature + #define PID_FUNCTIONAL_RANGE 20 // If the temperature difference between the target temperature and the actual temperature // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max. #endif diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index cf173755b5..d84fc0636b 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -3158,7 +3158,7 @@ * - M206 and M428 are disabled. * - G92 will revert to its behavior from Marlin 1.0. */ -//#define NO_WORKSPACE_OFFSETS +#define NO_WORKSPACE_OFFSETS // Extra options for the M114 "Current Position" report //#define M114_DETAIL // Use 'M114` for details to check planner calculations From 036ade4ae826332be28bc383037dae93806ae93d Mon Sep 17 00:00:00 2001 From: X-Dron Date: Sun, 1 Nov 2020 21:02:09 +0300 Subject: [PATCH 11/24] REVERT --- Marlin/Configuration.h | 72 +++++++++++++++++++------------------- Marlin/Configuration_adv.h | 12 +++---- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index f4b57b4ad7..92aece1b40 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -128,7 +128,7 @@ // Choose the name from boards.h that matches your setup #ifndef MOTHERBOARD - #define MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2 + #define MOTHERBOARD BOARD_MKS_ROBIN_NANO #endif // Name displayed in the LCD "Ready" message and Info menu @@ -426,7 +426,7 @@ #define TEMP_SENSOR_7 0 #define TEMP_SENSOR_BED 1 #define TEMP_SENSOR_PROBE 0 -#define TEMP_SENSOR_CHAMBER 1 +#define TEMP_SENSOR_CHAMBER 0 // Dummy thermistor constant temperature readings, for use with 998 and 999 #define DUMMY_THERMISTOR_998_VALUE 25 @@ -668,7 +668,7 @@ #define X_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. #define Y_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. #define Z_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. -#define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe. +#define Z_MIN_PROBE_ENDSTOP_INVERTING true // Set to true to invert the logic of the probe. /** * Stepper Drivers @@ -686,15 +686,15 @@ * TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] */ -#define X_DRIVER_TYPE TMC2209 -#define Y_DRIVER_TYPE TMC2208 -#define Z_DRIVER_TYPE TMC2208 +#define X_DRIVER_TYPE A4988 +#define Y_DRIVER_TYPE A4988 +#define Z_DRIVER_TYPE A4988 //#define X2_DRIVER_TYPE A4988 //#define Y2_DRIVER_TYPE A4988 //#define Z2_DRIVER_TYPE A4988 //#define Z3_DRIVER_TYPE A4988 //#define Z4_DRIVER_TYPE A4988 -#define E0_DRIVER_TYPE TMC2209 +#define E0_DRIVER_TYPE A4988 //#define E1_DRIVER_TYPE A4988 //#define E2_DRIVER_TYPE A4988 //#define E3_DRIVER_TYPE A4988 @@ -749,7 +749,7 @@ * Override with M92 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_AXIS_STEPS_PER_UNIT { 161.0, 161.0, 800, 830 } +#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 421 } /** * Default Max Feed Rate (mm/s) @@ -769,7 +769,7 @@ * Override with M201 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_MAX_ACCELERATION { 1300, 1300, 100, 800 } +#define DEFAULT_MAX_ACCELERATION { 1000, 1000, 100, 800 } #define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2 #if ENABLED(LIMITED_MAX_ACCEL_EDITING) @@ -785,9 +785,9 @@ * M204 T Travel Acceleration */ // @efim-a-efim - decreased E0 acceleration to make it less noisy (yes, even with TMC2208 drivers) -#define DEFAULT_ACCELERATION 1100 // X, Y, Z and E acceleration for printing moves +#define DEFAULT_ACCELERATION 1000 // X, Y, Z and E acceleration for printing moves #define DEFAULT_RETRACT_ACCELERATION 800 // E acceleration for retracts -#define DEFAULT_TRAVEL_ACCELERATION 1200 // X, Y, Z acceleration for travel (non printing) moves +#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves /** * Default Jerk limits (mm/s) @@ -799,8 +799,8 @@ */ #define CLASSIC_JERK #if ENABLED(CLASSIC_JERK) - #define DEFAULT_XJERK 13.0 - #define DEFAULT_YJERK 13.0 + #define DEFAULT_XJERK 10.0 + #define DEFAULT_YJERK 10.0 #define DEFAULT_ZJERK 0.5 //#define TRAVEL_EXTRA_XYJERK 0.0 // Additional jerk allowance for all travel moves @@ -850,7 +850,7 @@ * The probe replaces the Z-MIN endstop and is used for Z homing. * (Automatically enables USE_PROBE_FOR_Z_HOMING.) */ -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN +//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN // Force the use of the probe for Z-axis homing //#define USE_PROBE_FOR_Z_HOMING @@ -870,7 +870,7 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. */ -//#define Z_MIN_PROBE_PIN BL_TOUCH_Z_PIN // Pin 32 is the RAMPS default +#define Z_MIN_PROBE_PIN BL_TOUCH_Z_PIN // Pin 32 is the RAMPS default /** * Probe Type @@ -999,10 +999,10 @@ // Most probes should stay away from the edges of the bed, but // with NOZZLE_AS_PROBE this can be negative for a wider probing area. -#define PROBING_MARGIN 5 +#define PROBING_MARGIN 30 // X and Y axis travel speed (mm/min) between probes -#define XY_PROBE_SPEED 3000 +#define XY_PROBE_SPEED (1000) // Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2) #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z @@ -1019,7 +1019,7 @@ * A total of 2 does fast/slow probes with a weighted average. * A total of 3 or more adds more slow probes, taking the average. */ -#define MULTIPLE_PROBING 2 +#define MULTIPLE_PROBING 5 //#define EXTRA_PROBING 1 /** @@ -1036,8 +1036,8 @@ * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_CLEARANCE_DEPLOY_PROBE 5 // Z Clearance for Deploy/Stow -#define Z_CLEARANCE_BETWEEN_PROBES 3 // Z Clearance between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 7 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points #define Z_CLEARANCE_MULTI_PROBE 3 // Z Clearance between multiple probes #define Z_AFTER_PROBING 5 // Z position after probing is done @@ -1146,7 +1146,7 @@ #define Z_HOMING_HEIGHT 2 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ... // Be sure to have this much clearance over your Z_MAX_POS to prevent grinding. -//#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing Z +#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing Z // Direction of endstops when homing; 1=MAX, -1=MIN // :[-1,1] @@ -1157,15 +1157,15 @@ // @section machine // The size of the print bed -#define X_BED_SIZE 250 -#define Y_BED_SIZE 206 +#define X_BED_SIZE 255 +#define Y_BED_SIZE 210 // Travel limits (mm) after homing, corresponding to endstop positions. #define X_MIN_POS 0 -#define Y_MIN_POS -4 +#define Y_MIN_POS 0 #define Z_MIN_POS 0 -#define X_MAX_POS X_BED_SIZE + X_MIN_POS -#define Y_MAX_POS Y_BED_SIZE + Y_MIN_POS +#define X_MAX_POS X_BED_SIZE +#define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 210 /** @@ -1423,8 +1423,8 @@ #define Z_SAFE_HOMING #if ENABLED(Z_SAFE_HOMING) - #define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axes (G28). - #define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2) // Y point for Z homing when homing all axes (G28). + #define Z_SAFE_HOMING_X_POINT (0) // X point for Z homing when homing all axes (G28). + #define Z_SAFE_HOMING_Y_POINT (0) // Y point for Z homing when homing all axes (G28). #endif // Homing speeds (mm/m) @@ -1569,14 +1569,14 @@ EEPROM_W25Q // @section temperature // Preheat Constants -#define PREHEAT_1_LABEL "PLA" -#define PREHEAT_1_TEMP_HOTEND 190 -#define PREHEAT_1_TEMP_BED 50 +#define PREHEAT_1_LABEL "PETG" +#define PREHEAT_1_TEMP_HOTEND 235 +#define PREHEAT_1_TEMP_BED 80 #define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255 -#define PREHEAT_2_LABEL "PETG" -#define PREHEAT_2_TEMP_HOTEND 235 -#define PREHEAT_2_TEMP_BED 80 +#define PREHEAT_2_LABEL "ABS" +#define PREHEAT_2_TEMP_HOTEND 250 +#define PREHEAT_2_TEMP_BED 100 #define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255 /** @@ -1703,7 +1703,7 @@ EEPROM_W25Q * * View the current statistics with M78. */ -#define PRINTCOUNTER +//#define PRINTCOUNTER /** * Password @@ -2287,7 +2287,7 @@ EEPROM_W25Q * Resolution: TFT_WIDTH and TFT_HEIGHT * Interface: TFT_INTERFACE_FSMC or TFT_INTERFACE_SPI */ -#define MKS_TS35_V2_0 +#define MKS_ROBIN_TFT35 /** * TFT UI - User Interface Selection. Enable one of the following options: diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index d84fc0636b..433b5412d7 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -503,7 +503,7 @@ /** * M355 Case Light on-off / brightness */ -#define CASE_LIGHT_ENABLE +//#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN LED_CASE_PIN // Override the default pin if needed #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW @@ -511,7 +511,7 @@ #define CASE_LIGHT_DEFAULT_BRIGHTNESS 255 // Set default power-up brightness (0-255, requires PWM pin) #define CASE_LIGHT_MAX_PWM 255 // Limit pwm #define CASE_LIGHT_MENU // Add Case Light options to the LCD menu - #define CASE_LIGHT_NO_BRIGHTNESS // Disable brightness control. Enable for non-PWM lighting. + //#define CASE_LIGHT_NO_BRIGHTNESS // Disable brightness control. Enable for non-PWM lighting. //#define CASE_LIGHT_USE_NEOPIXEL // Use NeoPixel LED as case light, requires NEOPIXEL_LED. #if ENABLED(CASE_LIGHT_USE_NEOPIXEL) #define CASE_LIGHT_NEOPIXEL_COLOR { 255, 255, 255, 255 } // { Red, Green, Blue, White } @@ -2268,7 +2268,7 @@ #if AXIS_IS_TMC(X) #define X_CURRENT 800 // (mA) RMS current. Multiply by 1.414 for peak current. #define X_CURRENT_HOME X_CURRENT // (mA) RMS current for sensorless homing - #define X_MICROSTEPS 32 // 0..256 + #define X_MICROSTEPS 16 // 0..256 #define X_RSENSE 0.11 #define X_CHAIN_POS -1 // <=0 : Not chained. 1 : MCU MOSI connected. 2 : Next in chain, ... #endif @@ -2284,7 +2284,7 @@ #if AXIS_IS_TMC(Y) #define Y_CURRENT 800 #define Y_CURRENT_HOME Y_CURRENT - #define Y_MICROSTEPS 32 + #define Y_MICROSTEPS 16 #define Y_RSENSE 0.11 #define Y_CHAIN_POS -1 #endif @@ -2300,7 +2300,7 @@ #if AXIS_IS_TMC(Z) #define Z_CURRENT 800 #define Z_CURRENT_HOME Z_CURRENT - #define Z_MICROSTEPS 32 + #define Z_MICROSTEPS 16 #define Z_RSENSE 0.11 #define Z_CHAIN_POS -1 #endif @@ -2331,7 +2331,7 @@ #if AXIS_IS_TMC(E0) #define E0_CURRENT 800 - #define E0_MICROSTEPS 32 + #define E0_MICROSTEPS 16 #define E0_RSENSE 0.11 #define E0_CHAIN_POS -1 #endif From ef6354982a828ad24f92dcd1a724dc0264847a73 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Sun, 1 Nov 2020 21:21:27 +0300 Subject: [PATCH 12/24] PID RANGE, USB SPEED, HOME OFFSETS MENU, UART drive --- Marlin/Configuration.h | 8 ++++---- Marlin/Configuration_adv.h | 28 +++++++++++++++++----------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 56f512f13f..403e281b42 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -416,7 +416,7 @@ * 998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below. * 999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below. */ -#define TEMP_SENSOR_0 1 +#define TEMP_SENSOR_0 13 #define TEMP_SENSOR_1 0 #define TEMP_SENSOR_2 0 #define TEMP_SENSOR_3 0 @@ -559,7 +559,7 @@ //#define PID_DEBUG // Sends debug data to the serial port. Use 'M303 D' to toggle activation. //#define PID_OPENLOOP // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX //#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 - #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature + #define PID_FUNCTIONAL_RANGE 20 // If the temperature difference between the target temperature and the actual temperature // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max. #endif @@ -749,7 +749,7 @@ * Override with M92 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_AXIS_STEPS_PER_UNIT { 161.0, 161.0, 800, 830 } +#define DEFAULT_AXIS_STEPS_PER_UNIT { 161.0, 161.0, 800, 820 } /** * Default Max Feed Rate (mm/s) @@ -1166,7 +1166,7 @@ #define Z_MIN_POS 0 #define X_MAX_POS X_BED_SIZE + X_MIN_POS #define Y_MAX_POS Y_BED_SIZE + Y_MIN_POS -#define Z_MAX_POS 210 +#define Z_MAX_POS 200 /** * Software Endstops diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index cf173755b5..c68605cd27 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -507,11 +507,11 @@ #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN LED_CASE_PIN // Override the default pin if needed #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW - #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_ON false // Set default power-up state on #define CASE_LIGHT_DEFAULT_BRIGHTNESS 255 // Set default power-up brightness (0-255, requires PWM pin) #define CASE_LIGHT_MAX_PWM 255 // Limit pwm #define CASE_LIGHT_MENU // Add Case Light options to the LCD menu - #define CASE_LIGHT_NO_BRIGHTNESS // Disable brightness control. Enable for non-PWM lighting. + //#define CASE_LIGHT_NO_BRIGHTNESS // Disable brightness control. Enable for non-PWM lighting. //#define CASE_LIGHT_USE_NEOPIXEL // Use NeoPixel LED as case light, requires NEOPIXEL_LED. #if ENABLED(CASE_LIGHT_USE_NEOPIXEL) #define CASE_LIGHT_NEOPIXEL_COLOR { 255, 255, 255, 255 } // { Red, Green, Blue, White } @@ -3158,7 +3158,7 @@ * - M206 and M428 are disabled. * - G92 will revert to its behavior from Marlin 1.0. */ -//#define NO_WORKSPACE_OFFSETS +#define NO_WORKSPACE_OFFSETS // Extra options for the M114 "Current Position" report //#define M114_DETAIL // Use 'M114` for details to check planner calculations @@ -3236,17 +3236,23 @@ #define USER_DESC_1 "Home & UBL Info" #define USER_GCODE_1 "G28\nG29 W" - #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL - #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) + #define USER_DESC_2 "Light ON" + #define USER_GCODE_2 "M355 S1" - #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL - #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND) + #define USER_DESC_3 "Light OFF" + #define USER_GCODE_3 "M355 S0" - #define USER_DESC_4 "Heat Bed/Home/Level" - #define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29" +// #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL +// #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) - #define USER_DESC_5 "Power off" - #define USER_GCODE_5 "M81" +// #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL +// #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND) + +// #define USER_DESC_4 "Heat Bed/Home/Level" +// #define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29" + + #define USER_DESC_4 "Power off" + #define USER_GCODE_4 "M81" #endif From a6fea31697b0799220ca2a8171485d3350a25ebc Mon Sep 17 00:00:00 2001 From: X-Dron Date: Fri, 6 Nov 2020 07:49:12 +0300 Subject: [PATCH 13/24] LED Switch and minor config update --- Marlin/Configuration.h | 2 +- Marlin/Configuration_adv.h | 6 ++--- Marlin/src/MarlinCore.cpp | 23 +++++++++++++++++++ Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h | 7 +++++- .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 7 +++++- 5 files changed, 39 insertions(+), 6 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 403e281b42..d2504207ec 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1162,7 +1162,7 @@ // Travel limits (mm) after homing, corresponding to endstop positions. #define X_MIN_POS 0 -#define Y_MIN_POS -4 +#define Y_MIN_POS -2 #define Z_MIN_POS 0 #define X_MAX_POS X_BED_SIZE + X_MIN_POS #define Y_MAX_POS Y_BED_SIZE + Y_MIN_POS diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index c68605cd27..0c4e2a1f52 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1612,9 +1612,9 @@ #define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement). //#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA! #define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way - //#define BABYSTEP_MILLIMETER_UNITS // Specify BABYSTEP_MULTIPLICATOR_(XY|Z) in mm instead of micro-steps - #define BABYSTEP_MULTIPLICATOR_Z 10 // (steps or mm) Steps or millimeter distance for each Z babystep - #define BABYSTEP_MULTIPLICATOR_XY 10 // (steps or mm) Steps or millimeter distance for each XY babystep + #define BABYSTEP_MILLIMETER_UNITS // Specify BABYSTEP_MULTIPLICATOR_(XY|Z) in mm instead of micro-steps + #define BABYSTEP_MULTIPLICATOR_Z 0.01 // (steps or mm) Steps or millimeter distance for each Z babystep + //#define BABYSTEP_MULTIPLICATOR_XY 10 // (steps or mm) Steps or millimeter distance for each XY babystep #define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping. #if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING) diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index 5cea9cb58f..1141740efb 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -268,6 +268,11 @@ bool wait_for_heatup = true; * ******************************** FUNCTIONS ******************************** * *************************************************************************** */ +#ifdef LED_SW_PIN + void setup_LED_SW_pin() { + SET_INPUT_PULLDOWN(LED_SW_PIN); + } +#endif void setup_killpin() { #if HAS_KILL @@ -559,6 +564,20 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) { } #endif + #ifdef LED_SW_PIN + static int LedSw_Count = 0; // make the inactivity button a bit less responsive + const int LED_SW_DELAY = 100; + bool led_pin_status = !READ(LED_SW_PIN); + if (led_pin_status && LedSw_Count <= LED_SW_DELAY) + LedSw_Count++; + else if (!led_pin_status) + LedSw_Count = 0; + if (LedSw_Count == LED_SW_DELAY){ + caselight.on = !caselight.on; + caselight.update(true); + } + #endif + #if HAS_HOME // Handle a standalone HOME button constexpr millis_t HOME_DEBOUNCE_DELAY = 1000UL; @@ -1001,6 +1020,10 @@ void setup() { #endif SETUP_RUN(setup_killpin()); + + #ifdef LED_SW_PIN + SETUP_RUN(setup_LED_SW_pin()); + #endif #if HAS_TMC220x SETUP_RUN(tmc_serial_begin()); diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h index 1e23089e74..c22b2df5d4 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h @@ -168,7 +168,12 @@ BlTouch //#define POWER_LOSS_PIN PA2 // PW_DET //#define PS_ON_PIN PB2 // PW_OFF #define FIL_RUNOUT_PIN PA4 - #define FIL_RUNOUT2_PIN PE6 + #ifdef CASE_LED_INSTEAD_E1 + //#define LED_SW_PIN PE6 + #endif + #ifndef LED_SW_PIN + #define FIL_RUNOUT2_PIN PE6 + #endif #endif // diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h index 3fa07f1a5d..5fde0b0d0f 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h @@ -236,7 +236,12 @@ https://easyeda.com/sst78rust/fb4s-led-control //#define POWER_LOSS_PIN PA2 // PW_DET //#define PS_ON_PIN PB2 // PW_OFF #define FIL_RUNOUT_PIN PA4 - #define FIL_RUNOUT2_PIN PE6 + #ifdef CASE_LED_INSTEAD_E1 + #define LED_SW_PIN PE6 + #endif + #ifndef LED_SW_PIN + #define FIL_RUNOUT2_PIN PE6 + #endif #endif #define SERVO0_PIN PA8 // Enable BLTOUCH From 83aaac475e51656dc1be3d5d7556620dcad35fc8 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Fri, 6 Nov 2020 11:04:39 +0300 Subject: [PATCH 14/24] BABYSTEP_MILLIMETER_UNITS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Так будет лучше. Шаги на мм у разных версий принтера могут быть разными. В исходном варианте дергаем на 10 микрошагов драйвера. В обновленнном на 0.01мм на babystep --- Marlin/Configuration_adv.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 433b5412d7..5144974b3d 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1612,9 +1612,9 @@ #define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement). //#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA! #define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way - //#define BABYSTEP_MILLIMETER_UNITS // Specify BABYSTEP_MULTIPLICATOR_(XY|Z) in mm instead of micro-steps - #define BABYSTEP_MULTIPLICATOR_Z 10 // (steps or mm) Steps or millimeter distance for each Z babystep - #define BABYSTEP_MULTIPLICATOR_XY 10 // (steps or mm) Steps or millimeter distance for each XY babystep + #define BABYSTEP_MILLIMETER_UNITS // Specify BABYSTEP_MULTIPLICATOR_(XY|Z) in mm instead of micro-steps + #define BABYSTEP_MULTIPLICATOR_Z 0.01 // (steps or mm) Steps or millimeter distance for each Z babystep + //#define BABYSTEP_MULTIPLICATOR_XY 10 // (steps or mm) Steps or millimeter distance for each XY babystep #define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping. #if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING) From 3d886c4fbdc57642784e65cce4dc1c0ea4365d46 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Fri, 6 Nov 2020 11:11:19 +0300 Subject: [PATCH 15/24] Revert "BABYSTEP_MILLIMETER_UNITS" This reverts commit 83aaac475e51656dc1be3d5d7556620dcad35fc8. --- Marlin/Configuration_adv.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 5144974b3d..433b5412d7 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1612,9 +1612,9 @@ #define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement). //#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA! #define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way - #define BABYSTEP_MILLIMETER_UNITS // Specify BABYSTEP_MULTIPLICATOR_(XY|Z) in mm instead of micro-steps - #define BABYSTEP_MULTIPLICATOR_Z 0.01 // (steps or mm) Steps or millimeter distance for each Z babystep - //#define BABYSTEP_MULTIPLICATOR_XY 10 // (steps or mm) Steps or millimeter distance for each XY babystep + //#define BABYSTEP_MILLIMETER_UNITS // Specify BABYSTEP_MULTIPLICATOR_(XY|Z) in mm instead of micro-steps + #define BABYSTEP_MULTIPLICATOR_Z 10 // (steps or mm) Steps or millimeter distance for each Z babystep + #define BABYSTEP_MULTIPLICATOR_XY 10 // (steps or mm) Steps or millimeter distance for each XY babystep #define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping. #if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING) From de94b4588d245d7377ad39bdc5db22c5cde69a6f Mon Sep 17 00:00:00 2001 From: X-Dron Date: Fri, 6 Nov 2020 19:09:10 +0300 Subject: [PATCH 16/24] ENABLED(BABYSTEP_ZPROBE_OFFSET) --- Marlin/Configuration_adv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 0c4e2a1f52..0d22236477 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1628,7 +1628,7 @@ //#define BABYSTEP_DISPLAY_TOTAL // Display total babysteps since last G28 - //#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping + #define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping #if ENABLED(BABYSTEP_ZPROBE_OFFSET) //#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets //#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor From a622308db6681be71b534effc9e9ab3c98f0b245 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Fri, 6 Nov 2020 19:37:42 +0300 Subject: [PATCH 17/24] SYNC --- Marlin/Configuration.h | 1 - Marlin/src/MarlinCore.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 92aece1b40..7226b452ad 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -121,7 +121,6 @@ * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] */ #define BAUDRATE 115200 -#define USB_BAUDRATE 250000 // Enable the Bluetooth serial interface on AT90USB devices //#define BLUETOOTH diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index ae75378218..610ab7962b 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -977,7 +977,7 @@ void setup() { serial_connect_timeout = millis() + 1000UL; while (!MYSERIAL1 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } #endif - + SERIAL_ECHO_MSG("start"); #if BOTH(HAS_TFT_LVGL_UI, USE_WIFI_FUNCTION) mks_esp_wifi_init(); From 72431de8e560bd2ddf2301c8394c2906e6f4c84e Mon Sep 17 00:00:00 2001 From: X-Dron Date: Fri, 6 Nov 2020 19:59:59 +0300 Subject: [PATCH 18/24] Sync with Sergey1560 --- Marlin/Configuration.h | 3 +-- Marlin/Configuration_adv.h | 4 ++-- Marlin/src/MarlinCore.cpp | 8 ++++++-- Marlin/src/core/serial.h | 9 +++++++-- Marlin/src/module/mks_wifi/mks_wifi_sd.cpp | 2 ++ Marlin/src/module/mks_wifi/mks_wifi_serial_out.cpp | 14 +++++++++----- Marlin/src/module/mks_wifi/mks_wifi_serial_out.h | 2 ++ Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h | 2 ++ Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 1 + 9 files changed, 32 insertions(+), 13 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index d2504207ec..3d0810310c 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -120,8 +120,7 @@ * * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] */ -#define BAUDRATE 115200 -#define USB_BAUDRATE 250000 +#define BAUDRATE 250000 // Enable the Bluetooth serial interface on AT90USB devices //#define BLUETOOTH diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 0d22236477..4916722215 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1613,8 +1613,8 @@ //#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA! #define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way #define BABYSTEP_MILLIMETER_UNITS // Specify BABYSTEP_MULTIPLICATOR_(XY|Z) in mm instead of micro-steps - #define BABYSTEP_MULTIPLICATOR_Z 0.01 // (steps or mm) Steps or millimeter distance for each Z babystep - //#define BABYSTEP_MULTIPLICATOR_XY 10 // (steps or mm) Steps or millimeter distance for each XY babystep + #define BABYSTEP_MULTIPLICATOR_Z 0.01 // (steps or mm) Steps or millimeter distance for each Z babystep + //#define BABYSTEP_MULTIPLICATOR_XY 0.01 // (steps or mm) Steps or millimeter distance for each XY babystep #define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping. #if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING) diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index 1141740efb..5d5ff62603 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -984,11 +984,15 @@ void setup() { #endif #endif - MYSERIAL0.begin(USB_BAUDRATE); + MYSERIAL0.begin(BAUDRATE); uint32_t serial_connect_timeout = millis() + 1000UL; while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } #if HAS_MULTI_SERIAL - MYSERIAL1.begin(BAUDRATE); + #if ENABLED(MKS_WIFI) + MYSERIAL1.begin(MKS_WIFI_BAUDRATE); + #else + MYSERIAL1.begin(BAUDRATE); + #endif serial_connect_timeout = millis() + 1000UL; while (!MYSERIAL1 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } #endif diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h index d93f1961df..77711e31b1 100644 --- a/Marlin/src/core/serial.h +++ b/Marlin/src/core/serial.h @@ -58,7 +58,6 @@ extern uint8_t marlin_debug_flags; #else #define SERIAL_OUT(WHAT, V...) do{ \ if (!serial_port_index || serial_port_index == SERIAL_BOTH) (void)MYSERIAL0.WHAT(V); \ - if ( serial_port_index) (void)MYSERIAL1.WHAT(V); \ }while(0) #endif @@ -82,8 +81,14 @@ extern uint8_t marlin_debug_flags; #define SERIAL_ECHO(x) SERIAL_OUT(print, x) #endif +#if ENABLED(MKS_WIFI) +#define SERIAL_ECHO_F(V...) do{ \ + if (!serial_port_index || serial_port_index == SERIAL_BOTH ) SERIAL_OUT(print, V); \ + if ( serial_port_index) mks_wifi_print_f(V); \ +}while(0) +#else #define SERIAL_ECHO_F(V...) SERIAL_OUT(print, V) - +#endif #if ENABLED(MKS_WIFI) #define SERIAL_ECHOLN(x) do{ \ if (!serial_port_index || serial_port_index == SERIAL_BOTH ) SERIAL_OUT(println, x); \ diff --git a/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp b/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp index d9f10c064a..c23db1463c 100644 --- a/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp +++ b/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp @@ -199,6 +199,8 @@ void mks_wifi_start_file_upload(ESP_PROTOC_FRAME *packet){ while(dma_timeout-- > 0){ + iwdg_feed(); + if(DMA1->ISR & DMA_ISR_TCIF5){ DMA1->IFCR = DMA_IFCR_CGIF5|DMA_IFCR_CTEIF5|DMA_IFCR_CHTIF5|DMA_IFCR_CTCIF5; diff --git a/Marlin/src/module/mks_wifi/mks_wifi_serial_out.cpp b/Marlin/src/module/mks_wifi/mks_wifi_serial_out.cpp index ecd59553aa..09697d1267 100644 --- a/Marlin/src/module/mks_wifi/mks_wifi_serial_out.cpp +++ b/Marlin/src/module/mks_wifi/mks_wifi_serial_out.cpp @@ -16,6 +16,15 @@ void mks_wifi_print_var(uint8_t count, ...){ va_end(args); } +void mks_wifi_print_f(float f,uint8_t size){ + char str[20]; + char format[10]; + + sprintf(format,"%%0.%df",size); + sprintf(str,format,f); + mks_wifi_out_add((uint8_t *)str, strnlen((char *)str,ESP_PACKET_DATA_MAX_SIZE)); +} + // PRINT functions @@ -88,11 +97,6 @@ void mks_wifi_println(double f){ sprintf(str,"%.2f\n",f); mks_wifi_out_add((uint8_t *)str, strnlen((char *)str,ESP_PACKET_DATA_MAX_SIZE)); } -/* -void mks_wifi_println(int i){ - mks_wifi_println((int32)i); -} -*/ void mks_wifi_println(long int i){ mks_wifi_println((int32)i); } diff --git a/Marlin/src/module/mks_wifi/mks_wifi_serial_out.h b/Marlin/src/module/mks_wifi/mks_wifi_serial_out.h index de0db7d2be..f466b28dfe 100644 --- a/Marlin/src/module/mks_wifi/mks_wifi_serial_out.h +++ b/Marlin/src/module/mks_wifi/mks_wifi_serial_out.h @@ -11,6 +11,8 @@ void mks_wifi_print_var(uint8_t count, ...); +void mks_wifi_print_f(float f,uint8_t size); + void mks_wifi_print(const char *s); void mks_wifi_print(int32 i); void mks_wifi_print(uint32 i); diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h index c22b2df5d4..58f43eda3d 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h @@ -284,6 +284,8 @@ BlTouch #define MKS_WIFI #ifdef MKS_WIFI + + #define MKS_WIFI_BAUDRATE 115200 #undef PLATFORM_M997_SUPPORT #define MKS_WIFI_IO0 PA8 diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h index 5fde0b0d0f..b8ff9df34b 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h @@ -444,6 +444,7 @@ https://easyeda.com/sst78rust/fb4s-led-control */ #define MKS_WIFI #ifdef MKS_WIFI + #define MKS_WIFI_BAUDRATE 115200 #undef PLATFORM_M997_SUPPORT #define MKS_WIFI_IO0 PC13 From 12ac9daecfe00f843d8035831b231022545fd0e3 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Fri, 6 Nov 2020 20:32:48 +0300 Subject: [PATCH 19/24] Revert "Sync with Sergey1560" This reverts commit 72431de8e560bd2ddf2301c8394c2906e6f4c84e. --- Marlin/Configuration.h | 3 ++- Marlin/Configuration_adv.h | 4 ++-- Marlin/src/MarlinCore.cpp | 8 ++------ Marlin/src/core/serial.h | 9 ++------- Marlin/src/module/mks_wifi/mks_wifi_sd.cpp | 2 -- Marlin/src/module/mks_wifi/mks_wifi_serial_out.cpp | 14 +++++--------- Marlin/src/module/mks_wifi/mks_wifi_serial_out.h | 2 -- Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h | 2 -- Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 1 - 9 files changed, 13 insertions(+), 32 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 3d0810310c..d2504207ec 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -120,7 +120,8 @@ * * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] */ -#define BAUDRATE 250000 +#define BAUDRATE 115200 +#define USB_BAUDRATE 250000 // Enable the Bluetooth serial interface on AT90USB devices //#define BLUETOOTH diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 4916722215..0d22236477 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1613,8 +1613,8 @@ //#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA! #define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way #define BABYSTEP_MILLIMETER_UNITS // Specify BABYSTEP_MULTIPLICATOR_(XY|Z) in mm instead of micro-steps - #define BABYSTEP_MULTIPLICATOR_Z 0.01 // (steps or mm) Steps or millimeter distance for each Z babystep - //#define BABYSTEP_MULTIPLICATOR_XY 0.01 // (steps or mm) Steps or millimeter distance for each XY babystep + #define BABYSTEP_MULTIPLICATOR_Z 0.01 // (steps or mm) Steps or millimeter distance for each Z babystep + //#define BABYSTEP_MULTIPLICATOR_XY 10 // (steps or mm) Steps or millimeter distance for each XY babystep #define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping. #if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING) diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index 5d5ff62603..1141740efb 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -984,15 +984,11 @@ void setup() { #endif #endif - MYSERIAL0.begin(BAUDRATE); + MYSERIAL0.begin(USB_BAUDRATE); uint32_t serial_connect_timeout = millis() + 1000UL; while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } #if HAS_MULTI_SERIAL - #if ENABLED(MKS_WIFI) - MYSERIAL1.begin(MKS_WIFI_BAUDRATE); - #else - MYSERIAL1.begin(BAUDRATE); - #endif + MYSERIAL1.begin(BAUDRATE); serial_connect_timeout = millis() + 1000UL; while (!MYSERIAL1 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } #endif diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h index 77711e31b1..d93f1961df 100644 --- a/Marlin/src/core/serial.h +++ b/Marlin/src/core/serial.h @@ -58,6 +58,7 @@ extern uint8_t marlin_debug_flags; #else #define SERIAL_OUT(WHAT, V...) do{ \ if (!serial_port_index || serial_port_index == SERIAL_BOTH) (void)MYSERIAL0.WHAT(V); \ + if ( serial_port_index) (void)MYSERIAL1.WHAT(V); \ }while(0) #endif @@ -81,14 +82,8 @@ extern uint8_t marlin_debug_flags; #define SERIAL_ECHO(x) SERIAL_OUT(print, x) #endif -#if ENABLED(MKS_WIFI) -#define SERIAL_ECHO_F(V...) do{ \ - if (!serial_port_index || serial_port_index == SERIAL_BOTH ) SERIAL_OUT(print, V); \ - if ( serial_port_index) mks_wifi_print_f(V); \ -}while(0) -#else #define SERIAL_ECHO_F(V...) SERIAL_OUT(print, V) -#endif + #if ENABLED(MKS_WIFI) #define SERIAL_ECHOLN(x) do{ \ if (!serial_port_index || serial_port_index == SERIAL_BOTH ) SERIAL_OUT(println, x); \ diff --git a/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp b/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp index c23db1463c..d9f10c064a 100644 --- a/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp +++ b/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp @@ -199,8 +199,6 @@ void mks_wifi_start_file_upload(ESP_PROTOC_FRAME *packet){ while(dma_timeout-- > 0){ - iwdg_feed(); - if(DMA1->ISR & DMA_ISR_TCIF5){ DMA1->IFCR = DMA_IFCR_CGIF5|DMA_IFCR_CTEIF5|DMA_IFCR_CHTIF5|DMA_IFCR_CTCIF5; diff --git a/Marlin/src/module/mks_wifi/mks_wifi_serial_out.cpp b/Marlin/src/module/mks_wifi/mks_wifi_serial_out.cpp index 09697d1267..ecd59553aa 100644 --- a/Marlin/src/module/mks_wifi/mks_wifi_serial_out.cpp +++ b/Marlin/src/module/mks_wifi/mks_wifi_serial_out.cpp @@ -16,15 +16,6 @@ void mks_wifi_print_var(uint8_t count, ...){ va_end(args); } -void mks_wifi_print_f(float f,uint8_t size){ - char str[20]; - char format[10]; - - sprintf(format,"%%0.%df",size); - sprintf(str,format,f); - mks_wifi_out_add((uint8_t *)str, strnlen((char *)str,ESP_PACKET_DATA_MAX_SIZE)); -} - // PRINT functions @@ -97,6 +88,11 @@ void mks_wifi_println(double f){ sprintf(str,"%.2f\n",f); mks_wifi_out_add((uint8_t *)str, strnlen((char *)str,ESP_PACKET_DATA_MAX_SIZE)); } +/* +void mks_wifi_println(int i){ + mks_wifi_println((int32)i); +} +*/ void mks_wifi_println(long int i){ mks_wifi_println((int32)i); } diff --git a/Marlin/src/module/mks_wifi/mks_wifi_serial_out.h b/Marlin/src/module/mks_wifi/mks_wifi_serial_out.h index f466b28dfe..de0db7d2be 100644 --- a/Marlin/src/module/mks_wifi/mks_wifi_serial_out.h +++ b/Marlin/src/module/mks_wifi/mks_wifi_serial_out.h @@ -11,8 +11,6 @@ void mks_wifi_print_var(uint8_t count, ...); -void mks_wifi_print_f(float f,uint8_t size); - void mks_wifi_print(const char *s); void mks_wifi_print(int32 i); void mks_wifi_print(uint32 i); diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h index 58f43eda3d..c22b2df5d4 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h @@ -284,8 +284,6 @@ BlTouch #define MKS_WIFI #ifdef MKS_WIFI - - #define MKS_WIFI_BAUDRATE 115200 #undef PLATFORM_M997_SUPPORT #define MKS_WIFI_IO0 PA8 diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h index b8ff9df34b..5fde0b0d0f 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h @@ -444,7 +444,6 @@ https://easyeda.com/sst78rust/fb4s-led-control */ #define MKS_WIFI #ifdef MKS_WIFI - #define MKS_WIFI_BAUDRATE 115200 #undef PLATFORM_M997_SUPPORT #define MKS_WIFI_IO0 PC13 From f1e9249a8b5b7caf7ba5dd25681aca7d108143b0 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Fri, 6 Nov 2020 21:06:22 +0300 Subject: [PATCH 20/24] Update Configuration.h --- Marlin/Configuration.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index d2504207ec..3d0810310c 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -120,8 +120,7 @@ * * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] */ -#define BAUDRATE 115200 -#define USB_BAUDRATE 250000 +#define BAUDRATE 250000 // Enable the Bluetooth serial interface on AT90USB devices //#define BLUETOOTH From 0196149b591143be6efd2de21db5b06e2594ac99 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Fri, 6 Nov 2020 21:14:42 +0300 Subject: [PATCH 21/24] Update MarlinCore.cpp --- Marlin/src/MarlinCore.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index 1616e7a5be..7f36e3a00e 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -988,11 +988,11 @@ void setup() { uint32_t serial_connect_timeout = millis() + 1000UL; while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } #if HAS_MULTI_SERIAL - #if ENABLED(MKS_WIFI) - MYSERIAL1.begin(MKS_WIFI_BAUDRATE); - #else - MYSERIAL1.begin(BAUDRATE); - #endif + #if ENABLED(MKS_WIFI) + MYSERIAL1.begin(MKS_WIFI_BAUDRATE); + #else + MYSERIAL1.begin(BAUDRATE); + #endif serial_connect_timeout = millis() + 1000UL; while (!MYSERIAL1 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } #endif From 92a2c1d62d21c245084f607ba13ca4ac7a94b197 Mon Sep 17 00:00:00 2001 From: X-Dron Date: Wed, 25 Nov 2020 20:08:55 +0300 Subject: [PATCH 22/24] PSU + Update config --- Marlin/Configuration.h | 37 ++++++++++--------- Marlin/Configuration_adv.h | 18 ++++----- Marlin/src/MarlinCore.cpp | 16 ++++---- .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 10 ++++- 4 files changed, 45 insertions(+), 36 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 3d0810310c..6e39d3a047 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -499,9 +499,10 @@ #define DEFAULT_Ki_LIST { 1.08, 1.0 } #define DEFAULT_Kd_LIST { 114.00, 112.0 } #else - #define DEFAULT_Kp 17.04 - #define DEFAULT_Ki 1.31 - #define DEFAULT_Kd 55.34 + // 50Вт + #define DEFAULT_Kp 11.1 + #define DEFAULT_Ki 0.55 + #define DEFAULT_Kd 56.1 #endif #endif // PIDTEMP @@ -686,8 +687,8 @@ * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] */ #define X_DRIVER_TYPE TMC2209 -#define Y_DRIVER_TYPE TMC2208 -#define Z_DRIVER_TYPE TMC2208 +#define Y_DRIVER_TYPE TMC2209 +#define Z_DRIVER_TYPE TMC2209 //#define X2_DRIVER_TYPE A4988 //#define Y2_DRIVER_TYPE A4988 //#define Z2_DRIVER_TYPE A4988 @@ -748,7 +749,7 @@ * Override with M92 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_AXIS_STEPS_PER_UNIT { 161.0, 161.0, 800, 820 } +#define DEFAULT_AXIS_STEPS_PER_UNIT { 160.0, 160.0, 400, 205.0 } /** * Default Max Feed Rate (mm/s) @@ -784,7 +785,7 @@ * M204 T Travel Acceleration */ // @efim-a-efim - decreased E0 acceleration to make it less noisy (yes, even with TMC2208 drivers) -#define DEFAULT_ACCELERATION 1100 // X, Y, Z and E acceleration for printing moves +#define DEFAULT_ACCELERATION 1200 // X, Y, Z and E acceleration for printing moves #define DEFAULT_RETRACT_ACCELERATION 800 // E acceleration for retracts #define DEFAULT_TRAVEL_ACCELERATION 1200 // X, Y, Z acceleration for travel (non printing) moves @@ -1018,8 +1019,8 @@ * A total of 2 does fast/slow probes with a weighted average. * A total of 3 or more adds more slow probes, taking the average. */ -#define MULTIPLE_PROBING 2 -//#define EXTRA_PROBING 1 +#define MULTIPLE_PROBING 3 +#define EXTRA_PROBING 1 /** * Z probes require clearance when deploying, stowing, and moving between @@ -1043,8 +1044,8 @@ #define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping // For M851 give a range for adjusting the Z probe offset -#define Z_PROBE_OFFSET_RANGE_MIN -20 -#define Z_PROBE_OFFSET_RANGE_MAX 20 +#define Z_PROBE_OFFSET_RANGE_MIN -5 +#define Z_PROBE_OFFSET_RANGE_MAX 5 // Enable the M48 repeatability test to test probe accuracy #define Z_MIN_PROBE_REPEATABILITY_TEST @@ -1268,8 +1269,8 @@ */ //#define AUTO_BED_LEVELING_3POINT //#define AUTO_BED_LEVELING_LINEAR -#define AUTO_BED_LEVELING_BILINEAR -//#define AUTO_BED_LEVELING_UBL +//#define AUTO_BED_LEVELING_BILINEAR +#define AUTO_BED_LEVELING_UBL //#define MESH_BED_LEVELING /** @@ -1347,7 +1348,7 @@ //#define MESH_EDIT_GFX_OVERLAY // Display a graphics overlay while editing the mesh - #define MESH_INSET 20 // Set Mesh bounds as an inset region of the bed + #define MESH_INSET 5 // Set Mesh bounds as an inset region of the bed #define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited. #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X @@ -1427,8 +1428,8 @@ #endif // Homing speeds (mm/m) -#define HOMING_FEEDRATE_XY (50*50) -#define HOMING_FEEDRATE_Z (50*50) +#define HOMING_FEEDRATE_XY (60*60) +#define HOMING_FEEDRATE_Z (4*60) // Validate that endstops are triggered on homing moves #define VALIDATE_HOMING_ENDSTOPS @@ -1775,7 +1776,7 @@ EEPROM_W25Q * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ -#define DISPLAY_CHARSET_HD44780 JAPANESE +#define DISPLAY_CHARSET_HD44780 CYRILLIC /** * Info Screen Style (0:Classic, 1:Průša) @@ -1824,7 +1825,7 @@ EEPROM_W25Q // This option overrides the default number of encoder pulses needed to // produce one step. Should be increased for high-resolution encoders. // -//#define ENCODER_PULSES_PER_STEP 4 +#define ENCODER_PULSES_PER_STEP 4 // // Use this option to override the number of step signals required to diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 4916722215..31f10c9659 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1703,10 +1703,10 @@ #if EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL) // Override the mesh area if the automatic (max) area is too large - //#define MESH_MIN_X MESH_INSET - //#define MESH_MIN_Y MESH_INSET - //#define MESH_MAX_X X_BED_SIZE - (MESH_INSET) - //#define MESH_MAX_Y Y_BED_SIZE - (MESH_INSET) + #define MESH_MIN_X MESH_INSET + #define MESH_MIN_Y MESH_INSET + #define MESH_MAX_X X_BED_SIZE - (MESH_INSET) + #define MESH_MAX_Y Y_BED_SIZE - (MESH_INSET) #endif /** @@ -2096,7 +2096,7 @@ // This short retract is done immediately, before parking the nozzle. #define FILAMENT_CHANGE_UNLOAD_FEEDRATE 10 // (mm/s) Unload filament feedrate. This can be pretty fast. #define FILAMENT_CHANGE_UNLOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate. - #define FILAMENT_CHANGE_UNLOAD_LENGTH 710 // (mm) The length of filament for a complete unload. + #define FILAMENT_CHANGE_UNLOAD_LENGTH 100 // (mm) The length of filament for a complete unload. // For Bowden, the full length of the tube and nozzle. // For direct drive, the full length of the nozzle. // Set to 0 for manual unloading. @@ -2105,7 +2105,7 @@ // 0 to disable start loading and skip to fast load only #define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE 6 // (mm/s) Load filament feedrate. This can be pretty fast. #define FILAMENT_CHANGE_FAST_LOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate. - #define FILAMENT_CHANGE_FAST_LOAD_LENGTH 710 // (mm) Load length of filament, from extruder gear to nozzle. + #define FILAMENT_CHANGE_FAST_LOAD_LENGTH 100 // (mm) Load length of filament, from extruder gear to nozzle. // For Bowden, the full length of the tube and nozzle. // For direct drive, the full length of the nozzle. #define ADVANCED_PAUSE_CONTINUOUS_PURGE // Purge continuously up to the purge length until interrupted. @@ -2300,7 +2300,7 @@ #if AXIS_IS_TMC(Z) #define Z_CURRENT 800 #define Z_CURRENT_HOME Z_CURRENT - #define Z_MICROSTEPS 32 + #define Z_MICROSTEPS 16 #define Z_RSENSE 0.11 #define Z_CHAIN_POS -1 #endif @@ -2330,8 +2330,8 @@ #endif #if AXIS_IS_TMC(E0) - #define E0_CURRENT 800 - #define E0_MICROSTEPS 32 + #define E0_CURRENT 650 + #define E0_MICROSTEPS 8 #define E0_RSENSE 0.11 #define E0_CHAIN_POS -1 #endif diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index 7f36e3a00e..56ccf52795 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -549,7 +549,7 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) { // key kill key press // ------------------------------------------------------------------------------- static int killCount = 0; // make the inactivity button a bit less responsive - const int KILL_DELAY = 750; + const int KILL_DELAY = 100000; if (kill_state()) killCount++; else if (killCount > 0) @@ -566,16 +566,16 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) { #ifdef LED_SW_PIN static int LedSw_Count = 0; // make the inactivity button a bit less responsive - const int LED_SW_DELAY = 100; - bool led_pin_status = !READ(LED_SW_PIN); - if (led_pin_status && LedSw_Count <= LED_SW_DELAY) - LedSw_Count++; - else if (!led_pin_status) - LedSw_Count = 0; - if (LedSw_Count == LED_SW_DELAY){ + const int LED_SW_DELAY = 1000; + bool led_pin_status = READ(LED_SW_PIN); + if (LedSw_Count == LED_SW_DELAY && !led_pin_status){ caselight.on = !caselight.on; caselight.update(true); } + if (led_pin_status && LedSw_Count < LED_SW_DELAY) + LedSw_Count++; + else if (!led_pin_status) + LedSw_Count = 0; #endif #if HAS_HOME diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h index b8ff9df34b..57935dd78d 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h @@ -202,6 +202,14 @@ https://easyeda.com/sst78rust/fb4s-led-control #define FAN_PIN PB1 // FAN +/* +Управление питанием +*/ +#define SUICIDE_PIN PB2 +#define SUICIDE_PIN_INVERTING false +#define KILL_PIN PA2 // Enable MKSPWC DET PIN +#define KILL_PIN_STATE true // Enable MKSPWC PIN STATE + // // Thermocouples // @@ -237,7 +245,7 @@ https://easyeda.com/sst78rust/fb4s-led-control //#define PS_ON_PIN PB2 // PW_OFF #define FIL_RUNOUT_PIN PA4 #ifdef CASE_LED_INSTEAD_E1 - #define LED_SW_PIN PE6 + #define LED_SW_PIN PA2//PE6 #endif #ifndef LED_SW_PIN #define FIL_RUNOUT2_PIN PE6 From 87b632dc0fd4e174d675c1d6b09ad03a9f6aa21c Mon Sep 17 00:00:00 2001 From: X-Dron Date: Tue, 29 Dec 2020 17:55:24 +0300 Subject: [PATCH 23/24] Update Configuration.h --- Marlin/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 6e39d3a047..52efeef6a3 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -749,7 +749,7 @@ * Override with M92 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_AXIS_STEPS_PER_UNIT { 160.0, 160.0, 400, 205.0 } +#define DEFAULT_AXIS_STEPS_PER_UNIT { 160.5, 160.5, 400, 205.0 } /** * Default Max Feed Rate (mm/s) From 23a88910ce4494afadfb36934f789f034618be8e Mon Sep 17 00:00:00 2001 From: X-Dron Date: Sun, 9 May 2021 21:03:34 +0300 Subject: [PATCH 24/24] Last 2.0.7.2 --- Marlin/Configuration.h | 34 ++- Marlin/Configuration_adv.h | 16 +- Marlin/src/lcd/tft/fontdata/helvetica_18.cpp | 235 ++++++++++++++++++ Marlin/src/lcd/tft/tft_color.h | 24 +- Marlin/src/lcd/tft/tft_color.h_old | 176 +++++++++++++ .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 2 +- 6 files changed, 448 insertions(+), 39 deletions(-) create mode 100644 Marlin/src/lcd/tft/tft_color.h_old diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index d79c60c9b3..f990e880a4 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -415,7 +415,7 @@ * 998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below. * 999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below. */ -#define TEMP_SENSOR_0 13 +#define TEMP_SENSOR_0 5 #define TEMP_SENSOR_1 0 #define TEMP_SENSOR_2 0 #define TEMP_SENSOR_3 0 @@ -749,16 +749,16 @@ * Override with M92 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_AXIS_STEPS_PER_UNIT { 160.5, 160.5, 400, 205.0 } +#define DEFAULT_AXIS_STEPS_PER_UNIT { 160.5, 160.5, 400, 200.7 } /** * Default Max Feed Rate (mm/s) * Override with M203 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_MAX_FEEDRATE { 200, 200, 4, 50 } +#define DEFAULT_MAX_FEEDRATE { 200, 200, 4, 70 } -#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2 +//#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2 #if ENABLED(LIMITED_MAX_FR_EDITING) #define MAX_FEEDRATE_EDIT_VALUES { 300, 300, 10, 70 } // ...or, set your own edit limits #endif @@ -774,7 +774,7 @@ #define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2 #if ENABLED(LIMITED_MAX_ACCEL_EDITING) - #define MAX_ACCEL_EDIT_VALUES { 5000, 5000, 100, 5000 } // ...or, set your own edit limits + #define MAX_ACCEL_EDIT_VALUES { 2000, 2000, 100, 1000 } // ...or, set your own edit limits #endif /** @@ -809,11 +809,11 @@ #define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2 #if ENABLED(LIMITED_JERK_EDITING) - #define MAX_JERK_EDIT_VALUES { 30, 30, 2, 20 } // ...or, set your own edit limits + #define MAX_JERK_EDIT_VALUES { 20, 20, 2, 20 } // ...or, set your own edit limits #endif #endif -#define DEFAULT_EJERK 8 // May be used by Linear Advance +#define DEFAULT_EJERK 7 // May be used by Linear Advance /** * Junction Deviation Factor @@ -886,7 +886,7 @@ * Use G29 repeatedly, adjusting the Z height at each point with movement commands * or (with LCD_BED_LEVELING) the LCD controller. */ -#define PROBE_MANUALLY +//#define PROBE_MANUALLY //#define MANUAL_PROBE_START_Z 0.2 /** @@ -910,7 +910,7 @@ /** * The BLTouch probe uses a Hall effect sensor and emulates a servo. */ -//#define BLTOUCH +#define BLTOUCH /** * Pressure sensor with a BLTouch-like interface @@ -997,13 +997,12 @@ * | [-] | * O-- FRONT --+ */ -#define NOZZLE_TO_PROBE_OFFSET { 0, 0, 0 } +#define NOZZLE_TO_PROBE_OFFSET { 37, -20, 0 } // Most probes should stay away from the edges of the bed, but // with NOZZLE_AS_PROBE this can be negative for a wider probing area. #define PROBING_MARGIN 5 - // X and Y axis travel speed (mm/min) between probes #define XY_PROBE_SPEED 3000 @@ -1052,7 +1051,7 @@ #define Z_PROBE_OFFSET_RANGE_MAX 5 // Enable the M48 repeatability test to test probe accuracy -//#define Z_MIN_PROBE_REPEATABILITY_TEST +#define Z_MIN_PROBE_REPEATABILITY_TEST // Before deploy/stow pause for user confirmation //#define PAUSE_BEFORE_DEPLOY_STOW @@ -1164,7 +1163,6 @@ #define X_BED_SIZE 250 #define Y_BED_SIZE 206 - // Travel limits (mm) after homing, corresponding to endstop positions. #define X_MIN_POS 0 #define Y_MIN_POS -2 @@ -1187,7 +1185,7 @@ #if ENABLED(MIN_SOFTWARE_ENDSTOPS) #define MIN_SOFTWARE_ENDSTOP_X #define MIN_SOFTWARE_ENDSTOP_Y - #define MIN_SOFTWARE_ENDSTOP_Z + //#define MIN_SOFTWARE_ENDSTOP_Z #endif // Max software endstops constrain movement within maximum coordinate bounds @@ -1209,9 +1207,9 @@ * RAMPS-based boards use SERVO3_PIN for the first runout sensor. * For other boards you may need to define FIL_RUNOUT_PIN, FIL_RUNOUT2_PIN, etc. */ -#define FILAMENT_RUNOUT_SENSOR +//#define FILAMENT_RUNOUT_SENSOR #if ENABLED(FILAMENT_RUNOUT_SENSOR) - #define FIL_RUNOUT_ENABLED_DEFAULT false // Enable the sensor on startup. Override with M412 followed by M500. + #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500. #define NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each. #define FIL_RUNOUT_STATE HIGH // Pin state indicating that filament is NOT present. //#define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins. @@ -1224,7 +1222,7 @@ // After a runout is detected, continue printing this length of filament // before executing the runout script. Useful for a sensor at the end of // a feed tube. Requires 4 bytes SRAM per sensor, plus 4 bytes overhead. - #define FILAMENT_RUNOUT_DISTANCE_MM 500 + //#define FILAMENT_RUNOUT_DISTANCE_MM 25 #ifdef FILAMENT_RUNOUT_DISTANCE_MM // Enable this option to use an encoder disc that toggles the runout pin @@ -1289,7 +1287,7 @@ * Turn on with the command 'M111 S32'. * NOTE: Requires a lot of PROGMEM! */ -#define DEBUG_LEVELING_FEATURE +//#define DEBUG_LEVELING_FEATURE #if ANY(MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL) // Gradually reduce leveling correction until a set height is reached, diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 58140b8a3e..e04e8a0e75 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -430,7 +430,7 @@ * * Define one or both of these to override the default 0-255 range. */ -//#define FAN_MIN_PWM 50 +#define FAN_MIN_PWM 30 //#define FAN_MAX_PWM 128 /** @@ -1197,7 +1197,7 @@ * an option on the LCD screen to continue the print from the last-known * point in the file. */ - #define POWER_LOSS_RECOVERY + //#define POWER_LOSS_RECOVERY #if ENABLED(POWER_LOSS_RECOVERY) #define PLR_ENABLED_DEFAULT false // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500) //#define BACKUP_POWER_SUPPLY // Backup power / UPS to move the steppers on power loss @@ -1695,10 +1695,10 @@ * the probe to be unable to reach any points. */ #if PROBE_SELECTED && !IS_KINEMATIC - #define PROBING_MARGIN_LEFT PROBING_MARGIN - #define PROBING_MARGIN_RIGHT PROBING_MARGIN - #define PROBING_MARGIN_FRONT PROBING_MARGIN - #define PROBING_MARGIN_BACK PROBING_MARGIN + //#define PROBING_MARGIN_LEFT PROBING_MARGIN + //#define PROBING_MARGIN_RIGHT PROBING_MARGIN + //#define PROBING_MARGIN_FRONT PROBING_MARGIN + //#define PROBING_MARGIN_BACK PROBING_MARGIN #endif #if EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL) @@ -2330,7 +2330,7 @@ #endif #if AXIS_IS_TMC(E0) - #define E0_CURRENT 650 + #define E0_CURRENT 560 #define E0_MICROSTEPS 8 #define E0_RSENSE 0.11 #define E0_CHAIN_POS -1 @@ -3281,7 +3281,7 @@ * * Implement M486 to allow Marlin to skip objects */ -#define CANCEL_OBJECTS +//#define CANCEL_OBJECTS /** * I2C position encoders for closed loop control. diff --git a/Marlin/src/lcd/tft/fontdata/helvetica_18.cpp b/Marlin/src/lcd/tft/fontdata/helvetica_18.cpp index bb5f6ccf40..93498e502c 100644 --- a/Marlin/src/lcd/tft/fontdata/helvetica_18.cpp +++ b/Marlin/src/lcd/tft/fontdata/helvetica_18.cpp @@ -29,6 +29,238 @@ extern const uint8_t Helvetica18_symbols[71] = { 7,7,7,7,0,15,56,124,198,198,198,124,56, // 0x09 - LCD_STR_DEGREE }; +#define ru 4321 +#define test 8765 +#if (LCD_LANGUAGE == ru) || (LCD_LANGUAGE == test) +extern const uint8_t Helvetica18[8541] = { + 0,28,37,253,248,19,4,37,9,49,32,255,251,24,251,19,251, // tFont +/* */ 0, 0, 0, 6, 0, 1, +/*!*/ 3, 9, 9, 7, 2, 0, 0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0, +/*"*/ 5, 6, 6, 9, 2, 13, 0xD8,0xD8,0xD8,0xD8,0xD8,0x90, +/*#*/ 12, 18, 36, 14, 0, 0, 0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0x7F,0xF0,0x7F,0xF0,0x19,0x80,0x19,0x80,0x19,0x80,0x19,0x80,0xFF,0xE0,0xFF,0xE0,0x33,0x0,0x33,0x0,0x33,0x0,0x33,0x0,0x33,0x0, +/*$*/ 12, 21, 42, 13, 0, 254, 0x6,0x0,0x3F,0x80,0x7F,0xC0,0xF6,0xE0,0xE6,0xE0,0xE6,0xE0,0xF6,0x0,0x7E,0x0,0x3E,0x0,0xF,0x0,0x7,0xC0,0x7,0xE0,0x6,0xF0,0xE6,0x70,0xE6,0x70,0xE6,0x70,0xF6,0xF0,0x7F,0xE0,0x1F,0xC0,0x6,0x0,0x6,0x0, +/*%*/ 21, 18, 54, 22, 0, 0, 0x0,0x7,0x0,0x3E,0x7,0x0,0x7F,0xE,0x0,0xE3,0x8E,0x0,0xC1,0x9C,0x0,0xC1,0x9C,0x0,0xE3,0xB8,0x0,0x7F,0x38,0x0,0x3E,0x70,0x0,0x0,0x70,0x0,0x0,0xE3,0xE0,0x0,0xE7,0xF0,0x1,0xCE,0x38,0x1,0xCC,0x18,0x3,0x8C,0x18,0x3,0x8E,0x38,0x7,0x7,0xF0,0x7,0x3,0xE0, +/*&*/ 16, 18, 36, 18, 1, 0, 0xF,0x80,0x1F,0xC0,0x3D,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x1D,0xC0,0xF,0x80,0x1F,0x0,0x3F,0x9C,0x7B,0xDC,0x71,0xFC,0xE0,0xF8,0xE0,0x70,0xE0,0xF8,0xF1,0xFC,0x7F,0xCE,0x1F,0x87, +/*'*/ 3, 6, 6, 7, 2, 13, 0xE0,0xE0,0xE0,0x60,0x60,0xC0, +/*(*/ 6, 24, 24, 8, 1, 251, 0xC,0x1C,0x38,0x38,0x70,0x70,0x60,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0x60,0x70,0x70,0x38,0x38,0x1C,0x0, +/*)*/ 6, 24, 24, 8, 1, 251, 0xC0,0xE0,0x70,0x70,0x38,0x38,0x18,0x1C,0x1C,0x1C,0x1C,0x1C,0x1C,0x1C,0x1C,0x1C,0x1C,0x18,0x38,0x38,0x70,0x70,0xE0,0x0, +/***/ 8, 7, 7, 10, 1, 12, 0x18,0x18,0xDB,0xFF,0x3C,0x66,0x66, +/*+*/ 11, 12, 24, 15, 2, 1, 0xE,0x0,0xE,0x0,0xE,0x0,0xE,0x0,0xE,0x0,0xFF,0xE0,0xFF,0xE0,0xE,0x0,0xE,0x0,0xE,0x0,0xE,0x0,0xE,0x0, +/*,*/ 3, 6, 6, 7, 2, 253, 0xE0,0xE0,0xE0,0x60,0x60,0xC0, +/*-*/ 12, 2, 4, 15, 1, 6, 0xFF,0xF0,0xFF,0xF0, +/*.*/ 3, 3, 3, 7, 2, 0, 0xE0,0xE0,0xE0, +/*/*/ 8, 19, 19, 8, 0, 0, 0x7,0x7,0x6,0x6,0xE,0xC,0xC,0x1C,0x1C,0x18,0x18,0x38,0x30,0x30,0x70,0x60,0x60,0xE0,0xE0, +/*0*/ 12, 18, 36, 13, 0, 0, 0x1F,0x80,0x3F,0xC0,0x79,0xE0,0x70,0xE0,0x70,0xE0,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0x70,0xE0,0x70,0xE0,0x79,0xE0,0x3F,0xC0,0x1F,0x80, +/*1*/ 7, 18, 18, 13, 2, 0, 0xE,0xE,0x1E,0xFE,0xFE,0xE,0xE,0xE,0xE,0xE,0xE,0xE,0xE,0xE,0xE,0xE,0xE,0xE, +/*2*/ 12, 18, 36, 13, 0, 0, 0x1F,0x0,0x7F,0xC0,0x71,0xE0,0xE0,0xE0,0xE0,0x70,0xE0,0x70,0x0,0x70,0x0,0xE0,0x1,0xE0,0x3,0xC0,0x7,0x80,0x1F,0x0,0x3C,0x0,0x78,0x0,0xF0,0x0,0xE0,0x0,0xFF,0xF0,0xFF,0xF0, +/*3*/ 12, 18, 36, 13, 0, 0, 0x1F,0x0,0x7F,0xC0,0x71,0xC0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0x0,0xE0,0x1,0xC0,0xF,0x80,0xF,0xE0,0x0,0xE0,0x0,0x70,0x0,0x70,0xE0,0x70,0xE0,0xF0,0x71,0xE0,0x7F,0xE0,0x1F,0x80, +/*4*/ 12, 18, 36, 13, 0, 0, 0x1,0xC0,0x3,0xC0,0x3,0xC0,0x7,0xC0,0x7,0xC0,0xD,0xC0,0x1D,0xC0,0x19,0xC0,0x31,0xC0,0x71,0xC0,0x61,0xC0,0xE1,0xC0,0xFF,0xF0,0xFF,0xF0,0x1,0xC0,0x1,0xC0,0x1,0xC0,0x1,0xC0, +/*5*/ 12, 18, 36, 13, 0, 0, 0x7F,0xE0,0x7F,0xE0,0x70,0x0,0x70,0x0,0x70,0x0,0x70,0x0,0x7F,0x80,0x7F,0xC0,0x71,0xE0,0x0,0xE0,0x0,0x70,0x0,0x70,0x0,0x70,0xE0,0x70,0xE0,0xF0,0xF1,0xE0,0x7F,0xC0,0x1F,0x80, +/*6*/ 12, 18, 36, 13, 0, 0, 0xF,0x80,0x3F,0xE0,0x78,0xE0,0x70,0x70,0xE0,0x70,0xE0,0x0,0xE0,0x0,0xEF,0x0,0xFF,0xC0,0xF9,0xE0,0xF0,0xE0,0xE0,0x70,0xE0,0x70,0xE0,0x70,0x70,0xE0,0x79,0xE0,0x3F,0xC0,0x1F,0x80, +/*7*/ 12, 18, 36, 13, 0, 0, 0xFF,0xF0,0xFF,0xF0,0x0,0xF0,0x0,0xE0,0x1,0xC0,0x1,0xC0,0x3,0x80,0x3,0x80,0x7,0x0,0x7,0x0,0xE,0x0,0xE,0x0,0x1E,0x0,0x1C,0x0,0x1C,0x0,0x3C,0x0,0x38,0x0,0x38,0x0, +/*8*/ 12, 18, 36, 13, 0, 0, 0xF,0x0,0x3F,0xC0,0x39,0xC0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x39,0xC0,0x1F,0x80,0x3F,0xC0,0x70,0xE0,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0x70,0xE0,0x7F,0xE0,0x1F,0x80, +/*9*/ 12, 18, 36, 13, 0, 0, 0x1F,0x80,0x7F,0xC0,0x79,0xE0,0xF0,0xE0,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xF0,0xF0,0x79,0xF0,0x7F,0xF0,0x1F,0x70,0x0,0x70,0x0,0x70,0xE0,0xE0,0xF3,0xE0,0x7F,0xC0,0x1F,0x0, +/*:*/ 3, 14, 14, 7, 2, 0, 0xE0,0xE0,0xE0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xE0,0xE0,0xE0, +/*;*/ 3, 17, 17, 7, 2, 253, 0xE0,0xE0,0xE0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xE0,0xE0,0xE0,0x60,0x60,0xC0, +/*<*/ 13, 12, 24, 15, 0, 1, 0x0,0x38,0x0,0xF8,0x3,0xE0,0xF,0x80,0x3E,0x0,0xF0,0x0,0xF0,0x0,0x3E,0x0,0xF,0x80,0x3,0xE0,0x0,0xF8,0x0,0x38, +/*=*/ 10, 6, 12, 14, 2, 4, 0xFF,0xC0,0xFF,0xC0,0x0,0x0,0x0,0x0,0xFF,0xC0,0xFF,0xC0, +/*>*/ 13, 12, 24, 14, 0, 1, 0xE0,0x0,0xF8,0x0,0x3E,0x0,0xF,0x80,0x3,0xE0,0x0,0x78,0x0,0x78,0x3,0xE0,0xF,0x80,0x3E,0x0,0xF8,0x0,0xE0,0x0, +/*?*/ 11, 19, 38, 15, 2, 0, 0x1F,0x80,0x7F,0xC0,0x79,0xE0,0xF0,0xE0,0xE0,0xE0,0xE1,0xE0,0x1,0xC0,0x3,0xC0,0x7,0x80,0x7,0x0,0xE,0x0,0xE,0x0,0xE,0x0,0xE,0x0,0x0,0x0,0x0,0x0,0xE,0x0,0xE,0x0,0xE,0x0, +/*@*/ 22, 22, 66, 24, 1, 252, 0x1,0xFF,0x0,0x7,0xFF,0xC0,0xF,0x81,0xF0,0x1E,0x0,0x78,0x3C,0x0,0x38,0x78,0x7D,0x9C,0x70,0xFF,0x9C,0xF1,0xC7,0x1C,0xE3,0x87,0x1C,0xE3,0xE,0x1C,0xE7,0xE,0x38,0xE7,0xC,0x38,0xE7,0x1C,0x70,0xE7,0x1C,0x70,0xE3,0x9D,0xE0,0xF3,0xFF,0xC0,0x71,0xF7,0x0,0x78,0x0,0x0,0x3C,0x0,0x0,0x1F,0x7,0x0,0xF,0xFF,0x0,0x3,0xFC,0x0, +/*A*/ 16, 19, 38, 18, 1, 0, 0x3,0xC0,0x3,0xC0,0x7,0xE0,0x7,0xE0,0xE,0x60,0xE,0x70,0xE,0x70,0x1C,0x38,0x1C,0x38,0x1C,0x38,0x38,0x1C,0x38,0x1C,0x3F,0xFC,0x7F,0xFE,0x70,0xE,0x70,0xE,0xE0,0x7,0xE0,0x7,0xE0,0x7, +/*B*/ 15, 19, 38, 18, 2, 0, 0xFF,0xE0,0xFF,0xF8,0xE0,0x78,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x38,0xFF,0xF0,0xFF,0xF8,0xE0,0x1C,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0x1E,0xE0,0x7C,0xFF,0xF8,0xFF,0xE0, +/*C*/ 16, 19, 38, 18, 1, 0, 0x7,0xF0,0x1F,0xFC,0x3E,0x3E,0x78,0xF,0x70,0x7,0xF0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xF0,0x7,0x70,0x7,0x78,0xF,0x3E,0x3E,0x1F,0xFC,0x7,0xF0, +/*D*/ 16, 19, 38, 19, 2, 0, 0xFF,0xE0,0xFF,0xF8,0xE0,0x7C,0xE0,0x1E,0xE0,0xE,0xE0,0xF,0xE0,0x7,0xE0,0x7,0xE0,0x7,0xE0,0x7,0xE0,0x7,0xE0,0x7,0xE0,0x7,0xE0,0xF,0xE0,0xE,0xE0,0x1E,0xE0,0x7C,0xFF,0xF8,0xFF,0xE0, +/*E*/ 13, 19, 38, 16, 2, 0, 0xFF,0xF0,0xFF,0xF0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xFF,0xE0,0xFF,0xE0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xFF,0xF8,0xFF,0xF8, +/*F*/ 12, 19, 38, 15, 2, 0, 0xFF,0xF0,0xFF,0xF0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xFF,0xE0,0xFF,0xE0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0, +/*G*/ 17, 19, 57, 19, 1, 0, 0x7,0xF0,0x0,0x1F,0xFC,0x0,0x3E,0x3E,0x0,0x78,0xF,0x0,0x70,0x7,0x0,0xF0,0x0,0x0,0xE0,0x0,0x0,0xE0,0x0,0x0,0xE0,0x0,0x0,0xE0,0x7F,0x80,0xE0,0x7F,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xF0,0x3,0x80,0x70,0x7,0x80,0x78,0xF,0x80,0x3E,0x3F,0x80,0x1F,0xFB,0x80,0x7,0xF1,0x80, +/*H*/ 15, 19, 38, 19, 2, 0, 0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xFF,0xFE,0xFF,0xFE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE, +/*I*/ 3, 19, 19, 7, 2, 0, 0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0, +/*J*/ 11, 19, 38, 14, 1, 0, 0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0x71,0xE0,0x7F,0xC0,0x3F,0x80, +/*K*/ 16, 19, 38, 18, 2, 0, 0xE0,0x3C,0xE0,0x78,0xE0,0xF0,0xE1,0xE0,0xE3,0xC0,0xE7,0x80,0xEF,0x0,0xFE,0x0,0xFE,0x0,0xFF,0x0,0xF7,0x80,0xE3,0xC0,0xE1,0xE0,0xE0,0xF0,0xE0,0x78,0xE0,0x3C,0xE0,0x1E,0xE0,0xF,0xE0,0x7, +/*L*/ 12, 19, 38, 15, 2, 0, 0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xFF,0xF0,0xFF,0xF0, +/*M*/ 19, 19, 57, 23, 2, 0, 0xE0,0x0,0xE0,0xF0,0x1,0xE0,0xF0,0x1,0xE0,0xF8,0x3,0xE0,0xF8,0x3,0xE0,0xFC,0x7,0xE0,0xEC,0x6,0xE0,0xEE,0xE,0xE0,0xE6,0xC,0xE0,0xE7,0x1C,0xE0,0xE7,0x1C,0xE0,0xE3,0x18,0xE0,0xE3,0xB8,0xE0,0xE3,0xB8,0xE0,0xE1,0xF0,0xE0,0xE1,0xF0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0, +/*N*/ 15, 19, 38, 19, 2, 0, 0xE0,0xE,0xF0,0xE,0xF0,0xE,0xF8,0xE,0xF8,0xE,0xFC,0xE,0xEE,0xE,0xEE,0xE,0xE7,0xE,0xE3,0x8E,0xE3,0x8E,0xE1,0xCE,0xE0,0xCE,0xE0,0xEE,0xE0,0x7E,0xE0,0x3E,0xE0,0x3E,0xE0,0x1E,0xE0,0xE, +/*O*/ 17, 19, 57, 19, 1, 0, 0x7,0xF0,0x0,0x1F,0xFC,0x0,0x3E,0x3E,0x0,0x78,0xF,0x0,0x70,0x7,0x0,0xF0,0x7,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xF0,0x7,0x80,0x70,0x7,0x0,0x78,0xF,0x0,0x3E,0x3E,0x0,0x1F,0xFC,0x0,0x7,0xF0,0x0, +/*P*/ 14, 19, 38, 17, 2, 0, 0xFF,0xE0,0xFF,0xF8,0xE0,0x38,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x38,0xFF,0xF8,0xFF,0xF0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0, +/*Q*/ 17, 19, 57, 19, 1, 0, 0x7,0xF0,0x0,0x1F,0xFC,0x0,0x3E,0x3E,0x0,0x78,0xF,0x0,0x70,0x7,0x0,0xF0,0x7,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xF0,0x7,0x80,0x70,0xF7,0x0,0x78,0x7F,0x0,0x3E,0x1E,0x0,0x1F,0xFF,0x0,0x7,0xF7,0x80, +/*R*/ 14, 19, 38, 17, 2, 0, 0xFF,0xE0,0xFF,0xF8,0xE0,0x38,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x38,0xFF,0xF8,0xFF,0xF0,0xE0,0x78,0xE0,0x38,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C, +/*S*/ 15, 19, 38, 17, 1, 0, 0x7,0xE0,0x1F,0xF8,0x3C,0x7C,0x78,0x1C,0x70,0x1C,0x70,0x0,0x78,0x0,0x3E,0x0,0x1F,0xE0,0x3,0xF8,0x0,0x7C,0x0,0x1E,0x0,0xE,0xE0,0xE,0xE0,0xE,0xF0,0x1E,0x7C,0x7C,0x3F,0xF8,0xF,0xE0, +/*T*/ 15, 19, 38, 15, 0, 0, 0xFF,0xFE,0xFF,0xFE,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80, +/*U*/ 15, 19, 38, 19, 2, 0, 0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xF0,0x1E,0x70,0x1C,0x7C,0x7C,0x3F,0xF8,0xF,0xE0, +/*V*/ 16, 19, 38, 18, 1, 0, 0xE0,0x7,0xE0,0x7,0xF0,0xF,0x70,0xE,0x78,0x1E,0x38,0x1C,0x38,0x1C,0x3C,0x3C,0x1C,0x38,0x1C,0x38,0x1E,0x78,0xE,0x70,0xE,0x70,0xE,0x70,0x7,0xE0,0x7,0xE0,0x3,0xC0,0x3,0xC0,0x3,0xC0, +/*W*/ 21, 19, 57, 23, 1, 0, 0xE0,0x70,0x38,0xE0,0x70,0x38,0xE0,0x70,0x38,0xE0,0x70,0x38,0x70,0xF8,0x70,0x70,0xF8,0x70,0x70,0xD8,0x70,0x71,0xDC,0x70,0x31,0xDC,0x60,0x39,0xDC,0xE0,0x39,0x8C,0xE0,0x3B,0x8E,0xE0,0x1B,0x8E,0xC0,0x1B,0x8E,0xC0,0x1F,0x7,0xC0,0x1F,0x7,0xC0,0xE,0x3,0x80,0xE,0x3,0x80,0xE,0x3,0x80, +/*X*/ 16, 19, 38, 18, 1, 0, 0xE0,0x7,0xF0,0xF,0x78,0x1E,0x38,0x1C,0x1C,0x38,0xE,0x70,0xF,0xF0,0x7,0xE0,0x3,0xC0,0x3,0xC0,0x7,0xE0,0xF,0xF0,0xE,0x70,0x1C,0x38,0x3C,0x3C,0x38,0x1C,0x70,0xE,0xF0,0xF,0xE0,0x7, +/*Y*/ 15, 19, 38, 17, 1, 0, 0xE0,0xE,0xF0,0x1E,0x70,0x1C,0x78,0x3C,0x38,0x38,0x3C,0x78,0x1C,0x70,0x1E,0xF0,0xE,0xE0,0xF,0xE0,0x7,0xC0,0x7,0xC0,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80, +/*Z*/ 14, 19, 38, 16, 1, 0, 0xFF,0xFC,0xFF,0xFC,0x0,0x3C,0x0,0x78,0x0,0xF0,0x1,0xE0,0x1,0xE0,0x3,0xC0,0x7,0x80,0x7,0x80,0xF,0x0,0x1E,0x0,0x1E,0x0,0x3C,0x0,0x38,0x0,0x78,0x0,0xF0,0x0,0xFF,0xFC,0xFF,0xFC, +/*[*/ 5, 24, 24, 8, 1, 251, 0xF8,0xF8,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xF8,0x0, +/*\*/ 8, 19, 19, 8, 0, 0, 0xE0,0xE0,0x60,0x60,0x70,0x30,0x30,0x38,0x38,0x18,0x18,0x1C,0xC,0xC,0xE,0x6,0x6,0x7,0x7, +/*]*/ 5, 24, 24, 8, 2, 251, 0xF8,0xF8,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0xF8,0x0, +/*^*/ 11, 9, 18, 14, 1, 10, 0xE,0x0,0xE,0x0,0x1F,0x0,0x1B,0x0,0x3B,0x80,0x71,0xC0,0x71,0xC0,0xE0,0xE0,0xE0,0xE0, +/*_*/ 14, 2, 4, 14, 0, 251, 0xFF,0xFC,0xFF,0xFC, +/*`*/ 3, 6, 6, 7, 2, 13, 0x60,0xC0,0xC0,0xE0,0xE0,0xE0, +/*a*/ 12, 14, 28, 14, 1, 0, 0x1F,0x80,0x3F,0xC0,0x71,0xE0,0x70,0xE0,0x0,0xE0,0x7,0xE0,0x3F,0xE0,0x7C,0xE0,0xF0,0xE0,0xE0,0xE0,0xE1,0xE0,0xF3,0xE0,0x7F,0xF0,0x3E,0x70, +/*b*/ 12, 19, 38, 15, 2, 0, 0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xEF,0x80,0xFF,0xC0,0xF9,0xE0,0xF0,0xE0,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xF0,0xE0,0xF9,0xE0,0xFF,0xC0,0xEF,0x80, +/*c*/ 11, 14, 28, 13, 1, 0, 0x1F,0x80,0x3F,0xC0,0x79,0xE0,0x70,0xE0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0x70,0xE0,0x79,0xE0,0x3F,0xC0,0x1F,0x80, +/*d*/ 12, 19, 38, 15, 1, 0, 0x0,0x70,0x0,0x70,0x0,0x70,0x0,0x70,0x0,0x70,0x1F,0x70,0x3F,0xF0,0x79,0xF0,0x70,0xF0,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0x70,0xF0,0x79,0xF0,0x3F,0xF0,0x1F,0x70, +/*e*/ 12, 14, 28, 14, 1, 0, 0xF,0x0,0x3F,0xC0,0x79,0xE0,0x70,0xE0,0xE0,0x70,0xE0,0x70,0xFF,0xF0,0xFF,0xF0,0xE0,0x0,0xE0,0x0,0x70,0x70,0x78,0xF0,0x3F,0xE0,0xF,0x80, +/*f*/ 7, 19, 19, 9, 1, 0, 0x1E,0x3E,0x38,0x38,0x38,0xFE,0xFE,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38, +/*g*/ 12, 19, 38, 15, 1, 251, 0x1F,0x70,0x3F,0xF0,0x79,0xF0,0x70,0xF0,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0x70,0xF0,0x79,0xF0,0x3F,0xF0,0x1F,0x70,0x0,0x70,0xE0,0x70,0xF0,0xE0,0x7F,0xE0,0x1F,0x80, +/*h*/ 11, 19, 38, 15, 2, 0, 0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xEF,0x0,0xFF,0xC0,0xF1,0xC0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0, +/*i*/ 3, 19, 19, 7, 2, 0, 0xE0,0xE0,0xE0,0x0,0x0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0, +/*j*/ 5, 24, 24, 7, 0, 251, 0x38,0x38,0x38,0x0,0x0,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0xF8,0x0, +/*k*/ 12, 19, 38, 14, 2, 0, 0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE1,0xE0,0xE3,0xC0,0xE7,0x80,0xEF,0x0,0xFE,0x0,0xFC,0x0,0xFE,0x0,0xEF,0x0,0xE7,0x0,0xE7,0x80,0xE3,0xC0,0xE1,0xC0,0xE1,0xE0,0xE0,0xF0, +/*l*/ 3, 19, 19, 7, 2, 0, 0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0, +/*m*/ 17, 14, 42, 21, 2, 0, 0xEF,0x3E,0x0,0xFF,0xFF,0x0,0xF3,0xE7,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80, +/*n*/ 11, 14, 28, 15, 2, 0, 0xEF,0x80,0xFF,0xC0,0xF1,0xC0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0, +/*o*/ 12, 14, 28, 14, 1, 0, 0xF,0x0,0x3F,0xC0,0x79,0xE0,0x70,0xE0,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0x70,0xE0,0x79,0xE0,0x3F,0xC0,0xF,0x0, +/*p*/ 12, 19, 38, 15, 2, 251, 0xEF,0x80,0xFF,0xC0,0xF9,0xE0,0xF0,0xE0,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xF0,0xE0,0xF9,0xE0,0xFF,0xC0,0xEF,0x80,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0, +/*q*/ 12, 19, 38, 15, 1, 251, 0x1F,0x70,0x3F,0xF0,0x79,0xF0,0x70,0xF0,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0x70,0xF0,0x79,0xF0,0x3F,0xF0,0x1F,0x70,0x0,0x70,0x0,0x70,0x0,0x70,0x0,0x70,0x0,0x70, +/*r*/ 7, 14, 14, 10, 2, 0, 0xE6,0xEE,0xFE,0xF0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0, +/*s*/ 11, 14, 28, 13, 1, 0, 0x3F,0x0,0x7F,0x80,0xF3,0xC0,0xE1,0xC0,0xE0,0x0,0xFC,0x0,0x7F,0x80,0xF,0xC0,0x1,0xE0,0xE0,0xE0,0xE0,0xE0,0xF1,0xE0,0x7F,0xC0,0x3F,0x80, +/*t*/ 7, 18, 18, 9, 1, 0, 0x38,0x38,0x38,0x38,0xFE,0xFE,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x3E,0x1E, +/*u*/ 11, 14, 28, 15, 2, 0, 0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE1,0xE0,0x73,0xE0,0x7E,0xE0,0x1C,0xE0, +/*v*/ 12, 14, 28, 14, 1, 0, 0xE0,0x70,0xE0,0x70,0xE0,0x70,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x39,0xC0,0x39,0xC0,0x39,0xC0,0x1F,0x80,0x1F,0x80,0xF,0x0,0xF,0x0,0xF,0x0, +/*w*/ 19, 14, 42, 19, 0, 0, 0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0x60,0xE0,0xC0,0x71,0xF1,0xC0,0x71,0xF1,0xC0,0x31,0xB1,0x80,0x33,0xB9,0x80,0x3B,0xBB,0x80,0x1B,0x1B,0x0,0x1F,0x1F,0x0,0x1F,0x1F,0x0,0xE,0xE,0x0,0xE,0xE,0x0,0xE,0xE,0x0, +/*x*/ 11, 14, 28, 13, 1, 0, 0xE0,0xE0,0xF1,0xE0,0x71,0xC0,0x3B,0x80,0x3F,0x80,0x1F,0x0,0xE,0x0,0x1F,0x0,0x1F,0x0,0x3B,0x80,0x7B,0xC0,0x71,0xC0,0xF1,0xE0,0xE0,0xE0, +/*y*/ 13, 19, 38, 15, 1, 251, 0xE0,0x38,0xE0,0x38,0x70,0x38,0x78,0x70,0x38,0x70,0x3C,0xF0,0x1C,0xE0,0x1C,0xE0,0xF,0xC0,0xF,0xC0,0x7,0xC0,0x7,0x80,0x3,0x80,0x3,0x80,0x7,0x0,0x7,0x0,0xE,0x0,0x3E,0x0,0x3C,0x0, +/*z*/ 11, 14, 28, 13, 1, 0, 0xFF,0xE0,0xFF,0xE0,0x1,0xC0,0x3,0x80,0x7,0x80,0xF,0x0,0xE,0x0,0x1E,0x0,0x3C,0x0,0x38,0x0,0x70,0x0,0xF0,0x0,0xFF,0xE0,0xFF,0xE0, +/*{*/ 7, 24, 24, 10, 1, 251, 0xE,0x1C,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x70,0xE0,0xE0,0x70,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x1C,0x0, +/*|*/ 3, 24, 24, 7, 2, 251, 0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0x0, +/*}*/ 7, 24, 24, 10, 2, 251, 0xE0,0x70,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x1C,0xE,0xE,0x1C,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x70,0x0, +/*~*/ 11, 4, 8, 14, 1, 5, 0x78,0xE0,0xFE,0xE0,0xEF,0xE0,0xE3,0xC0, +/**/ 0xFF, +/*Ђ*/ 0xFF, +/*Ѓ*/ 0xFF, +/*‚*/ 0xFF, +/*ѓ*/ 0xFF, +/*„*/ 0xFF, +/*…*/ 0xFF, +/*†*/ 0xFF, +/*‡*/ 0xFF, +/*€*/ 0xFF, +/*‰*/ 0xFF, +/*Љ*/ 0xFF, +/*‹*/ 0xFF, +/*Њ*/ 0xFF, +/*Ќ*/ 0xFF, +/*Ћ*/ 0xFF, +/*Џ*/ 0xFF, +/*А*/ 16, 19, 38, 18, 1, 0, 0x3,0xC0,0x3,0xC0,0x7,0xE0,0x7,0xE0,0xE,0x60,0xE,0x70,0xE,0x70,0x1C,0x38,0x1C,0x38,0x1C,0x38,0x38,0x1C,0x38,0x1C,0x3F,0xFC,0x7F,0xFE,0x70,0xE,0x70,0xE,0xE0,0x7,0xE0,0x7,0xE0,0x7, +/*Б*/ 15, 19, 38, 18, 2, 0, 0xFF,0xFE,0xFF,0xFE,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xFF,0xF0,0xFF,0xF8,0xE0,0x1C,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0x1E,0xE0,0x7C,0xFF,0xF8,0xFF,0xE0, +/*В*/ 15, 19, 38, 18, 2, 0, 0xFF,0xE0,0xFF,0xF8,0xE0,0x78,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x38,0xFF,0xF0,0xFF,0xF8,0xE0,0x1C,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0x1E,0xE0,0x7C,0xFF,0xF8,0xFF,0xE0, +/*Г*/ 12, 19, 38, 15, 2, 0, 0xFF,0xF0,0xFF,0xF0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0, +/*Д*/ 19, 22, 66, 21, 1, 253, 0xF,0xFF,0x80,0xF,0xFF,0x80,0xE,0x3,0x80,0xE,0x3,0x80,0xE,0x3,0x80,0xE,0x3,0x80,0xE,0x3,0x80,0xE,0x3,0x80,0xE,0x3,0x80,0xE,0x3,0x80,0xE,0x3,0x80,0xE,0x3,0x80,0xE,0x3,0x80,0xE,0x3,0x80,0xE,0x3,0x80,0x1C,0x3,0x80,0x38,0x3,0x80,0xFF,0xFF,0xE0,0xFF,0xFF,0xE0,0xE0,0x0,0xE0,0xE0,0x0,0xE0,0xE0,0x0,0xE0, +/*Е*/ 13, 19, 38, 16, 2, 0, 0xFF,0xF0,0xFF,0xF0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xFF,0xE0,0xFF,0xE0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xFF,0xF8,0xFF,0xF8, +/*Ж*/ 19, 19, 57, 23, 2, 0, 0xE0,0xE0,0xE0,0xF0,0xE1,0xE0,0xF8,0xE3,0xE0,0x7C,0xE7,0xC0,0x3E,0xEF,0x80,0x1F,0xFF,0x0,0xF,0xFE,0x0,0x7,0xFC,0x0,0x3,0xF8,0x0,0x7,0xFC,0x0,0xF,0xFE,0x0,0x1F,0xFF,0x0,0x3E,0xEF,0x80,0x7C,0xE7,0xC0,0xF8,0xE3,0xE0,0xF0,0xE1,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0, +/*З*/ 12, 19, 38, 13, 0, 0, 0x1F,0x0,0x7F,0xC0,0x71,0xC0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0x0,0xE0,0x1,0xE0,0xF,0xC0,0xF,0x80,0x1,0xE0,0x0,0xE0,0x0,0x70,0x0,0x70,0xE0,0x70,0xE0,0xF0,0x71,0xE0,0x7F,0xE0,0x1F,0x80, +/*И*/ 15, 19, 38, 19, 2, 0, 0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0x1E,0xE0,0x3E,0xE0,0x7E,0xE0,0xEE,0xE1,0xCE,0xE3,0x8E,0xE7,0xE,0xEE,0xE,0xFC,0xE,0xF8,0xE,0xF0,0xE,0xE0,0xE,0xE0,0xE, +/*Й*/ 15, 22, 44, 19, 2, 0, 0xC,0x60,0xF,0xE0,0x7,0xC0,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0x1E,0xE0,0x3E,0xE0,0x7E,0xE0,0xEE,0xE1,0xCE,0xE3,0x8E,0xE7,0xE,0xEE,0xE,0xFC,0xE,0xF8,0xE,0xF0,0xE,0xE0,0xE,0xE0,0xE, +/*К*/ 16, 19, 38, 18, 2, 0, 0xE0,0x3C,0xE0,0x78,0xE0,0xF0,0xE1,0xE0,0xE3,0xC0,0xE7,0x80,0xEF,0x0,0xFE,0x0,0xFE,0x0,0xFF,0x0,0xF7,0x80,0xE3,0xC0,0xE1,0xE0,0xE0,0xF0,0xE0,0x78,0xE0,0x3C,0xE0,0x1E,0xE0,0xF,0xE0,0x7, +/*Л*/ 15, 19, 38, 19, 2, 0, 0x1,0xFE,0x7,0xFE,0xE,0xE,0x1C,0xE,0x38,0xE,0x38,0xE,0x38,0xE,0x38,0xE,0x38,0xE,0x38,0xE,0x38,0xE,0x38,0xE,0x38,0xE,0x38,0xE,0x38,0xE,0x38,0xE,0x38,0xE,0x70,0xE,0xE0,0xE, +/*М*/ 19, 19, 57, 23, 2, 0, 0xE0,0x0,0xE0,0xF0,0x1,0xE0,0xF0,0x1,0xE0,0xF8,0x3,0xE0,0xF8,0x3,0xE0,0xFC,0x7,0xE0,0xEC,0x6,0xE0,0xEE,0xE,0xE0,0xE6,0xC,0xE0,0xE7,0x1C,0xE0,0xE7,0x1C,0xE0,0xE3,0x18,0xE0,0xE3,0xB8,0xE0,0xE3,0xB8,0xE0,0xE1,0xF0,0xE0,0xE1,0xF0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0, +/*Н*/ 15, 19, 38, 19, 2, 0, 0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xFF,0xFE,0xFF,0xFE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE, +/*О*/ 17, 19, 57, 19, 1, 0, 0x7,0xF0,0x0,0x1F,0xFC,0x0,0x3E,0x3E,0x0,0x78,0xF,0x0,0x70,0x7,0x0,0xF0,0x7,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xF0,0x7,0x80,0x70,0x7,0x0,0x78,0xF,0x0,0x3E,0x3E,0x0,0x1F,0xFC,0x0,0x7,0xF0,0x0, +/*П*/ 15, 19, 38, 19, 2, 0, 0xFF,0xFE,0xFF,0xFE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE, +/*Р*/ 14, 19, 38, 17, 2, 0, 0xFF,0xE0,0xFF,0xF8,0xE0,0x38,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x38,0xFF,0xF8,0xFF,0xF0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0, +/*С*/ 16, 19, 38, 18, 1, 0, 0x7,0xF0,0x1F,0xFC,0x3E,0x3E,0x78,0xF,0x70,0x7,0xF0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xF0,0x7,0x70,0x7,0x78,0xF,0x3E,0x3E,0x1F,0xFC,0x7,0xF0, +/*Т*/ 15, 19, 38, 15, 0, 0, 0xFF,0xFE,0xFF,0xFE,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80,0x3,0x80, +/*У*/ 15, 19, 38, 17, 1, 0, 0xE0,0xE,0xF0,0x1E,0x70,0x1C,0x78,0x3C,0x38,0x38,0x3C,0x78,0x1C,0x70,0x1E,0xF0,0xE,0xE0,0xF,0xE0,0x7,0xC0,0x7,0xC0,0x3,0x80,0x7,0x0,0xE,0x0,0x1C,0x0,0x38,0x0,0x70,0x0,0xE0,0x0, +/*Ф*/ 17, 23, 69, 19, 1, 253, 0x1,0xC0,0x0,0x7,0xF0,0x0,0x1F,0xFC,0x0,0x3F,0xFE,0x0,0x79,0xCF,0x0,0x71,0xC7,0x0,0xF1,0xC7,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xF1,0xC7,0x80,0x71,0xC7,0x0,0x79,0xCF,0x0,0x3F,0xFE,0x0,0x1F,0xFC,0x0,0x7,0xF0,0x0,0x1,0xC0,0x0,0x1,0xC0,0x0,0x1,0xC0,0x0, +/*Х*/ 16, 19, 38, 18, 1, 0, 0xE0,0x7,0xF0,0xF,0x78,0x1E,0x38,0x1C,0x1C,0x38,0xE,0x70,0xF,0xF0,0x7,0xE0,0x3,0xC0,0x3,0xC0,0x7,0xE0,0xF,0xF0,0xE,0x70,0x1C,0x38,0x3C,0x3C,0x38,0x1C,0x70,0xE,0xF0,0xF,0xE0,0x7, +/*Ц*/ 16, 22, 44, 20, 2, 253, 0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xFF,0xFF,0xFF,0xFF,0x0,0x7,0x0,0x7,0x0,0x7, +/*Ч*/ 12, 19, 38, 14, 1, 0, 0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xFF,0xF0,0x7F,0xF0,0x0,0x70,0x0,0x70,0x0,0x70,0x0,0x70,0x0,0x70,0x0,0x70, +/*Ш*/ 19, 19, 57, 23, 2, 0, 0xE0,0x0,0xE0,0xE0,0x0,0xE0,0xE0,0x0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xFF,0xFF,0xE0,0xFF,0xFF,0xE0, +/*Щ*/ 19, 22, 66, 23, 2, 253, 0xE0,0x3,0x80,0xE0,0x3,0x80,0xE0,0x3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xFF,0xFF,0xE0,0xFF,0xFF,0xE0,0x0,0x0,0xE0,0x0,0x0,0xE0,0x0,0x0,0xE0, +/*Ъ*/ 15, 19, 38, 17, 1, 0, 0xFE,0x0,0xFE,0x0,0xE,0x0,0xE,0x0,0xE,0x0,0xE,0x0,0xF,0xF0,0xF,0xF8,0xF,0x3C,0xE,0x1E,0xE,0xE,0xE,0xE,0xE,0xE,0xE,0xE,0xE,0xE,0xF,0x1C,0xF,0xBC,0xF,0xF8,0xD,0xF0, +/*Ы*/ 15, 19, 38, 18, 2, 0, 0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xFF,0xE,0xFF,0x8E,0xE3,0xCE,0xE1,0xCE,0xE0,0xEE,0xE0,0xEE,0xE0,0xEE,0xE0,0xEE,0xE0,0xEE,0xF1,0xEE,0xFB,0xCE,0xFF,0x8E,0xEF,0xE, +/*Ь*/ 12, 19, 38, 15, 2, 0, 0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xFF,0x80,0xFF,0xC0,0xE1,0xE0,0xE0,0xE0,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xF0,0xE0,0xF9,0xE0,0xFF,0xC0,0xEF,0x80, +/*Э*/ 17, 19, 57, 19, 1, 0, 0x7,0xF0,0x0,0x1F,0xFC,0x0,0x3E,0x3E,0x0,0x78,0xF,0x0,0x70,0x7,0x0,0xF0,0x7,0x80,0xE0,0x3,0x80,0x0,0x3,0x80,0x7,0xFF,0x80,0x7,0xFF,0x80,0x0,0x3,0x80,0x0,0x3,0x80,0x0,0x3,0x80,0xF0,0x7,0x80,0x70,0x7,0x0,0x78,0xF,0x0,0x3E,0x3E,0x0,0x1F,0xFC,0x0,0x7,0xF0,0x0, +/*Ю*/ 18, 20, 60, 18, 255, 0, 0x0,0x0,0x0,0x70,0x7E,0x0,0x70,0xFF,0x0,0x71,0xE7,0x80,0x71,0xC3,0x80,0x71,0xC3,0x80,0x73,0x81,0xC0,0x73,0x81,0xC0,0x73,0x81,0xC0,0x73,0x81,0xC0,0x7F,0x81,0xC0,0x7F,0x81,0xC0,0x73,0x81,0xC0,0x73,0x81,0xC0,0x73,0x81,0xC0,0x71,0xC3,0x80,0x71,0xC3,0x80,0x71,0xE7,0x80,0x70,0xFF,0x0,0x70,0x7E,0x0, +/*Я*/ 14, 19, 38, 17, 2, 0, 0x1F,0xFC,0x7F,0xFC,0x70,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0x70,0x1C,0x7F,0xFC,0x3F,0xFC,0x78,0x1C,0x70,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C,0xE0,0x1C, +/*а*/ 12, 14, 28, 14, 1, 0, 0x1F,0x80,0x3F,0xC0,0x71,0xE0,0x70,0xE0,0x0,0xE0,0x7,0xE0,0x3F,0xE0,0x7C,0xE0,0xF0,0xE0,0xE0,0xE0,0xE1,0xE0,0xF3,0xE0,0x7F,0xF0,0x3E,0x70, +/*б*/ 12, 18, 36, 13, 0, 0, 0x0,0x70,0x0,0xF0,0x3,0xE0,0x3F,0xC0,0x7F,0x0,0x70,0x0,0xE0,0x0,0xEF,0x0,0xFF,0xC0,0xF9,0xE0,0xF0,0xE0,0xE0,0x70,0xE0,0x70,0xE0,0x70,0x70,0xE0,0x79,0xE0,0x3F,0xC0,0x1F,0x80, +/*в*/ 12, 19, 38, 15, 2, 0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xFF,0x80,0xFF,0xC0,0xE1,0xE0,0xE0,0xF0,0xE0,0x70,0xE0,0xE0,0xFF,0xC0,0xFF,0xE0,0xE0,0xF0,0xE0,0x70,0xF0,0xF0,0xF9,0xE0,0xFF,0xC0,0xEF,0x80, +/*г*/ 9, 19, 38, 13, 2, 0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xFF,0x80,0xFF,0x80,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0, +/*д*/ 15, 17, 34, 17, 1, 253, 0x3,0xF8,0x7,0xF8,0xE,0x38,0xE,0x38,0xE,0x38,0xE,0x38,0xE,0x38,0xE,0x38,0xE,0x38,0xE,0x38,0x1E,0x38,0x3C,0x38,0xFF,0xFE,0xFF,0xFE,0xE0,0xE,0xE0,0xE,0xE0,0xE, +/*е*/ 12, 14, 28, 14, 1, 0, 0xF,0x0,0x3F,0xC0,0x79,0xE0,0x70,0xE0,0xE0,0x70,0xE0,0x70,0xFF,0xF0,0xFF,0xF0,0xE0,0x0,0xE0,0x0,0x70,0x70,0x78,0xF0,0x3F,0xE0,0xF,0x80, +/*ж*/ 17, 14, 42, 21, 2, 0, 0xE1,0xC3,0x80,0xF1,0xC7,0x80,0x79,0xCF,0x0,0x3D,0xDE,0x0,0x1F,0xFC,0x0,0xF,0xF8,0x0,0x7,0xF0,0x0,0xF,0xF8,0x0,0x1F,0xFC,0x0,0x3D,0xDE,0x0,0x79,0xCF,0x0,0xF1,0xC7,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80, +/*з*/ 11, 14, 28, 13, 1, 0, 0x3F,0x0,0x7F,0x80,0xF3,0xC0,0xE1,0xC0,0x1,0xC0,0x3,0x80,0xF,0x80,0xF,0xC0,0x1,0xE0,0xE0,0xE0,0xE0,0xE0,0xF1,0xE0,0x7F,0xC0,0x3F,0x80, +/*и*/ 11, 14, 28, 15, 2, 0, 0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE1,0xE0,0xE3,0xE0,0xE7,0xE0,0xEE,0xE0,0xFC,0xE0,0xF8,0xE0,0xF0,0xE0,0xE0,0xE0,0xE0,0xE0, +/*й*/ 11, 17, 34, 15, 2, 0, 0x1F,0x0,0x1F,0x0,0xE,0x0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE1,0xE0,0xE3,0xE0,0xE7,0xE0,0xEE,0xE0,0xFC,0xE0,0xF8,0xE0,0xF0,0xE0,0xE0,0xE0,0xE0,0xE0, +/*к*/ 12, 19, 38, 14, 2, 0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xE1,0xE0,0xE3,0xC0,0xE7,0x80,0xEF,0x0,0xFE,0x0,0xFC,0x0,0xFE,0x0,0xEF,0x0,0xE7,0x0,0xE7,0x80,0xE3,0xC0,0xE1,0xC0,0xE1,0xE0,0xE0,0xF0, +/*л*/ 11, 14, 28, 15, 2, 0, 0xF,0xE0,0x1F,0xE0,0x3C,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x38,0xE0,0x70,0xE0,0xE0,0xE0, +/*м*/ 17, 14, 42, 21, 2, 0, 0xE0,0x3,0x80,0xF0,0x7,0x80,0xF8,0xF,0x80,0xFC,0x1F,0x80,0xFE,0x3F,0x80,0xEF,0x7B,0x80,0xE7,0xF3,0x80,0xE3,0xE3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80, +/*н*/ 11, 14, 28, 15, 2, 0, 0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xFF,0xE0,0xFF,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0, +/*о*/ 12, 14, 28, 14, 1, 0, 0xF,0x0,0x3F,0xC0,0x79,0xE0,0x70,0xE0,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0x70,0xE0,0x79,0xE0,0x3F,0xC0,0xF,0x0, +/*п*/ 11, 14, 28, 15, 2, 0, 0xFF,0xE0,0xFF,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0, +/*р*/ 12, 19, 38, 15, 2, 251, 0xEF,0x80,0xFF,0xC0,0xF9,0xE0,0xF0,0xE0,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xF0,0xE0,0xF9,0xE0,0xFF,0xC0,0xEF,0x80,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0, +/*с*/ 11, 14, 28, 13, 1, 0, 0x1F,0x80,0x3F,0xC0,0x79,0xE0,0x70,0xE0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0x70,0xE0,0x79,0xE0,0x3F,0xC0,0x1F,0x80, +/*т*/ 11, 19, 38, 14, 1, 0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xFF,0xE0,0xFF,0xE0,0xE,0x0,0xE,0x0,0xE,0x0,0xE,0x0,0xE,0x0,0xE,0x0,0xE,0x0,0xE,0x0,0xE,0x0,0xE,0x0,0xE,0x0,0xE,0x0, +/*у*/ 13, 19, 38, 15, 1, 251, 0xE0,0x38,0xE0,0x38,0x70,0x38,0x78,0x70,0x38,0x70,0x3C,0xF0,0x1C,0xE0,0x1C,0xE0,0xF,0xC0,0xF,0xC0,0x7,0xC0,0x7,0x80,0x3,0x80,0x3,0x80,0x7,0x0,0x7,0x0,0xE,0x0,0x3E,0x0,0x3C,0x0, +/*ф*/ 13, 18, 36, 15, 1, 254, 0x7,0x0,0x7,0x0,0xF,0x80,0x3F,0xE0,0x7F,0xF0,0x77,0x70,0xE7,0x38,0xE7,0x38,0xE7,0x38,0xE7,0x38,0xE7,0x38,0xE7,0x38,0x77,0x70,0x7F,0xF0,0x3F,0xE0,0xF,0x80,0x7,0x0,0x7,0x0, +/*х*/ 11, 14, 28, 13, 1, 0, 0xE0,0xE0,0xF1,0xE0,0x71,0xC0,0x3B,0x80,0x3F,0x80,0x1F,0x0,0xE,0x0,0x1F,0x0,0x1F,0x0,0x3B,0x80,0x7B,0xC0,0x71,0xC0,0xF1,0xE0,0xE0,0xE0, +/*ц*/ 14, 17, 34, 18, 2, 253, 0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE1,0xE0,0x73,0xE0,0x7E,0xFC,0x1C,0xFC,0x0,0x1C,0x0,0x1C,0x0,0x1C, +/*ч*/ 10, 19, 38, 13, 1, 0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xE1,0xC0,0xE1,0xC0,0xE1,0xC0,0xE1,0xC0,0xE1,0xC0,0xE1,0xC0,0xE1,0xC0,0xFF,0xC0,0x7F,0xC0,0x1,0xC0,0x1,0xC0,0x1,0xC0,0x1,0xC0,0x1,0xC0, +/*ш*/ 17, 14, 42, 21, 2, 0, 0xE0,0x3,0x80,0xE0,0x3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xE1,0xC3,0x80,0xFF,0xFF,0x80,0xFF,0xFF,0x80, +/*щ*/ 18, 17, 51, 22, 2, 253, 0xE0,0xE,0x0,0xE0,0xE,0x0,0xE3,0x8E,0x0,0xE3,0x8E,0x0,0xE3,0x8E,0x0,0xE3,0x8E,0x0,0xE3,0x8E,0x0,0xE3,0x8E,0x0,0xE3,0x8E,0x0,0xE3,0x8E,0x0,0xE3,0x8E,0x0,0xE3,0x8E,0x0,0xFF,0xFF,0xC0,0xFF,0xFF,0xC0,0x0,0x1,0xC0,0x0,0x1,0xC0,0x0,0x1,0xC0, +/*ъ*/ 15, 19, 38, 17, 1, 0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xFE,0x0,0xFE,0x0,0xE,0x0,0xE,0x0,0xE,0x0,0xF,0xF8,0xF,0xFC,0xE,0x1E,0xE,0xE,0xE,0xE,0xF,0x1E,0xF,0xBC,0xF,0xF8,0xE,0xF0, +/*ы*/ 15, 19, 38, 18, 2, 0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xE0,0xE,0xFF,0x8E,0xFF,0xCE,0xE1,0xEE,0xE0,0xEE,0xE0,0xEE,0xE0,0xEE,0xF0,0xEE,0xF9,0xEE,0xFF,0xCE,0xEF,0x8E, +/*ь*/ 12, 19, 38, 15, 2, 0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xE0,0x0,0xFF,0xC0,0xFF,0xE0,0xE0,0xF0,0xE0,0x70,0xE0,0x70,0xE0,0x70,0xF0,0xE0,0xF9,0xE0,0xFF,0xC0,0xEF,0x80, +/*э*/ 12, 14, 28, 14, 1, 0, 0xF,0x0,0x3F,0xC0,0x79,0xE0,0x70,0xE0,0xE0,0x70,0x0,0x70,0xF,0xF0,0xF,0xF0,0x0,0x70,0xE0,0x70,0x70,0xE0,0x79,0xE0,0x3F,0xC0,0xF,0x0, +/*ю*/ 17, 14, 42, 19, 1, 0, 0xE0,0x78,0x0,0xE1,0xFE,0x0,0xE3,0xCF,0x0,0xE3,0x87,0x0,0xE7,0x3,0x80,0xE7,0x3,0x80,0xFF,0x3,0x80,0xFF,0x3,0x80,0xFF,0x3,0x80,0xE7,0x3,0x80,0xE3,0x87,0x0,0xE3,0xCF,0x0,0xE1,0xFE,0x0,0xE0,0x78,0x0, +/*я*/ 11, 14, 28, 14, 2, 0, 0x3F,0xE0,0x7F,0xE0,0xF0,0xE0,0xE0,0xE0,0xE0,0xE0,0xF0,0xE0,0x7F,0xE0,0x1F,0xE0,0x3C,0xE0,0x70,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0, +/**/ 18, 19, 57, 18, 255, 0, 0x1F,0xF8,0x0,0x1F,0xFE,0x0,0x18,0xF,0x0,0x18,0x3,0x80,0x18,0x1,0x80,0x18,0x1,0xC0,0x18,0x0,0xC0,0x18,0x0,0xC0,0xFF,0x80,0xC0,0xFF,0x80,0xC0,0x18,0x0,0xC0,0x18,0x0,0xC0,0x18,0x0,0xC0,0x18,0x1,0xC0,0x18,0x1,0x80,0x18,0x3,0x80,0x18,0xF,0x0,0x1F,0xFE,0x0,0x1F,0xF8,0x0, +/**/ 14, 23, 46, 18, 2, 0, 0xE,0x20,0x1B,0x60,0x11,0xC0,0x0,0x0,0xE0,0xC,0xF0,0xC,0xF0,0xC,0xD8,0xC,0xDC,0xC,0xCC,0xC,0xCE,0xC,0xC6,0xC,0xC7,0xC,0xC3,0xC,0xC3,0x8C,0xC1,0x8C,0xC1,0xCC,0xC0,0xCC,0xC0,0xEC,0xC0,0x6C,0xC0,0x3C,0xC0,0x3C,0xC0,0x1C, +/**/ 16, 24, 48, 18, 1, 0, 0xC,0x0,0x6,0x0,0x3,0x0,0x1,0x80,0x0,0x0,0x7,0xE0,0x1F,0xF8,0x3C,0x3C,0x70,0xE,0x60,0x6,0xE0,0x7,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xE0,0x7,0x60,0x6,0x70,0xE,0x3C,0x3C,0x1F,0xF8,0x7,0xE0, +/**/ 16, 24, 48, 18, 1, 0, 0x0,0x30,0x0,0x60,0x0,0xC0,0x1,0x80,0x0,0x0,0x7,0xE0,0x1F,0xF8,0x3C,0x3C,0x70,0xE,0x60,0x6,0xE0,0x7,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xE0,0x7,0x60,0x6,0x70,0xE,0x3C,0x3C,0x1F,0xF8,0x7,0xE0, +/**/ 16, 24, 48, 18, 1, 0, 0x0,0xC0,0x1,0xE0,0x3,0x30,0x6,0x18,0x0,0x0,0x7,0xE0,0x1F,0xF8,0x3C,0x3C,0x70,0xE,0x60,0x6,0xE0,0x7,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xE0,0x7,0x60,0x6,0x70,0xE,0x3C,0x3C,0x1F,0xF8,0x7,0xE0, +/**/ 16, 23, 46, 18, 1, 0, 0x3,0x88,0x6,0xD8,0x4,0x70,0x0,0x0,0x7,0xE0,0x1F,0xF8,0x3C,0x3C,0x70,0xE,0x60,0x6,0xE0,0x7,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xE0,0x7,0x60,0x6,0x70,0xE,0x3C,0x3C,0x1F,0xF8,0x7,0xE0, +/**/ 16, 23, 46, 18, 1, 0, 0x6,0x30,0x6,0x30,0x0,0x0,0x0,0x0,0x7,0xE0,0x1F,0xF8,0x3C,0x3C,0x70,0xE,0x60,0x6,0xE0,0x7,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xC0,0x3,0xE0,0x7,0x60,0x6,0x70,0xE,0x3C,0x3C,0x1F,0xF8,0x7,0xE0, +/**/ 13, 12, 24, 14, 0, 1, 0xC0,0x18,0x60,0x30,0x30,0x60,0x18,0xC0,0xD,0x80,0x7,0x0,0x7,0x0,0xD,0x80,0x18,0xC0,0x30,0x60,0x60,0x30,0xC0,0x18, +/**/ 18, 19, 57, 18, 0, 0, 0x3,0xF0,0xC0,0xF,0xFD,0xC0,0x1E,0x1F,0x80,0x38,0x7,0x0,0x30,0xF,0x0,0x70,0x1D,0x80,0x60,0x39,0x80,0x60,0x71,0x80,0x60,0xE1,0x80,0x61,0xC1,0x80,0x63,0x81,0x80,0x67,0x1,0x80,0x6E,0x1,0x80,0x7C,0x3,0x80,0x38,0x3,0x0,0x38,0x7,0x0,0x7E,0x1E,0x0,0xEF,0xFC,0x0,0xC3,0xF0,0x0, +/**/ 14, 24, 48, 18, 2, 0, 0x18,0x0,0xC,0x0,0x6,0x0,0x3,0x0,0x0,0x0,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0x60,0x18,0x70,0x38,0x3F,0xF0,0xF,0xC0, +/**/ 14, 24, 48, 18, 2, 0, 0x0,0x60,0x0,0xC0,0x1,0x80,0x3,0x0,0x0,0x0,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0x60,0x18,0x70,0x38,0x3F,0xF0,0xF,0xC0, +/**/ 14, 24, 48, 18, 2, 0, 0x3,0x0,0x7,0x80,0xC,0xC0,0x18,0x60,0x0,0x0,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0x60,0x18,0x70,0x38,0x3F,0xF0,0xF,0xC0, +/**/ 14, 23, 46, 18, 2, 0, 0x18,0xC0,0x18,0xC0,0x0,0x0,0x0,0x0,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0xC0,0xC,0x60,0x18,0x70,0x38,0x3F,0xF0,0xF,0xC0, +/**/ 14, 24, 48, 16, 1, 0, 0x0,0x60,0x0,0xC0,0x1,0x80,0x3,0x0,0x0,0x0,0xC0,0xC,0xE0,0x1C,0x60,0x18,0x70,0x38,0x30,0x30,0x38,0x70,0x18,0x60,0x1C,0xE0,0xC,0xC0,0xF,0xC0,0x7,0x80,0x7,0x80,0x3,0x0,0x3,0x0,0x3,0x0,0x3,0x0,0x3,0x0,0x3,0x0,0x3,0x0, +/**/ 13, 19, 38, 16, 2, 0, 0xC0,0x0,0xC0,0x0,0xC0,0x0,0xC0,0x0,0xFF,0xE0,0xFF,0xF0,0xC0,0x30,0xC0,0x18,0xC0,0x18,0xC0,0x18,0xC0,0x18,0xC0,0x30,0xFF,0xF0,0xFF,0xE0,0xC0,0x0,0xC0,0x0,0xC0,0x0,0xC0,0x0,0xC0,0x0, +/**/ 10, 19, 38, 15, 3, 0, 0x1C,0x0,0x7F,0x0,0xE3,0x0,0xC1,0x80,0xC1,0x80,0xC1,0x80,0xC3,0x0,0xC7,0x0,0xCE,0x0,0xCF,0x0,0xC3,0x80,0xC1,0x80,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC1,0x80,0xC3,0x80,0xCF,0x0,0xCE,0x0, +/**/ 11, 19, 38, 13, 1, 0, 0x18,0x0,0xC,0x0,0x6,0x0,0x3,0x0,0x0,0x0,0x1F,0x0,0x3F,0x80,0x61,0xC0,0x60,0xC0,0x0,0xC0,0x7,0xC0,0x3F,0xC0,0x78,0xC0,0xE0,0xC0,0xC0,0xC0,0xC1,0xC0,0xE3,0xC0,0x7E,0xE0,0x3C,0x60, +/**/ 11, 19, 38, 13, 1, 0, 0x1,0x80,0x3,0x0,0x6,0x0,0xC,0x0,0x0,0x0,0x1F,0x0,0x3F,0x80,0x61,0xC0,0x60,0xC0,0x0,0xC0,0x7,0xC0,0x3F,0xC0,0x78,0xC0,0xE0,0xC0,0xC0,0xC0,0xC1,0xC0,0xE3,0xC0,0x7E,0xE0,0x3C,0x60, +/**/ 11, 19, 38, 13, 1, 0, 0xC,0x0,0x1E,0x0,0x33,0x0,0x61,0x80,0x0,0x0,0x1F,0x0,0x3F,0x80,0x61,0xC0,0x60,0xC0,0x0,0xC0,0x7,0xC0,0x3F,0xC0,0x78,0xC0,0xE0,0xC0,0xC0,0xC0,0xC1,0xC0,0xE3,0xC0,0x7E,0xE0,0x3C,0x60, +/**/ 11, 18, 36, 13, 1, 0, 0x1C,0x40,0x36,0xC0,0x23,0x80,0x0,0x0,0x1F,0x0,0x3F,0x80,0x61,0xC0,0x60,0xC0,0x0,0xC0,0x7,0xC0,0x3F,0xC0,0x78,0xC0,0xE0,0xC0,0xC0,0xC0,0xC1,0xC0,0xE3,0xC0,0x7E,0xE0,0x3C,0x60, +/**/ 11, 18, 36, 13, 1, 0, 0x33,0x0,0x33,0x0,0x0,0x0,0x0,0x0,0x1F,0x0,0x3F,0x80,0x61,0xC0,0x60,0xC0,0x0,0xC0,0x7,0xC0,0x3F,0xC0,0x78,0xC0,0xE0,0xC0,0xC0,0xC0,0xC1,0xC0,0xE3,0xC0,0x7E,0xE0,0x3C,0x60, +/**/ 11, 19, 38, 13, 1, 0, 0x6,0x0,0x9,0x0,0x9,0x0,0x6,0x0,0x0,0x0,0x1F,0x0,0x3F,0x80,0x61,0xC0,0x60,0xC0,0x0,0xC0,0x7,0xC0,0x3F,0xC0,0x78,0xC0,0xE0,0xC0,0xC0,0xC0,0xC1,0xC0,0xE3,0xC0,0x7E,0xE0,0x3C,0x60, +/**/ 19, 14, 42, 21, 1, 0, 0x1F,0xE,0x0,0x3F,0xBF,0x80,0x61,0xF1,0xC0,0x60,0xE0,0xC0,0x0,0xC0,0x60,0x7,0xC0,0x60,0x3F,0xFF,0xE0,0x78,0xFF,0xE0,0xE0,0xC0,0x0,0xC0,0xC0,0x0,0xC1,0xE0,0x60,0xE3,0xF0,0xE0,0x7E,0x3F,0xC0,0x3C,0xF,0x0, +/**/ 10, 19, 38, 12, 1, 251, 0x1F,0x0,0x3F,0x80,0x71,0xC0,0x60,0xC0,0xE0,0x0,0xC0,0x0,0xC0,0x0,0xC0,0x0,0xC0,0x0,0xE0,0x0,0x60,0xC0,0x71,0xC0,0x3F,0x80,0x1F,0x0,0xC,0x0,0x6,0x0,0x6,0x0,0x3E,0x0,0x1C,0x0, +/**/ 11, 19, 38, 13, 1, 0, 0x18,0x0,0xC,0x0,0x6,0x0,0x3,0x0,0x0,0x0,0xE,0x0,0x3F,0x80,0x71,0xC0,0x60,0xC0,0xC0,0x60,0xC0,0x60,0xFF,0xE0,0xFF,0xE0,0xC0,0x0,0xC0,0x0,0x60,0x60,0x70,0xE0,0x3F,0xC0,0xF,0x0, +/**/ 11, 19, 38, 13, 1, 0, 0x3,0x0,0x6,0x0,0xC,0x0,0x18,0x0,0x0,0x0,0xE,0x0,0x3F,0x80,0x71,0xC0,0x60,0xC0,0xC0,0x60,0xC0,0x60,0xFF,0xE0,0xFF,0xE0,0xC0,0x0,0xC0,0x0,0x60,0x60,0x70,0xE0,0x3F,0xC0,0xF,0x0, +/**/ 11, 19, 38, 13, 1, 0, 0xC,0x0,0x1E,0x0,0x33,0x0,0x61,0x80,0x0,0x0,0xE,0x0,0x3F,0x80,0x71,0xC0,0x60,0xC0,0xC0,0x60,0xC0,0x60,0xFF,0xE0,0xFF,0xE0,0xC0,0x0,0xC0,0x0,0x60,0x60,0x70,0xE0,0x3F,0xC0,0xF,0x0, +/**/ 11, 18, 36, 13, 1, 0, 0x33,0x0,0x33,0x0,0x0,0x0,0x0,0x0,0xE,0x0,0x3F,0x80,0x71,0xC0,0x60,0xC0,0xC0,0x60,0xC0,0x60,0xFF,0xE0,0xFF,0xE0,0xC0,0x0,0xC0,0x0,0x60,0x60,0x70,0xE0,0x3F,0xC0,0xF,0x0, +/**/ 5, 19, 19, 6, 0, 0, 0xC0,0x60,0x30,0x18,0x0,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30, +/**/ 5, 19, 19, 6, 1, 0, 0x18,0x30,0x60,0xC0,0x0,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60, +/**/ 8, 19, 19, 6, 255, 0, 0x18,0x3C,0x66,0xC3,0x0,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, +/**/ 6, 18, 18, 6, 0, 0, 0xCC,0xCC,0x0,0x0,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30, +/**/ 11, 19, 38, 13, 1, 0, 0x60,0x0,0x39,0x80,0xE,0x0,0x1E,0x0,0x63,0x0,0x1F,0x80,0x3F,0x80,0x71,0xC0,0x60,0xC0,0xE0,0xE0,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xE0,0xE0,0x60,0xC0,0x71,0xC0,0x3F,0x80,0x1F,0x0, +/**/ 10, 18, 36, 14, 2, 0, 0x38,0x80,0x6D,0x80,0x47,0x0,0x0,0x0,0xCE,0x0,0xDF,0x80,0xF1,0x80,0xE0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0, +/**/ 11, 19, 38, 13, 1, 0, 0x18,0x0,0xC,0x0,0x6,0x0,0x3,0x0,0x0,0x0,0x1F,0x0,0x3F,0x80,0x71,0xC0,0x60,0xC0,0xE0,0xE0,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xE0,0xE0,0x60,0xC0,0x71,0xC0,0x3F,0x80,0x1F,0x0, +/**/ 11, 19, 38, 13, 1, 0, 0x3,0x0,0x6,0x0,0xC,0x0,0x18,0x0,0x0,0x0,0x1F,0x0,0x3F,0x80,0x71,0xC0,0x60,0xC0,0xE0,0xE0,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xE0,0xE0,0x60,0xC0,0x71,0xC0,0x3F,0x80,0x1F,0x0, +/**/ 11, 19, 38, 13, 1, 0, 0xC,0x0,0x1E,0x0,0x33,0x0,0x61,0x80,0x0,0x0,0x1F,0x0,0x3F,0x80,0x71,0xC0,0x60,0xC0,0xE0,0xE0,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xE0,0xE0,0x60,0xC0,0x71,0xC0,0x3F,0x80,0x1F,0x0, +/**/ 11, 18, 36, 13, 1, 0, 0x1C,0x40,0x36,0xC0,0x23,0x80,0x0,0x0,0x1F,0x0,0x3F,0x80,0x71,0xC0,0x60,0xC0,0xE0,0xE0,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xE0,0xE0,0x60,0xC0,0x71,0xC0,0x3F,0x80,0x1F,0x0, +/**/ 11, 18, 36, 13, 1, 0, 0x33,0x0,0x33,0x0,0x0,0x0,0x0,0x0,0x1F,0x0,0x3F,0x80,0x71,0xC0,0x60,0xC0,0xE0,0xE0,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xE0,0xE0,0x60,0xC0,0x71,0xC0,0x3F,0x80,0x1F,0x0, +/**/ 12, 12, 24, 14, 1, 1, 0x6,0x0,0x6,0x0,0x6,0x0,0x0,0x0,0x0,0x0,0xFF,0xF0,0xFF,0xF0,0x0,0x0,0x0,0x0,0x6,0x0,0x6,0x0,0x6,0x0, +/**/ 13, 14, 28, 13, 0, 0, 0xF,0x98,0x1F,0xF8,0x38,0x70,0x30,0xE0,0x71,0xF0,0x63,0xB0,0x63,0x30,0x66,0x30,0x6C,0x30,0x7C,0x70,0x38,0x60,0x70,0xE0,0xFF,0xC0,0xCF,0x80, +/**/ 10, 19, 38, 14, 2, 0, 0x30,0x0,0x18,0x0,0xC,0x0,0x6,0x0,0x0,0x0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC1,0xC0,0x63,0xC0,0x7E,0xC0,0x1C,0xC0, +/**/ 10, 19, 38, 14, 2, 0, 0x3,0x0,0x6,0x0,0xC,0x0,0x18,0x0,0x0,0x0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC1,0xC0,0x63,0xC0,0x7E,0xC0,0x1C,0xC0, +/**/ 10, 19, 38, 14, 2, 0, 0xC,0x0,0x1E,0x0,0x33,0x0,0x61,0x80,0x0,0x0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC1,0xC0,0x63,0xC0,0x7E,0xC0,0x1C,0xC0, +/**/ 10, 18, 36, 14, 2, 0, 0x33,0x0,0x33,0x0,0x0,0x0,0x0,0x0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC1,0xC0,0x63,0xC0,0x7E,0xC0,0x1C,0xC0, +/**/ 12, 24, 48, 13, 0, 251, 0x0,0xC0,0x1,0x80,0x3,0x0,0x6,0x0,0x0,0x0,0xC0,0x30,0xC0,0x30,0x60,0x30,0x70,0x60,0x30,0x60,0x38,0xE0,0x18,0xC0,0x18,0xC0,0xD,0x80,0xD,0x80,0x7,0x80,0x7,0x0,0x3,0x0,0x3,0x0,0x6,0x0,0x6,0x0,0xC,0x0,0x3C,0x0,0x38,0x0, +/**/ 11, 24, 48, 14, 2, 251, 0xC0,0x0,0xC0,0x0,0xC0,0x0,0xC0,0x0,0xC0,0x0,0xCF,0x0,0xDF,0x80,0xF1,0xC0,0xE0,0xC0,0xC0,0xE0,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0xE0,0xE0,0xC0,0xF1,0xC0,0xDF,0x80,0xCF,0x0,0xC0,0x0,0xC0,0x0,0xC0,0x0,0xC0,0x0,0xC0,0x0, +/**/ 12, 23, 46, 13, 0, 251, 0x19,0x80,0x19,0x80,0x0,0x0,0x0,0x0,0xC0,0x30,0xC0,0x30,0x60,0x30,0x70,0x60,0x30,0x60,0x38,0xE0,0x18,0xC0,0x18,0xC0,0xD,0x80,0xD,0x80,0x7,0x80,0x7,0x0,0x3,0x0,0x3,0x0,0x6,0x0,0x6,0x0,0xC,0x0,0x3C,0x0,0x38,0x0 +}; +#else + extern const uint8_t Helvetica18[7307] = { 0,28,37,253,248,19,4,37,9,49,32,255,251,24,251,19,251, // tFont 0,0,0,6,0,1,2,19,19,6,2,0,192,192,192, @@ -489,4 +721,7 @@ extern const uint8_t Helvetica18[7307] = { 0,6,0,6,0,12,0,60,0,56,0 }; +#endif // DISPLAY_CHARSET_ISO10646_5 +#undef ru + #endif // HAS_GRAPHICAL_TFT diff --git a/Marlin/src/lcd/tft/tft_color.h b/Marlin/src/lcd/tft/tft_color.h index a72a079f6e..db17e60a30 100644 --- a/Marlin/src/lcd/tft/tft_color.h +++ b/Marlin/src/lcd/tft/tft_color.h @@ -70,20 +70,20 @@ #define COLOR_DARK_PURPLE 0x9930 // #992380 #ifndef COLOR_BACKGROUND - #define COLOR_BACKGROUND 0x20AC // #1E156E + #define COLOR_BACKGROUND 0x0000 // #000000 #endif #ifndef COLOR_SELECTION_BG - #define COLOR_SELECTION_BG 0x9930 // #992380 + #define COLOR_SELECTION_BG 0xFC00 // #FF7F00 #endif #ifndef COLOR_WEBSITE_URL - #define COLOR_WEBSITE_URL 0x03B7 + #define COLOR_WEBSITE_URL 0xFFFF #endif #ifndef COLOR_INACTIVE #define COLOR_INACTIVE COLOR_GREY #endif #ifndef COLOR_COLD - #define COLOR_COLD COLOR_AQUA + #define COLOR_COLD COLOR_WHITE #endif #ifndef COLOR_HOTEND #define COLOR_HOTEND COLOR_SCARLET @@ -95,39 +95,39 @@ #define COLOR_CHAMBER COLOR_DARK_ORANGE #endif #ifndef COLOR_FAN - #define COLOR_FAN COLOR_AQUA + #define COLOR_FAN COLOR_WHITE #endif #ifndef COLOR_AXIS_HOMED #define COLOR_AXIS_HOMED COLOR_WHITE #endif #ifndef COLOR_AXIS_NOT_HOMED - #define COLOR_AXIS_NOT_HOMED COLOR_YELLOW + #define COLOR_AXIS_NOT_HOMED COLOR_GREY #endif #ifndef COLOR_RATE_100 - #define COLOR_RATE_100 COLOR_VIVID_GREEN + #define COLOR_RATE_100 COLOR_ORANGE #endif #ifndef COLOR_RATE_ALTERED - #define COLOR_RATE_ALTERED COLOR_YELLOW + #define COLOR_RATE_ALTERED COLOR_ORANGE #endif #ifndef COLOR_PRINT_TIME - #define COLOR_PRINT_TIME COLOR_AQUA + #define COLOR_PRINT_TIME COLOR_WHITE #endif #ifndef COLOR_PROGRESS_FRAME #define COLOR_PROGRESS_FRAME COLOR_WHITE #endif #ifndef COLOR_PROGRESS_BAR - #define COLOR_PROGRESS_BAR COLOR_BLUE + #define COLOR_PROGRESS_BAR COLOR_ORANGE #endif #ifndef COLOR_PROGRESS_BG #define COLOR_PROGRESS_BG COLOR_BLACK #endif #ifndef COLOR_STATUS_MESSAGE - #define COLOR_STATUS_MESSAGE COLOR_YELLOW + #define COLOR_STATUS_MESSAGE COLOR_WHITE #endif #ifndef COLOR_CONTROL_ENABLED @@ -147,7 +147,7 @@ #endif #ifndef COLOR_MENU_TEXT - #define COLOR_MENU_TEXT COLOR_YELLOW + #define COLOR_MENU_TEXT COLOR_WHITE #endif #ifndef COLOR_MENU_VALUE #define COLOR_MENU_VALUE COLOR_WHITE diff --git a/Marlin/src/lcd/tft/tft_color.h_old b/Marlin/src/lcd/tft/tft_color.h_old new file mode 100644 index 0000000000..a72a079f6e --- /dev/null +++ b/Marlin/src/lcd/tft/tft_color.h_old @@ -0,0 +1,176 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * + * Based on Sprinter and grbl. + * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ +#pragma once + +#include "../../inc/MarlinConfigPre.h" + +#define RED(color) ((color >> 8) & 0xF8) +#define GREEN(color) ((color >> 3) & 0xFC) +#define BLUE(color) ((color << 3) & 0xF8) +#define RGB(red, green, blue) (((red << 8) & 0xF800) | ((green << 3) & 0x07E0) | ((blue >> 3) & 0x001F)) +#define COLOR(color) RGB(((color >> 16) & 0xFF), ((color >> 8) & 0xFF), (color & 0xFF)) +#define HALF(color) RGB(RED(color) >> 1, GREEN(color) >> 1, BLUE(color) >> 1) + +// see https://ee-programming-notepad.blogspot.com/2016/10/16-bit-color-generator-picker.html + +#define COLOR_BLACK 0x0000 // #000000 +#define COLOR_WHITE 0xFFFF // #FFFFFF +#define COLOR_SILVER 0xC618 // #C0C0C0 +#define COLOR_GREY 0x7BEF // #808080 +#define COLOR_DARKGREY 0x4208 // #404040 +#define COLOR_DARKGREY2 0x39E7 // #303030 +#define COLOR_DARK 0x0003 // Some dark color + +#define COLOR_RED 0xF800 // #FF0000 +#define COLOR_SCARLET 0xF904 // #FF2020 +#define COLOR_LIME 0x7E00 // #00FF00 +#define COLOR_BLUE 0x001F // #0000FF +#define COLOR_LIGHT_BLUE 0x061F // #00C3FF +#define COLOR_YELLOW 0xFFE0 // #FFFF00 +#define COLOR_MAGENTA 0xF81F // #FF00FF +#define COLOR_FUCHSIA 0xF81F // #FF00FF +#define COLOR_CYAN 0x07FF // #00FFFF +#define COLOR_AQUA 0x07FF // #00FFFF +#define COLOR_DODGER_BLUE 0x041F // #0080FF +#define COLOR_VIVID_VIOLET 0x7933 // #772399 + +#define COLOR_DARK_PURPLE 0x9930 // #992380 + +#define COLOR_MAROON 0x7800 // #800000 +#define COLOR_GREEN 0x03E0 // #008000 +#define COLOR_NAVY 0x000F // #000080 +#define COLOR_OLIVE 0x8400 // #808000 +#define COLOR_PURPLE 0x8010 // #800080 +#define COLOR_TEAL 0x0410 // #008080 + +#define COLOR_ORANGE 0xFC00 // #FF7F00 +#define COLOR_VIVID_GREEN 0x7FE0 // #7FFF00 +#define COLOR_DARK_ORANGE 0xFC40 // #FF8C00 +#define COLOR_CORAL_RED 0xF9E7 // #FF3F3F + +#define COLOR_DARK_PURPLE 0x9930 // #992380 + +#ifndef COLOR_BACKGROUND + #define COLOR_BACKGROUND 0x20AC // #1E156E +#endif +#ifndef COLOR_SELECTION_BG + #define COLOR_SELECTION_BG 0x9930 // #992380 +#endif +#ifndef COLOR_WEBSITE_URL + #define COLOR_WEBSITE_URL 0x03B7 +#endif + +#ifndef COLOR_INACTIVE + #define COLOR_INACTIVE COLOR_GREY +#endif +#ifndef COLOR_COLD + #define COLOR_COLD COLOR_AQUA +#endif +#ifndef COLOR_HOTEND + #define COLOR_HOTEND COLOR_SCARLET +#endif +#ifndef COLOR_HEATED_BED + #define COLOR_HEATED_BED COLOR_DARK_ORANGE +#endif +#ifndef COLOR_CHAMBER + #define COLOR_CHAMBER COLOR_DARK_ORANGE +#endif +#ifndef COLOR_FAN + #define COLOR_FAN COLOR_AQUA +#endif + +#ifndef COLOR_AXIS_HOMED + #define COLOR_AXIS_HOMED COLOR_WHITE +#endif +#ifndef COLOR_AXIS_NOT_HOMED + #define COLOR_AXIS_NOT_HOMED COLOR_YELLOW +#endif + +#ifndef COLOR_RATE_100 + #define COLOR_RATE_100 COLOR_VIVID_GREEN +#endif +#ifndef COLOR_RATE_ALTERED + #define COLOR_RATE_ALTERED COLOR_YELLOW +#endif + +#ifndef COLOR_PRINT_TIME + #define COLOR_PRINT_TIME COLOR_AQUA +#endif + +#ifndef COLOR_PROGRESS_FRAME + #define COLOR_PROGRESS_FRAME COLOR_WHITE +#endif +#ifndef COLOR_PROGRESS_BAR + #define COLOR_PROGRESS_BAR COLOR_BLUE +#endif +#ifndef COLOR_PROGRESS_BG + #define COLOR_PROGRESS_BG COLOR_BLACK +#endif + +#ifndef COLOR_STATUS_MESSAGE + #define COLOR_STATUS_MESSAGE COLOR_YELLOW +#endif + +#ifndef COLOR_CONTROL_ENABLED + #define COLOR_CONTROL_ENABLED COLOR_WHITE +#endif +#ifndef COLOR_CONTROL_DISABLED + #define COLOR_CONTROL_DISABLED COLOR_GREY +#endif +#ifndef COLOR_CONTROL_CANCEL + #define COLOR_CONTROL_CANCEL COLOR_SCARLET +#endif +#ifndef COLOR_CONTROL_CONFIRM + #define COLOR_CONTROL_CONFIRM COLOR_VIVID_GREEN +#endif +#ifndef COLOR_BUSY + #define COLOR_BUSY COLOR_SILVER +#endif + +#ifndef COLOR_MENU_TEXT + #define COLOR_MENU_TEXT COLOR_YELLOW +#endif +#ifndef COLOR_MENU_VALUE + #define COLOR_MENU_VALUE COLOR_WHITE +#endif + +#ifndef COLOR_SLIDER + #define COLOR_SLIDER COLOR_WHITE +#endif +#ifndef COLOR_SLIDER_INACTIVE + #define COLOR_SLIDER_INACTIVE COLOR_GREY +#endif + +#ifndef COLOR_UBL + #define COLOR_UBL COLOR_WHITE +#endif + +#ifndef COLOR_TOUCH_CALIBRATION + #define COLOR_TOUCH_CALIBRATION COLOR_WHITE +#endif + +#ifndef COLOR_KILL_SCREEN_BG + #define COLOR_KILL_SCREEN_BG COLOR_MAROON +#endif +#ifndef COLOR_KILL_SCREEN_TEXT + #define COLOR_KILL_SCREEN_TEXT COLOR_WHITE +#endif diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h index 57935dd78d..ed18e46d55 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h @@ -245,7 +245,7 @@ https://easyeda.com/sst78rust/fb4s-led-control //#define PS_ON_PIN PB2 // PW_OFF #define FIL_RUNOUT_PIN PA4 #ifdef CASE_LED_INSTEAD_E1 - #define LED_SW_PIN PA2//PE6 + #define LED_SW_PIN PE6 #endif #ifndef LED_SW_PIN #define FIL_RUNOUT2_PIN PE6