LVGL followup fixing "C", etc. (#19517)
This commit is contained in:
parent
d9d920e0b3
commit
6572d7131f
@ -21,10 +21,6 @@
|
|||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" { /* C-declarations for C++ */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <lvgl.h>
|
#include <lvgl.h>
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
@ -168,6 +164,10 @@
|
|||||||
|
|
||||||
#endif // ifdef TFT35
|
#endif // ifdef TFT35
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" { /* C-declarations for C++ */
|
||||||
|
#endif
|
||||||
|
|
||||||
extern char public_buf_m[100];
|
extern char public_buf_m[100];
|
||||||
extern char public_buf_l[30];
|
extern char public_buf_l[30];
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../../../inc/MarlinConfigPre.h"
|
#include "../../../../inc/MarlinConfig.h"
|
||||||
|
|
||||||
#include "../../../../libs/W25Qxx.h"
|
#include "../../../../libs/W25Qxx.h"
|
||||||
|
|
||||||
|
@ -408,7 +408,7 @@ void SysTick_Callback() {
|
|||||||
OUT_WRITE(LCD_BACKLIGHT_PIN, LOW);
|
OUT_WRITE(LCD_BACKLIGHT_PIN, LOW);
|
||||||
LCD_Clear(0x0000);
|
LCD_Clear(0x0000);
|
||||||
|
|
||||||
lcd_draw_logo();
|
TERN_(HAS_LOGO_IN_FLASH, lcd_draw_logo());
|
||||||
|
|
||||||
OUT_WRITE(LCD_BACKLIGHT_PIN, HIGH);
|
OUT_WRITE(LCD_BACKLIGHT_PIN, HIGH);
|
||||||
delay(2000);
|
delay(2000);
|
||||||
@ -724,6 +724,7 @@ lv_fs_res_t sd_open_cb (lv_fs_drv_t * drv, void * file_p, const char * path, lv_
|
|||||||
if (temp) { strcpy(temp,".GCO"); }
|
if (temp) { strcpy(temp,".GCO"); }
|
||||||
sd_read_base_addr = lv_open_gcode_file((char *)name_buf);
|
sd_read_base_addr = lv_open_gcode_file((char *)name_buf);
|
||||||
sd_read_addr_offset = sd_read_base_addr;
|
sd_read_addr_offset = sd_read_base_addr;
|
||||||
|
if (sd_read_addr_offset == 0) return LV_FS_RES_NOT_EX;
|
||||||
return LV_FS_RES_OK;
|
return LV_FS_RES_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user