Browse Source

📺 Add to MKS UI About Screen (#24610)

Keith Bennett 2 years ago
parent
commit
6909f5fa4f
No account linked to committer's email address

+ 14
- 5
Marlin/src/lcd/extui/mks_ui/draw_about.cpp View File

@@ -31,7 +31,7 @@
31 31
 
32 32
 extern lv_group_t *g;
33 33
 static lv_obj_t *scr;
34
-static lv_obj_t *fw_type, *board;
34
+static lv_obj_t *fw_type, *board, *website, *uuid, *protocol;
35 35
 
36 36
 enum { ID_A_RETURN = 1 };
37 37
 
@@ -48,11 +48,20 @@ void lv_draw_about() {
48 48
   scr = lv_screen_create(ABOUT_UI);
49 49
   lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_A_RETURN);
50 50
 
51
-  fw_type = lv_label_create(scr, "Firmware: Marlin " SHORT_BUILD_VERSION);
52
-  lv_obj_align(fw_type, nullptr, LV_ALIGN_CENTER, 0, -20);
51
+  board = lv_label_create(scr, BOARD_INFO_NAME);
52
+  lv_obj_align(board, nullptr, LV_ALIGN_CENTER, 0, -80);
53 53
 
54
-  board = lv_label_create(scr, "Board: " BOARD_INFO_NAME);
55
-  lv_obj_align(board, nullptr, LV_ALIGN_CENTER, 0, -60);
54
+  fw_type = lv_label_create(scr, "Marlin " SHORT_BUILD_VERSION " (" STRING_DISTRIBUTION_DATE ")");
55
+  lv_obj_align(fw_type, nullptr, LV_ALIGN_CENTER, 0, -50);
56
+
57
+  website = lv_label_create(scr, WEBSITE_URL);
58
+  lv_obj_align(website, nullptr, LV_ALIGN_CENTER, 0, -20);
59
+
60
+  uuid = lv_label_create(scr, "UUID: " DEFAULT_MACHINE_UUID);
61
+  lv_obj_align(uuid, nullptr, LV_ALIGN_CENTER, 0, 10);
62
+
63
+  protocol = lv_label_create(scr, "Protocol: " PROTOCOL_VERSION);
64
+  lv_obj_align(protocol, nullptr, LV_ALIGN_CENTER, 0, 40);
56 65
 }
57 66
 
58 67
 void lv_clear_about() {

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h View File

@@ -29,7 +29,7 @@
29 29
 #define ALLOW_STM32DUINO
30 30
 #include "env_validate.h"
31 31
 
32
-#define BOARD_INFO_NAME "MKS Robin Nano"
32
+#define BOARD_INFO_NAME "MKS Robin Nano V1"
33 33
 
34 34
 //
35 35
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role

Loading…
Cancel
Save