tft24: допил под дельты

В одном из постов я упомянул, что внес легкие изменения в код для tft24, чтобы было удобнее с ним на дельте. Попросили деталей.Публикую свой файлик, который завел, чтоб переносить изменения в новые версии xD

===

Домой. Дельте не нужно ездить домой раздельно по осям, и поэтому дополнительное подменю не нужно, только отнимает время.

Было: Меню, домой, домой x/y/z

Стало: Меню, домой.

===

UnifedMove.c

    switch(key_num)

    {

      case KEY_ICON_0: storeCmd("G28\n"); break; //infoMenu.menu[++infoMenu.cur] = menuHome; break;

===

Калибровка стола (движение по предустановленным точкам).

У дельты ноль в центре, поэтому стандартный расчет неподходит, также нужна еще одна кнопка для движения в центр стола.

Меню - движение - калибровки.

===

Configuration.h

#define LEVELING_POINT_1_X -80 //(X_MIN_POS + 20)

#define LEVELING_POINT_1_Y -80 //(Y_MIN_POS + 20)

#define LEVELING_POINT_2_X 80 //(X_MAX_POS - 20)

#define LEVELING_POINT_2_Y -80 //(Y_MIN_POS + 20)

#define LEVELING_POINT_3_X 80 //(X_MAX_POS - 20)

#define LEVELING_POINT_3_Y 80 //(Y_MAX_POS - 20)

#define LEVELING_POINT_4_X -80 //(X_MIN_POS + 20)

#define LEVELING_POINT_4_Y 80 //(Y_MAX_POS - 20)

===

leveling.c

const MENUITEMS manualLevelingItems = {

// title

LABEL_LEVELING,

// icon label

 {{ICON_POINT_1, LABEL_POINT_1},

  {ICON_POINT_2, LABEL_POINT_2},

  {ICON_POINT_3, LABEL_POINT_3},

  {ICON_POINT_4, LABEL_POINT_4},

  {ICON_BLTOUCH_REPEAT, LABEL_BED}, //заменена строка

  {ICON_BACKGROUND, LABEL_BACKGROUND},

  {ICON_BACKGROUND, LABEL_BACKGROUND},

  {ICON_BACK, LABEL_BACK},}

};

void moveToLevelingPoint(u8 point)

{

  static const s16 pointPosition[][2] = {

    {LEVELING_POINT_1_X, LEVELING_POINT_1_Y},

    {LEVELING_POINT_2_X, LEVELING_POINT_2_Y},

    {LEVELING_POINT_3_X, LEVELING_POINT_3_Y},

    {LEVELING_POINT_4_X, LEVELING_POINT_4_Y},

    {0, 0}, //добавлена строка

...

void menuManualLeveling(void)

{

  KEY_VALUES key_num=KEY_IDLE;

  menuDrawPage(&manualLevelingItems);

  while(infoMenu.menu[infoMenu.cur] == menuManualLeveling)

  {

    key_num = menuKeyGetValue();

    switch(key_num)

    {

      case KEY_ICON_0: moveToLevelingPoint(0); break;

      case KEY_ICON_1: moveToLevelingPoint(1); break;

      case KEY_ICON_2: moveToLevelingPoint(2); break;

      case KEY_ICON_3: moveToLevelingPoint(3); break;

      case KEY_ICON_4: moveToLevelingPoint(4); break; //добавлена строка

===

Калибровка (автоуровень). Для дельты актуальная не только калибровка стола по G29, но и Delta-калибровка по G33.

Меню - движение - калиб. стола

===

leveling.c

    switch(key_num)

    {

      case KEY_ICON_0:

        storeCmd("G28\n");

        storeCmd("G29\n");

        #ifdef AUTO_SAVE_LOAD_LEVELING_VALUE

          storeCmd("M500\n");

        #endif

        storeCmd("G28\n"); //добавлена строка, едеет домой после калибровки поверхности

...

 case KEY_ICON_4:

        //storeCmd("M48\n"); //закоментировано, две строчки ниже добавлены

        storeCmd("G33\n");

        storeCmd("M500\n");

        break;

===

language_ru.h

    //#define RU_BLTOUCH_REPEAT "Точность Z"

    #define RU_BLTOUCH_REPEAT "Delta калиб"

===

Оффсет датчика калибровки. Внимание, обнаружен баг! При выставлении значения энкодером в плату оно не передается!

Поэтому подгоняем значение энкодером, потом кнопками плюс/минус.

Нам нужна кнопка для вычисления высоты после установки нового оффсета. Проще всего задействовать в этом процеессе команду G33 P1, которая только вычисляет новую высоту.

Процесс медленнее, чем подгонка вручную, но тем не менее. Как пользоваться:

Меню - движение - калибр. стола - Отступ Z

Выставляем офсет, уводим его в минус сначала с запасом. Нажимаем "Тест выс". (она появляется вместо кнопки "Обнулить").

Дельта едет домой, ставим на ходу датчик калибровки. Дельта едет в стол и тыкается трижды датчиком.

Далее она едет вверх, снимаем на ходу датчик и кладем листок на стол, ну или смотрим глазами.

Дельта едет вниз в точку Z0, смотрим на зазор между соплом и столом. Если недостаточен - уводим оффсет далее в минус и повторяем процедуру.

===

ProbeOffset.c

MENUITEMS probeOffsetItems = {

// title

LABEL_PROBE_OFFSET,

// icon label

 {{ICON_DEC, LABEL_DEC},

  {ICON_BACKGROUND, LABEL_BACKGROUND},

  {ICON_BACKGROUND, LABEL_BACKGROUND},

  {ICON_INC, LABEL_INC},

  {ICON_EEPROM_SAVE, LABEL_EEPROM_SAVE},

  {ICON_01_MM, LABEL_01_MM},

  //{ICON_NORMAL_SPEED, LABEL_VALUE_ZERO},//закомментировано

  {ICON_BLTOUCH_REPEAT, LABEL_VALUE_ZERO}, //добавлено

...

case KEY_ICON_6:

        //if(storeCmd("M851 Z%.2f\n",0)) //закомментировано

        // probe_offset_value = 0.0f;

        storeCmd("G33 P1\n"); //test height //это и ниже добавлено

        storeCmd("M500\n"); //save

        storeCmd("G1 Z0\n"); //goto Z0

        break;

===

language_ru.h

    //#define RU_VALUE_ZERO "Обнулить"

    #define RU_VALUE_ZERO "Тест выс."

Мой полный конфиг:

===

#ifndef _CONFIGRATION_H_

#define _CONFIGRATION_H_

//===========================================================================

//=========================== Marlin Mode Settings ===========================

//===========================================================================

/**

 * Default Marlin Mode Background & Font Color Options

 *

 * These colors can be changed in TFT mode, but can also be set here.

 *

 * Current color options from lcd.h: BLACK, BLUE, BROWN, BRRED, CYAN, GBLUE, GRAY, GREEN, MAGENTA, RED, WHITE, YELLOW

 */

/**

 * This setting determines the communication speed of the printer.

 *

 * 250000 works in most cases, but you might try a lower speed if

 * you commonly experience drop-outs during host printing.

 * You may try up to 1000000 to speed up SD file transfer.

 *

 * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000]

 */

#define BAUDRATE 115200

/**

 * Default LANGUAGE

 *

 * Select the language to display on the LCD. These languages are available:

 * ENGLISH, CHINESE, RUSSIAN, JAPANESE, ARMENIAN, GERMAN, CZECH, SPAIN, FRENCH, PORTUGUESE, ITALIAN, POLISH, SLOVAK, DUTCH

 * 

 */

#define DEFAULT_LANGUAGE RUSSIAN

/**

 * Default LCD Mode

 *

 * Select the default LCD mode. You can always switch between the modes. 

 * 

 * These are available:

 * ST7920_SPI // LCD12864 Sumilator

 * SERIAL_TSC // Default 

 * 

 */

#define DEFAULT_LCD_MODE SERIAL_TSC

/**

 * The duration and frequency for the UI feedback sound.

 * Set these to 0 to disable audio feedback in the LCD menus.

 * Only valid for SERIAL_TSC LCD MODE anf if BUZZER_PIN is set or availible.

 */

#define LCD_FEEDBACK_FREQUENCY_DURATION_L_US 11 // Default 11

#define LCD_FEEDBACK_FREQUENCY_H_US 3 // Default 3

// Marlin Mode Background & Font Color Options

// Current color options from lcd.h: BLACK, BLUE, BROWN, BRRED, CYAN, GBLUE, GRAY, GREEN, MAGENTA, RED, WHITE, YELLOW

#define ST7920_BKCOLOR BLACK

#define ST7920_FNCOLOR YELLOW

/**

 * Text displayed at the top of the LCD in Marlin Mode. 

 */

#define ST7920_BANNER_TEXT "LCD12864 Simulator"

/**

 * Run Marlin Mode fullscreen. 

 * Not recommended for TFT24.

 */

//#define ST7920_FULLSCREEN

/**

 * CLEAN MODE SWITCHING SUPPORT

 * Support for keeping UART(Serial communication) alive in Marlin Mode

 * Gives the ability to connect Octoprint over UART to the TFT UART/serial 

 * expansion port and have it work seamlessly no matter which mode the TFT is in. 

 * Only for TFT24 V1.1, TFT35 V3.0 or TFT28 V3.0

 */ 

//#define CLEAN_MODE_SWITCHING_SUPPORT // Enable CLEAN MODE SWITCHING SUPPORT

/**

 * DEFAULT STARTUP KNOB LED COLOR

 * Choose one of the following numbers --> 1: LED_OFF, 2: LED_WHITE, 3: LED_RED,

 * 4: LED_ORANGE, 5: LED_YELLOW, 6: LED_GREEN,

 * 7: LED_BLUE, 8: LED_INDIGO, 9: LED_VIOLET

 * Default value is: 1 for LED_OFF

 * 

*/

#define STARTUP_KNOB_LED_COLOR 1 //LED_OFF

//===========================================================================

//============================ TFT Mode Settings ============================

//===========================================================================

/**

 * Show BTT bootscreen when starting up

 */

#define SHOW_BTT_BOOTSCREEN

/**

 * TFT mode color

 */ 

#define TITLE_BACKGROUND_COLOR BLACK // Title background color // 0xD928

#define BACKGROUND_COLOR BLACK // Background color // 0x0A29

#define FONT_COLOR WHITE // Font foreground color

#define REMINDER_FONT_COLOR RED // Reminder font color, such as: "No print attached", "Busy process", etc...

#define VOLUME_REMINDER_FONT_COLOR GBLUE // Volume reminder font color,such as: "Card inserted", "Card removed"

#define TOOL_NUM 1 // set in 1~6

#define EXTRUDER_NUM 1 // set in 1~6

#define FAN_NUM 1 // set in 1~6

// PLA PETG ABS

#define PREHEAT_BED {60, 80, 100}

#define PREHEAT_HOTEND {200, 245, 250}

#define PREHEAT_TEXT {"PLA", "PETG", "ABS"}

#define HEAT_MAX_TEMP {150, 275, 275, 275, 275, 275, 275} //max temperature can be set

#define HEAT_SIGN_ID {"B:", "T0:", "T1:", "T2:", "T3:", "T4:", "T5:"}

#define HEAT_DISPLAY_ID {"Bed", "T0", "T1", "T2", "T3", "T4", "T5"}

#define HEAT_CMD {"M140", "M104 T0", "M104 T1", "M104 T2", "M104 T3", "M104 T4", "M104 T5" };

#define HEAT_WAIT_CMD {"M190", "M109 T0", "M109 T1", "M109 T2", "M109 T3", "M109 T4", "M109 T5" };

#define TOOL_CHANGE {"T0", "T1", "T2", "T3", "T4", "T5"}

#define EXTRUDER_ID {"E0", "E1", "E2", "E3", "E4", "E5"}

#define FAN_MAX_PWM {255, 255, 255, 255, 255, 255}

#define FAN_ID {"F0", "F1", "F2", "F3", "F4", "F5"}

#define FAN_CMD {"M106 P0", "M106 P1", "M106 P2", "M106 P3", "M106 P4", "M106 P5" };

#define SPEED_ID {"Sp.", "Fr."}

// Default move speed mm/min

#define DEFAULT_SPEED_MOVE 3000

#define SPEED_MOVE_SLOW 1000

#define SPEED_MOVE_FAST 5000

// Extrude speed mm/min

#define EXTRUDE_SLOW_SPEED 60

#define EXTRUDE_NORMAL_SPEED 600

#define EXTRUDE_FAST_SPEED 1200

// Size of machine

#define X_MIN_POS 0

#define Y_MIN_POS 0

#define Z_MIN_POS 0

#define X_MAX_POS 210

#define Y_MAX_POS 210

#define Z_MAX_POS 560

// Specify a pause position as { X, Y, Z_raise }

#define NOZZLE_PAUSE_RETRACT_LENGTH 15 // (mm)

#define NOZZLE_RESUME_PURGE_LENGTH 16 // (mm)

#define NOZZLE_PAUSE_X_POSITION 100 //(X_MIN_POS + 10) // (mm) Must be an integer

#define NOZZLE_PAUSE_Y_POSITION 100 //(Y_MIN_POS + 10) // (mm) Must be an integer

#define NOZZLE_PAUSE_Z_RAISE 20 // (mm)

#define NOZZLE_PAUSE_E_FEEDRATE 6000 // (mm/min) retract & purge feedrate

#define NOZZLE_PAUSE_XY_FEEDRATE 6000 // (mm/min) X and Y axes feedrate

#define NOZZLE_PAUSE_Z_FEEDRATE 600 // (mm/min) Z axis feedrate

// Send G29 for auto bed leveling

#define AUTO_BED_LEVELING

#ifdef AUTO_BED_LEVELING

  // Enable this will send "M500" after "G29" to store leveling value

  // and send "M420 S1" to enable leveling state after startup

  #define AUTO_SAVE_LOAD_LEVELING_VALUE

#endif

// Move to four corner points to Leveling manually (Point 1, Point 2, Point 3, Point 4)

#define LEVELING_POINT_1_X -80 //(X_MIN_POS + 20)

#define LEVELING_POINT_1_Y -80 //(Y_MIN_POS + 20)

#define LEVELING_POINT_2_X 80 //(X_MAX_POS - 20)

#define LEVELING_POINT_2_Y -80 //(Y_MIN_POS + 20)

#define LEVELING_POINT_3_X 80 //(X_MAX_POS - 20)

#define LEVELING_POINT_3_Y 80 //(Y_MAX_POS - 20)

#define LEVELING_POINT_4_X -80 //(X_MIN_POS + 20)

#define LEVELING_POINT_4_Y 80 //(Y_MAX_POS - 20)

#define LEVELING_POINT_Z 0.2f // Z-axis position when nozzle stays for leveling

#define LEVELING_POINT_MOVE_Z 10.0f // Z-axis position when nozzle move to next point

#define LEVELING_POINT_XY_FEEDRATE 6000 // (mm/min) X and Y axes move feedrate

#define LEVELING_POINT_Z_FEEDRATE 600 // (mm/min) Z axis move feedrate

// Power Supply

#define PS_ON_ACTIVE_HIGH true // Set 'false' for ATX (1), 'true' for X-Box (2)

// Filament runout detection

#define FIL_RUNOUT_INVERTING true // Set to false to invert the logic of the sensor.

#define FIL_NOISE_THRESHOLD 10 // 10*10 = 100ms, Pause print when filament runout is detected for 100ms.

// Smart filament runout detection

// For use with an encoder disc that toggles runout pin as filament moves

#define FILAMENT_RUNOUT_DISTANCE_MM 7

// Enable alternative Move Menu Buttons Layout matching the direction of actual printer axis.

// update the icons from alternate icon folder

#define ALTERNATIVE_MOVE_MENU

// Enable Unified Move Menu

// Move, Home, Extrude, ABL at one Place and bring Gcode Menu on Home Menu

#define UNIFIED_MENU

//-------RESET SETTINGS & TOUCH SCREEN CALIBRATION------||

// To reset the touch screen create a text file with name 'reset.txt' in root folder of the sd card and press reset button.

// SD support

#define ONBOARD_SD_SUPPORT

#ifdef ONBOARD_SD_SUPPORT

  #define M27_AUTOREPORT // Disable M27 polling if you enable enable AUTO_REPORT_SD_STATUS in Marlin

  #define M27_REFRESH 3 // Time in sec for M27 command

  #define M27_WATCH_OTHER_SOURCES true // if true the polling on M27 report is always active. Case: SD print started not from TFT35

#endif

/**

 * Home before power loss recovery

 * Many printer will crash printed model when homing, which is not suitable for home before PLR.

 * This function is suitable for Delta Printer.

 */

//#define HOME_BEFORE_PLR

//#define BTT_MINI_UPS // Backup power / UPS to move the Z axis steppers on power loss

#define POWER_LOSS_ZRAISE 10 // (mm) Z axis raise on resume (on power loss with UPS)

// Prevent extrusion if the temperature is below set temperature

#define PREVENT_COLD_EXTRUSION_MINTEMP 180

/**

  * Maximum hotend temperature of automatic shut down after printing.

  * When enable automatic shutdown(Auto Power), when the hotend temperature is higher than this value

  * turn on the fan to cool down, wait for the hotend temperature to be lower than this value, then turn off the power automatically

  */

#define AUTO_SHUT_DOWN_MAXTEMP 50

//#define EXTRUDE_STEPS 100.0f

#define SHOW_FAN_PERCENTAGE // enable to show fan speed as a percentage instead of a value

/**

 * Rapid Serial Communication:More frequent Serial communicaiton while printing.

 * The controller will send and parse gcodes more frequently while drawing on 

 * screen to prevent printer idling and stuttering due to empty printer buffer.

 * Note: this might make the graphics slow when switching menus while printing.

*/

#define RAPID_SERIAL_COMM

/**

 * Enable list mode in Custom G-Code menu

 * 7 codes in icon mode, 15 items in list mode

 */

#define CUSTOM_GCODE_LIST_MODE

/** CUSTOM GCODE COMMANDS

 * Support up to 7 custom gcodes in Icon mode and 15 in List Mode.

 * Uncomment CUSTOM_X_LABEL and CUSTOM_X_GCODE to enable custom gcode.

 * CUSTOM_X_LABEL is the name of the custom button, CUSTOM_X_GCODE

 * CUSTOM_X_GCODE is the gcode to be sent by the custom button, end with '\n'

 * You also need to customize the icon corresponding to the command if CUSTOM_GCODE_LIST_MODE is not enabled.

 * Copy your custom icon to the SD card to be updated, such as:"TFT35/bmp/Custom0.bmp", "TFT24/bmp/Custom1.bmp", etc...

 * The format of the custom icon is as follows

 * Bit depth: 24 / 32 bit, Pixel size: 95*95(for TFT35), 70*70(for TFT28/TFT24)

 */

#define CUSTOM_0_LABEL "Restore EEPROM"

#define CUSTOM_0_GCODE "M501\n"

#define CUSTOM_1_LABEL "Disable Steppers"

#define CUSTOM_1_GCODE "M84\n"

#define CUSTOM_2_LABEL "Init SD Card"

#define CUSTOM_2_GCODE "M21\n"

#define CUSTOM_3_LABEL "Release SD Card"

#define CUSTOM_3_GCODE "M22\n"

//#define CUSTOM_4_LABEL "Custom4"

//#define CUSTOM_4_GCODE "M105\n"

//#define CUSTOM_5_LABEL "Custom5"

//#define CUSTOM_5_GCODE "M105\n"

//#define CUSTOM_6_LABEL "Custom6"

//#define CUSTOM_6_GCODE "M105\n"

/*

custom gcode below are compatible only if CUSTOM_GCODE_LIST_MODE is active

*/

#ifdef CUSTOM_GCODE_LIST_MODE

//#define CUSTOM_7_LABEL "Custom7"

//#define CUSTOM_7_GCODE "M105\n"

//#define CUSTOM_8_LABEL "Custom8"

//#define CUSTOM_8_GCODE "M105\n"

//#define CUSTOM_9_LABEL "Custom9"

//#define CUSTOM_9_GCODE "M105\n"

//#define CUSTOM_10_LABEL "Custom10"

//#define CUSTOM_10_GCODE "M105\n"

//#define CUSTOM_11_LABEL "Custom11"

//#define CUSTOM_11_GCODE "M105\n"

//#define CUSTOM_12_LABEL "Custom12"

//#define CUSTOM_12_GCODE "M105\n"

//#define CUSTOM_13_LABEL "Custom13"

//#define CUSTOM_13_GCODE "M105\n"

//#define CUSTOM_14_LABEL "Custom14"

//#define CUSTOM_14_GCODE "M105\n"

#endif

//

//Start Gcode - run this gcode before starting print

//

#define PRINT_START_GCODE "G28\n" // home

//

//End Gcode - run this gcode after finishing print

//

#define PRINT_END_GCODE "G90\nG1 E-4\nG92 E0\nM18\n" //reduce filament pressure , reset Extruder position, disable steppers

#define CANCEL_PRINT_GCODE "G28\n"

#endif