Bladeren bron

LVGL followup fixing "C", etc. (#19517)

Victor Oliveira 3 jaren geleden
bovenliggende
commit
6572d7131f
No account linked to committer's email address

+ 4
- 4
Marlin/src/lcd/extui/lib/mks_ui/draw_ui.h Bestand weergeven

21
  */
21
  */
22
 #pragma once
22
 #pragma once
23
 
23
 
24
-#ifdef __cplusplus
25
-  extern "C" { /* C-declarations for C++ */
26
-#endif
27
-
28
 #include <lvgl.h>
24
 #include <lvgl.h>
29
 
25
 
30
 #include <stdint.h>
26
 #include <stdint.h>
168
 
164
 
169
 #endif // ifdef TFT35
165
 #endif // ifdef TFT35
170
 
166
 
167
+#ifdef __cplusplus
168
+  extern "C" { /* C-declarations for C++ */
169
+#endif
170
+
171
 extern char public_buf_m[100];
171
 extern char public_buf_m[100];
172
 extern char public_buf_l[30];
172
 extern char public_buf_l[30];
173
 
173
 

+ 1
- 1
Marlin/src/lcd/extui/lib/mks_ui/pic_manager.h Bestand weergeven

21
  */
21
  */
22
 #pragma once
22
 #pragma once
23
 
23
 
24
-#include "../../../../inc/MarlinConfigPre.h"
24
+#include "../../../../inc/MarlinConfig.h"
25
 
25
 
26
 #include "../../../../libs/W25Qxx.h"
26
 #include "../../../../libs/W25Qxx.h"
27
 
27
 

+ 2
- 1
Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp Bestand weergeven

408
       OUT_WRITE(LCD_BACKLIGHT_PIN, LOW);
408
       OUT_WRITE(LCD_BACKLIGHT_PIN, LOW);
409
       LCD_Clear(0x0000);
409
       LCD_Clear(0x0000);
410
 
410
 
411
-      lcd_draw_logo();
411
+      TERN_(HAS_LOGO_IN_FLASH, lcd_draw_logo());
412
 
412
 
413
       OUT_WRITE(LCD_BACKLIGHT_PIN, HIGH);
413
       OUT_WRITE(LCD_BACKLIGHT_PIN, HIGH);
414
       delay(2000);
414
       delay(2000);
724
   if (temp) { strcpy(temp,".GCO"); }
724
   if (temp) { strcpy(temp,".GCO"); }
725
   sd_read_base_addr = lv_open_gcode_file((char *)name_buf);
725
   sd_read_base_addr = lv_open_gcode_file((char *)name_buf);
726
   sd_read_addr_offset = sd_read_base_addr;
726
   sd_read_addr_offset = sd_read_base_addr;
727
+  if (sd_read_addr_offset == 0) return LV_FS_RES_NOT_EX;
727
   return LV_FS_RES_OK;
728
   return LV_FS_RES_OK;
728
 }
729
 }
729
 
730
 

Laden…
Annuleren
Opslaan