andrey/Marlin_FB4S
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

MKS UI fix

Browse Source
This commit is contained in:
Sergey
2021-11-22 16:03:10 +03:00
parent 1a0905cec7
commit 31bc558235
9 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/Configuration.h
View File

@@ -123,8 +123,8 @@
* Currently Ethernet (-2) is only supported on Teensy 4.1 boards. * Currently Ethernet (-2) is only supported on Teensy 4.1 boards.
* :[-2, -1, 0, 1, 2, 3, 4, 5, 6, 7] * :[-2, -1, 0, 1, 2, 3, 4, 5, 6, 7]
*/ */
#define SERIAL_PORT_2 1 //#define SERIAL_PORT_2 1
#define BAUDRATE_2 115200 // Enable to override BAUDRATE //#define BAUDRATE_2 115200 // Enable to override BAUDRATE
/** /**
* Select a third serial port on the board to use for communication with the host. * Select a third serial port on the board to use for communication with the host.
@@ -140,6 +140,7 @@
// Choose the name from boards.h that matches your setup // Choose the name from boards.h that matches your setup
#ifndef MOTHERBOARD #ifndef MOTHERBOARD
#define MOTHERBOARD BOARD_MKS_ROBIN_NANO #define MOTHERBOARD BOARD_MKS_ROBIN_NANO
//#define MOTHERBOARD BOARD_MKS_ROBIN_NANO_V1_3_F4
#endif #endif
// Name displayed in the LCD "Ready" message and Info menu // Name displayed in the LCD "Ready" message and Info menu
@@ -1465,7 +1466,7 @@
* RAMPS-based boards use SERVO3_PIN for the first runout sensor. * 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. * 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) #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 false // 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 NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
@@ -1698,7 +1699,7 @@
* Add a bed leveling sub-menu for ABL or MBL. * Add a bed leveling sub-menu for ABL or MBL.
* Include a guided procedure if manual probing is enabled. * Include a guided procedure if manual probing is enabled.
*/ */
#define LCD_BED_LEVELING //#define LCD_BED_LEVELING
#if ENABLED(LCD_BED_LEVELING) #if ENABLED(LCD_BED_LEVELING)
#define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis. #define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis.
@@ -2766,8 +2767,8 @@
* root of your SD card, together with the compiled firmware. * root of your SD card, together with the compiled firmware.
*/ */
//#define TFT_CLASSIC_UI //#define TFT_CLASSIC_UI
#define TFT_COLOR_UI //#define TFT_COLOR_UI
//#define TFT_LVGL_UI #define TFT_LVGL_UI
#if ENABLED(TFT_LVGL_UI) #if ENABLED(TFT_LVGL_UI)
#define MKS_WIFI_MODULE // MKS WiFi module #define MKS_WIFI_MODULE // MKS WiFi module
@@ -2811,7 +2812,7 @@
// //
// Touch Screen Settings // Touch Screen Settings
// //
#define TOUCH_SCREEN //#define TOUCH_SCREEN
#if ENABLED(TOUCH_SCREEN) #if ENABLED(TOUCH_SCREEN)
#define BUTTON_DELAY_EDIT 50 // (ms) Button repeat delay for edit screens #define BUTTON_DELAY_EDIT 50 // (ms) Button repeat delay for edit screens
#define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus #define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus

2
Marlin/Configuration_adv.h
View File

@@ -2389,7 +2389,7 @@
* *
* Enable PARK_HEAD_ON_PAUSE to add the G-code M125 Pause and Park. * Enable PARK_HEAD_ON_PAUSE to add the G-code M125 Pause and Park.
*/ */
#define ADVANCED_PAUSE_FEATURE //#define ADVANCED_PAUSE_FEATURE
#if ENABLED(ADVANCED_PAUSE_FEATURE) #if ENABLED(ADVANCED_PAUSE_FEATURE)
#define PAUSE_PARK_RETRACT_FEEDRATE 35 // (mm/s) Initial retract feedrate. #define PAUSE_PARK_RETRACT_FEEDRATE 35 // (mm/s) Initial retract feedrate.
#define PAUSE_PARK_RETRACT_LENGTH 2 // (mm) Initial retract. #define PAUSE_PARK_RETRACT_LENGTH 2 // (mm) Initial retract.

2
Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
View File

@@ -84,7 +84,7 @@ lv_group_t* g;
uint16_t DeviceCode = 0x9488; uint16_t DeviceCode = 0x9488;
extern uint8_t sel_id; extern uint8_t sel_id;
uint8_t bmp_public_buf[14 * 1024]; uint8_t bmp_public_buf[BUF_SIZE_KB * 1024];
uint8_t public_buf[513]; uint8_t public_buf[513];
extern bool flash_preview_begin, default_preview_flg, gcode_preview_over; extern bool flash_preview_begin, default_preview_flg, gcode_preview_over;

4
Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h
View File

@@ -31,10 +31,10 @@
#endif #endif
#include <lvgl.h> #include <lvgl.h>
#include "../../../pins/pins.h"
//#define TFT_ROTATION TFT_ROTATE_180 //#define TFT_ROTATION TFT_ROTATE_180
extern uint8_t bmp_public_buf[14 * 1024]; extern uint8_t bmp_public_buf[BUF_SIZE_KB * 1024];
extern uint8_t public_buf[513]; extern uint8_t public_buf[513];
void tft_lvgl_init(); void tft_lvgl_init();

2
Marlin/src/lcd/extui/mks_ui/wifi_module.h
View File

@@ -61,7 +61,7 @@ typedef enum {
udisk_buf_full, udisk_buf_full,
} UDISK_DATA_BUFFER_STATE; } UDISK_DATA_BUFFER_STATE;
#define TRANS_RCV_FIFO_BLOCK_NUM 14 #define TRANS_RCV_FIFO_BLOCK_NUM BUF_SIZE_KB
typedef struct { typedef struct {
bool receiveEspData; bool receiveEspData;

4
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
View File

@@ -45,3 +45,7 @@
//#define LED_PIN PB2 //#define LED_PIN PB2
#include "pins_MKS_ROBIN_NANO_common.h" #include "pins_MKS_ROBIN_NANO_common.h"
#if HAS_TFT_LVGL_UI
#define BUF_SIZE_KB 6
#endif

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
View File

@@ -197,7 +197,7 @@
#define TOUCH_BUTTONS_HW_SPI #define TOUCH_BUTTONS_HW_SPI
#define TOUCH_BUTTONS_HW_SPI_DEVICE 2 #define TOUCH_BUTTONS_HW_SPI_DEVICE 2
#define TFT_BUFFER_SIZE 14400 #define TFT_BUFFER_SIZE 20*480
#endif #endif
#define HAS_SPI_FLASH 1 #define HAS_SPI_FLASH 1

4
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V1_3_F4.h
View File

@@ -43,3 +43,7 @@
#define LED_PIN PB1 #define LED_PIN PB1
#include "../stm32f1/pins_MKS_ROBIN_NANO_common.h" #include "../stm32f1/pins_MKS_ROBIN_NANO_common.h"
#if HAS_TFT_LVGL_UI
#define BUF_SIZE_KB 14
#endif

1
platformio.ini
View File

@@ -14,6 +14,7 @@
src_dir = Marlin src_dir = Marlin
boards_dir = buildroot/share/PlatformIO/boards boards_dir = buildroot/share/PlatformIO/boards
default_envs = mks_robin_nano35 default_envs = mks_robin_nano35
#default_envs = mks_robin_nano_v1_3_f4
include_dir = Marlin include_dir = Marlin
extra_configs = extra_configs =
ini/avr.ini ini/avr.ini