Add better support for Printer SD / TFT SD /TFT USB from ESP3D and ot…

…her extern prog bigtreetech#648
Uz45 · May 8, 2020 · d029c10 · d029c10
1 parent a472b02
commit d029c10
Show file tree

Hide file tree

Showing 30 changed files with 2 additions and 2 deletions.
diff --git a/...D Card root directory to update - Unified Menu Material theme/BIGTREE_TFT24_V1.1.26.1.bin b/...D Card root directory to update - Unified Menu Material theme/BIGTREE_TFT24_V1.1.26.1.bin
diff --git a/...D Card root directory to update - Unified Menu Material theme/BIGTREE_TFT28_V3.0.26.1.bin b/...D Card root directory to update - Unified Menu Material theme/BIGTREE_TFT28_V3.0.26.1.bin
diff --git a/...D Card root directory to update - Unified Menu Material theme/BIGTREE_TFT35_V3.0.26.1.bin b/...D Card root directory to update - Unified Menu Material theme/BIGTREE_TFT35_V3.0.26.1.bin
diff --git a/...ard root directory to update - Unified Menu Material theme/BIGTREE_TFT35_V3.0_E3.26.1.bin b/...ard root directory to update - Unified Menu Material theme/BIGTREE_TFT35_V3.0_E3.26.1.bin
diff --git a/...o SD Card root directory to update - Unified Menu Material theme/BIQU_TFT28_V1.0.26.1.bin b/...o SD Card root directory to update - Unified Menu Material theme/BIQU_TFT28_V1.0.26.1.bin
diff --git a/...Card root directory to update - Unified Menu Material theme/BIQU_TFT35_APP1_V2.0.26.1.bin b/...Card root directory to update - Unified Menu Material theme/BIQU_TFT35_APP1_V2.0.26.1.bin
diff --git a/...o SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.0.26.1.bin b/...o SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.0.26.1.bin
diff --git a/...o SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.1.26.1.bin b/...o SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.1.26.1.bin
diff --git a/...o SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.2.26.1.bin b/...o SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.2.26.1.bin
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/MKS_32_V1_1.26.1.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/MKS_32_V1_1.26.1.bin
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/MKS_32_V1_2.26.1.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/MKS_32_V1_2.26.1.bin
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/MKS_32_V1_3.26.1.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/MKS_32_V1_3.26.1.bin
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/MKS_32_V1_3M.26.1.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/MKS_32_V1_3M.26.1.bin
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/MKS_32_V1_4.26.1.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/MKS_32_V1_4.26.1.bin
diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.26.1.bin b/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.26.1.bin
diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT28_V3.0.26.1.bin b/Copy to SD Card root directory to update/BIGTREE_TFT28_V3.0.26.1.bin
diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.26.1.bin b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.26.1.bin
diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_E3.26.1.bin b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_E3.26.1.bin
diff --git a/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.26.1.bin b/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.26.1.bin
diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.26.1.bin b/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.26.1.bin
diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.26.1.bin b/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.26.1.bin
diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.26.1.bin b/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.26.1.bin
diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.26.1.bin b/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.26.1.bin
diff --git a/Copy to SD Card root directory to update/MKS_32_V1_1.26.1.bin b/Copy to SD Card root directory to update/MKS_32_V1_1.26.1.bin
diff --git a/Copy to SD Card root directory to update/MKS_32_V1_2.26.1.bin b/Copy to SD Card root directory to update/MKS_32_V1_2.26.1.bin
diff --git a/Copy to SD Card root directory to update/MKS_32_V1_3.26.1.bin b/Copy to SD Card root directory to update/MKS_32_V1_3.26.1.bin
diff --git a/Copy to SD Card root directory to update/MKS_32_V1_3M.26.1.bin b/Copy to SD Card root directory to update/MKS_32_V1_3M.26.1.bin
diff --git a/Copy to SD Card root directory to update/MKS_32_V1_4.26.1.bin b/Copy to SD Card root directory to update/MKS_32_V1_4.26.1.bin
diff --git a/TFT/src/User/API/boot.c b/TFT/src/User/API/boot.c
@@ -26,7 +26,7 @@ BMPUPDATE_STAT bmp_stat = BMP_SUCCESS;
 //This List is Auto-Generated. Please add new icons in icon_list.inc only
 const char iconBmpName[][32]={
 #define X_ICON(NAME) STRINGIFY(NAME) ,
-#if defined (MKS_32_V1_1)
+#if defined (MKS_32_V1_1) && defined (UNIFIED_MENU)
 #include "icon_listv1.inc"
 #else
 #include "icon_list.inc"

diff --git a/TFT/src/User/API/boot.h b/TFT/src/User/API/boot.h
@@ -46,7 +46,7 @@
 enum
 {
 #define X_ICON(NAME) ICON_##NAME ,
-#if defined (MKS_32_V1_1)
+#if defined (MKS_32_V1_1) && defined (UNIFIED_MENU)
 #include "icon_listv1.inc"
 #else
 #include "icon_list.inc"