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

🐛 Fix MKS UI compile (#22388, #22395) 

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
vanilla_fb_2.0.x
Malderin 3 years ago
committed by Scott Lahteine
parent
95f0970d85
commit
f1161a9a5f
8 changed files with 95 additions and 101 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Marlin/src/MarlinCore.cpp
  2. 7
      Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
  3. 7
      Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
  4. 4
      Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
  5. 147
      Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
  6. 16
      Marlin/src/lcd/extui/mks_ui/mks_hardware.h
  7. 7
      Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
  8. 6
      Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp

2
Marlin/src/MarlinCore.cpp
View File

@ -70,7 +70,7 @@
#if HAS_TFT_LVGL_UI #if HAS_TFT_LVGL_UI
#include "lcd/extui/mks_ui/tft_lvgl_configuration.h" #include "lcd/extui/mks_ui/tft_lvgl_configuration.h"
#include "lcd/extui/mks_ui/draw_ui.h" #include "lcd/extui/mks_ui/draw_ui.h"
#include "lcd/extui/mks_ui/mks_hardware_test.h" #include "lcd/extui/mks_ui/mks_hardware.h"
#include <lvgl.h> #include <lvgl.h>
#endif #endif

7
Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
View File

@ -25,15 +25,10 @@
#include "draw_ui.h" #include "draw_ui.h"
#include <lv_conf.h> #include <lv_conf.h>
#include "tft_lvgl_configuration.h" #include "tft_lvgl_configuration.h"
#include "SPI_TFT.h" #include "SPI_TFT.h"
#include "../../../inc/MarlinConfig.h" #include "../../../inc/MarlinConfig.h"
#include "mks_hardware.h"
#if ENABLED(MKS_TEST)
#include "mks_hardware_test.h"
#endif
static lv_obj_t *scr; static lv_obj_t *scr;

7
Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
View File

@ -39,10 +39,7 @@
#include "draw_touch_calibration.h" #include "draw_touch_calibration.h"
#endif #endif
#if ENABLED(MKS_TEST) #include "mks_hardware.h"
#include "mks_hardware_test.h"
#endif
#include <stdio.h> #include <stdio.h>
#define ICON_POS_Y 38 #define ICON_POS_Y 38
@ -129,7 +126,7 @@ void lv_draw_ready_print() {
ZERO(disp_state_stack._disp_state); ZERO(disp_state_stack._disp_state);
scr = lv_screen_create(PRINT_READY_UI, ""); scr = lv_screen_create(PRINT_READY_UI, "");
if (mks_test_flag == 0x1E) { if (TERN0(SDSUPPORT, mks_test_flag == 0x1E)) {
// Create image buttons // Create image buttons
buttonTool = lv_imgbtn_create(scr, "F:/bmp_tool.bin", event_handler, ID_TOOL); buttonTool = lv_imgbtn_create(scr, "F:/bmp_tool.bin", event_handler, ID_TOOL);

4
Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
View File

@ -52,7 +52,7 @@
#endif #endif
#if ENABLED(MKS_TEST) #if ENABLED(MKS_TEST)
#include "mks_hardware_test.h" #include "mks_hardware.h"
#endif #endif
CFG_ITMES gCfgItems; CFG_ITMES gCfgItems;
@ -1366,7 +1366,7 @@ void print_time_count() {
void LV_TASK_HANDLER() { void LV_TASK_HANDLER() {
lv_task_handler(); lv_task_handler();
#if ENABLED(MKS_TEST) #if BOTH(MKS_TEST, SDSUPPORT)
if (mks_test_flag == 0x1E) mks_hardware_test(); if (mks_test_flag == 0x1E) mks_hardware_test();
#endif #endif

147
Marlin/src/lcd/extui/mks_ui/mks_hardware_test.cpp → Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
View File

@ -37,7 +37,7 @@
#if ENABLED(MKS_TEST) #if ENABLED(MKS_TEST)
#include "mks_hardware_test.h" #include "mks_hardware.h"
bool pw_det_sta, pw_off_sta, mt_det_sta; bool pw_det_sta, pw_off_sta, mt_det_sta;
#if PIN_EXISTS(MT_DET_2) #if PIN_EXISTS(MT_DET_2)
@ -127,77 +127,81 @@
delay(100); delay(100);
} }
void mks_gpio_test() { #if ENABLED(SDSUPPORT)
init_test_gpio();
void mks_gpio_test() {
test_gpio_readlevel_L(); init_test_gpio();
test_gpio_readlevel_H();
test_gpio_readlevel_L(); test_gpio_readlevel_L();
if (pw_det_sta && pw_off_sta && mt_det_sta test_gpio_readlevel_H();
#if PIN_EXISTS(MT_DET_2) test_gpio_readlevel_L();
&& mt_det2_sta if (pw_det_sta && pw_off_sta && mt_det_sta
#endif #if PIN_EXISTS(MT_DET_2)
#if ENABLED(MKS_HARDWARE_TEST_ONLY_E0) && mt_det2_sta
&& (READ(PA1) == LOW) #endif
&& (READ(PA3) == LOW) #if ENABLED(MKS_HARDWARE_TEST_ONLY_E0)
&& (READ(PC2) == LOW) && (READ(PA1) == LOW)
&& (READ(PD8) == LOW) && (READ(PA3) == LOW)
&& (READ(PE5) == LOW) && (READ(PC2) == LOW)
&& (READ(PE6) == LOW) && (READ(PD8) == LOW)
&& (READ(PE7) == LOW) && (READ(PE5) == LOW)
#endif && (READ(PE6) == LOW)
) && (READ(PE7) == LOW)
disp_det_ok(); #endif
else )
disp_det_error(); disp_det_ok();
else
if (endstopx1_sta && endstopy1_sta && endstopz1_sta && endstopz2_sta) disp_det_error();
disp_Limit_ok();
else if (endstopx1_sta && endstopy1_sta && endstopz1_sta && endstopz2_sta)
disp_Limit_error(); disp_Limit_ok();
} else
disp_Limit_error();
void mks_hardware_test() {
if (millis() % 2000 < 1000) {
WRITE(X_DIR_PIN, LOW);
WRITE(Y_DIR_PIN, LOW);
WRITE(Z_DIR_PIN, LOW);
WRITE(E0_DIR_PIN, LOW);
#if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
WRITE(E1_DIR_PIN, LOW);
#endif
thermalManager.fan_speed[0] = 255;
#if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
WRITE(HEATER_1_PIN, HIGH); // HE1
#endif
WRITE(HEATER_0_PIN, HIGH); // HE0
WRITE(HEATER_BED_PIN, HIGH); // HOT-BED
}
else {
WRITE(X_DIR_PIN, HIGH);
WRITE(Y_DIR_PIN, HIGH);
WRITE(Z_DIR_PIN, HIGH);
WRITE(E0_DIR_PIN, HIGH);
#if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
WRITE(E1_DIR_PIN, HIGH);
#endif
thermalManager.fan_speed[0] = 0;
#if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
WRITE(HEATER_1_PIN, LOW); // HE1
#endif
WRITE(HEATER_0_PIN, LOW); // HE0
WRITE(HEATER_BED_PIN, LOW); // HOT-BED
} }
if (endstopx1_sta && endstopx2_sta && endstopy1_sta && endstopy2_sta && endstopz1_sta && endstopz2_sta) { void mks_hardware_test() {
// nothing here if (millis() % 2000 < 1000) {
} WRITE(X_DIR_PIN, LOW);
else { WRITE(Y_DIR_PIN, LOW);
WRITE(Z_DIR_PIN, LOW);
WRITE(E0_DIR_PIN, LOW);
#if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
WRITE(E1_DIR_PIN, LOW);
#endif
thermalManager.fan_speed[0] = 255;
#if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
WRITE(HEATER_1_PIN, HIGH); // HE1
#endif
WRITE(HEATER_0_PIN, HIGH); // HE0
WRITE(HEATER_BED_PIN, HIGH); // HOT-BED
}
else {
WRITE(X_DIR_PIN, HIGH);
WRITE(Y_DIR_PIN, HIGH);
WRITE(Z_DIR_PIN, HIGH);
WRITE(E0_DIR_PIN, HIGH);
#if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
WRITE(E1_DIR_PIN, HIGH);
#endif
thermalManager.fan_speed[0] = 0;
#if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
WRITE(HEATER_1_PIN, LOW); // HE1
#endif
WRITE(HEATER_0_PIN, LOW); // HE0
WRITE(HEATER_BED_PIN, LOW); // HOT-BED
}
if (endstopx1_sta && endstopx2_sta && endstopy1_sta && endstopy2_sta && endstopz1_sta && endstopz2_sta) {
// nothing here
}
else {
}
if (disp_state == PRINT_READY_UI)
mks_disp_test();
} }
if (disp_state == PRINT_READY_UI) #endif
mks_disp_test();
}
#endif // MKS_TEST #endif // MKS_TEST
@ -613,10 +617,9 @@ void disp_assets_update_progress(const char *msg) {
disp_string(100, 165, buf, 0xFFFF, 0x0000); disp_string(100, 165, buf, 0xFFFF, 0x0000);
} }
uint8_t mks_test_flag = 0; #if BOTH(MKS_TEST, SDSUPPORT)
const char *MKSTestPath = "MKS_TEST"; uint8_t mks_test_flag = 0;
const char *MKSTestPath = "MKS_TEST";
#if ENABLED(SDSUPPORT)
void mks_test_get() { void mks_test_get() {
SdFile dir, root = card.getroot(); SdFile dir, root = card.getroot();
if (dir.open(&root, MKSTestPath, O_RDONLY)) if (dir.open(&root, MKSTestPath, O_RDONLY))

16
Marlin/src/lcd/extui/mks_ui/mks_hardware_test.h → Marlin/src/lcd/extui/mks_ui/mks_hardware.h
View File

@ -21,15 +21,19 @@
*/ */
#pragma once #pragma once
#include "../../../inc/MarlinConfigPre.h"
#include <lvgl.h> #include <lvgl.h>
void mks_gpio_test(); // Functions for MKS_TEST
void mks_hardware_test(); #if BOTH(MKS_TEST, SDSUPPORT)
void mks_test_get(); void mks_hardware_test();
void mks_test_get();
void mks_gpio_test();
extern uint8_t mks_test_flag;
#endif
void disp_char_1624(uint16_t x, uint16_t y, uint8_t c, uint16_t charColor, uint16_t bkColor); // String display and assets
void disp_string(uint16_t x, uint16_t y, const char * string, uint16_t charColor, uint16_t bkColor); void disp_string(uint16_t x, uint16_t y, const char * string, uint16_t charColor, uint16_t bkColor);
void disp_assets_update(); void disp_assets_update();
void disp_assets_update_progress(const char *msg); void disp_assets_update_progress(const char *msg);
extern uint8_t mks_test_flag;

7
Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
View File

@ -27,14 +27,9 @@
#include "draw_ui.h" #include "draw_ui.h"
#include "pic_manager.h" #include "pic_manager.h"
#include "draw_ready_print.h" #include "draw_ready_print.h"
#include "mks_hardware.h"
#if ENABLED(MKS_TEST)
#include "mks_hardware_test.h"
#endif
#include "SPIFlashStorage.h" #include "SPIFlashStorage.h"
#include "../../../libs/W25Qxx.h" #include "../../../libs/W25Qxx.h"
#include "../../../sd/cardreader.h" #include "../../../sd/cardreader.h"
#include "../../../MarlinCore.h" #include "../../../MarlinCore.h"

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

@ -29,7 +29,7 @@
#include "draw_ready_print.h" #include "draw_ready_print.h"
#include "pic_manager.h" #include "pic_manager.h"
#include "mks_hardware_test.h" #include "mks_hardware.h"
#include "draw_ui.h" #include "draw_ui.h"
#include "SPIFlashStorage.h" #include "SPIFlashStorage.h"
#include <lvgl.h> #include <lvgl.h>
@ -139,7 +139,7 @@ void tft_lvgl_init() {
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
UpdateAssets(); UpdateAssets();
watchdog_refresh(); // LVGL init takes time watchdog_refresh(); // LVGL init takes time
mks_test_get(); TERN_(MKS_TEST, mks_test_get());
#endif #endif
touch.Init(); touch.Init();
@ -231,7 +231,7 @@ void tft_lvgl_init() {
if (ready) lv_draw_ready_print(); if (ready) lv_draw_ready_print();
#if ENABLED(MKS_TEST) #if BOTH(MKS_TEST, SDSUPPORT)
if (mks_test_flag == 0x1E) mks_gpio_test(); if (mks_test_flag == 0x1E) mks_gpio_test();
#endif #endif
} }

Write Preview
Loading…
Cancel
Save