diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.26.x.bin index 9451e98d42..70d7fc249e 100755 Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.26.x.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT28_V3.0.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT28_V3.0.26.x.bin index c39afecb66..2ca9a7a267 100755 Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT28_V3.0.26.x.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT28_V3.0.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.26.x.bin index 96082c6b4c..8de74a5796 100755 Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.26.x.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_B1.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_B1.26.x.bin index 8e78ca81e1..683fced121 100755 Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_B1.26.x.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_B1.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_E3.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_E3.26.x.bin index 942af62285..04509f0a84 100755 Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_E3.26.x.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_E3.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT43_V3.0.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT43_V3.0.26.x.bin index 1fa3a0013e..ea8680d99a 100755 Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT43_V3.0.26.x.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT43_V3.0.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT50_V3.0.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT50_V3.0.26.x.bin index d7fa42ce63..a496643aba 100755 Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT50_V3.0.26.x.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT50_V3.0.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT70_V3.0.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT70_V3.0.26.x.bin index ee591d62e6..951f30109c 100755 Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT70_V3.0.26.x.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT70_V3.0.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.26.x.bin b/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.26.x.bin index e4db598a8e..e0e5cff9f9 100755 Binary files a/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.26.x.bin and b/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.26.x.bin b/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.26.x.bin index 3a771d9dda..185cd11fa7 100755 Binary files a/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.26.x.bin and b/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.26.x.bin b/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.26.x.bin index 7a93f4e4cf..ec665bec39 100755 Binary files a/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.26.x.bin and b/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.26.x.bin b/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.26.x.bin index 68b9a74644..2f7d5463ae 100755 Binary files a/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.26.x.bin and b/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.26.x.bin b/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.26.x.bin index eeafe81e40..45f7dc6f4c 100755 Binary files a/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.26.x.bin and b/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.26.x.bin differ diff --git a/Copy to SD Card root directory to update/MKSTFT28.bin b/Copy to SD Card root directory to update/MKSTFT28.bin index ce3fdedc47..fd01788ff2 100755 Binary files a/Copy to SD Card root directory to update/MKSTFT28.bin and b/Copy to SD Card root directory to update/MKSTFT28.bin differ diff --git a/Copy to SD Card root directory to update/MKS_32_V1_4.26.x.bin b/Copy to SD Card root directory to update/MKS_32_V1_4.26.x.bin index 486404e6f9..7ea9ef0961 100755 Binary files a/Copy to SD Card root directory to update/MKS_32_V1_4.26.x.bin and b/Copy to SD Card root directory to update/MKS_32_V1_4.26.x.bin differ diff --git a/TFT/src/User/API/parseACK.c b/TFT/src/User/API/parseACK.c index b2a9e10946..db0007ccc4 100644 --- a/TFT/src/User/API/parseACK.c +++ b/TFT/src/User/API/parseACK.c @@ -66,10 +66,10 @@ static char ack_cmp(const char *str) u16 i; for(i=0; i #include "Configuration.h" +#include "includes.h" static const char errormagic[] = "Error:"; static const char echomagic[] = "echo:"; + #define ACK_MAX_SIZE 512 typedef enum // popup message types available to display an echo message diff --git a/TFT/src/User/Menu/Popup.c b/TFT/src/User/Menu/Popup.c index cff0a94ff2..c7a10b82ae 100644 --- a/TFT/src/User/Menu/Popup.c +++ b/TFT/src/User/Menu/Popup.c @@ -144,6 +144,11 @@ void _setDialogMsgStr(uint8_t * str) popup_strcpy(popup_msg, str, sizeof(popup_msg)); } +uint8_t *getDialogMsgStr() +{ + return (uint8_t *)popup_msg; +} + void _setDialogOkTextStr(uint8_t * str) { popup_strcpy(popup_ok, str, sizeof(popup_ok)); diff --git a/TFT/src/User/Menu/Popup.h b/TFT/src/User/Menu/Popup.h index ea5318d9e7..1aadd4c3f3 100644 --- a/TFT/src/User/Menu/Popup.h +++ b/TFT/src/User/Menu/Popup.h @@ -25,6 +25,7 @@ extern BUTTON bottomDoubleBtn[]; void _setDialogTitleStr(uint8_t * str); void _setDialogMsgStr(uint8_t * str); +uint8_t *getDialogMsgStr(void); void _setDialogOkTextStr(uint8_t * str); void _setDialogCancelTextStr(uint8_t * str);