sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🎨 MKS hardware test followup (#22395)

Browse Source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
Malderin
2021-07-20 23:07:32 +03:00
committed by GitHub
parent 2d4be74db9
commit a90968b0ce
3 changed files with 73 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,6 +127,8 @@
delay(100); delay(100);
} }
#if ENABLED(SDSUPPORT)
void mks_gpio_test() { void mks_gpio_test() {
init_test_gpio(); init_test_gpio();
@@ -199,6 +201,8 @@
mks_disp_test(); mks_disp_test();
} }
#endif
#endif // MKS_TEST #endif // MKS_TEST
static const uint16_t ASCII_Table_16x24[] PROGMEM = { static const uint16_t ASCII_Table_16x24[] PROGMEM = {
@@ -613,7 +617,7 @@ void disp_assets_update_progress(const char *msg) {
disp_string(100, 165, buf, 0xFFFF, 0x0000); disp_string(100, 165, buf, 0xFFFF, 0x0000);
} }
#if ENABLED(SDSUPPORT) #if BOTH(MKS_TEST, SDSUPPORT)
uint8_t mks_test_flag = 0; uint8_t mks_test_flag = 0;
const char *MKSTestPath = "MKS_TEST"; const char *MKSTestPath = "MKS_TEST";
void mks_test_get() { void mks_test_get() {

9
Marlin/src/lcd/extui/mks_ui/mks_hardware.h
View File

@@ -26,17 +26,14 @@
#include <lvgl.h> #include <lvgl.h>
// Functions for MKS_TEST // Functions for MKS_TEST
#if ENABLED(MKS_TEST) #if BOTH(MKS_TEST, SDSUPPORT)
void mks_gpio_test();
void mks_hardware_test(); void mks_hardware_test();
void mks_test_get(); void mks_test_get();
void mks_gpio_test();
extern uint8_t mks_test_flag;
#endif #endif
// String display and assets // 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);
#if ENABLED(SDSUPPORT)
extern uint8_t mks_test_flag;
#endif

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

@@ -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();