diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT24_V1.1.25.1.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT24_V1.1.25.1.bin new file mode 100644 index 0000000000..1bb026d056 Binary files /dev/null and b/Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT24_V1.1.25.1.bin differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT28_V3.0.25.1.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT28_V3.0.25.1.bin new file mode 100644 index 0000000000..ce1f361baa Binary files /dev/null and b/Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT28_V3.0.25.1.bin differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT35_V3.0.25.1.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT35_V3.0.25.1.bin new file mode 100644 index 0000000000..64ddea1751 Binary files /dev/null and b/Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT35_V3.0.25.1.bin differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT28_V1.0.25.1.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT28_V1.0.25.1.bin new file mode 100644 index 0000000000..a23b74ed6c Binary files /dev/null and b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT28_V1.0.25.1.bin differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_APP1_V2.0.25.1.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_APP1_V2.0.25.1.bin new file mode 100644 index 0000000000..83b5ed9b4a Binary files /dev/null and b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_APP1_V2.0.25.1.bin differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.0.25.1.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.0.25.1.bin new file mode 100644 index 0000000000..93304be8fa Binary files /dev/null and b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.0.25.1.bin differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.1.25.1.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.1.25.1.bin new file mode 100644 index 0000000000..04fb9bc92f Binary files /dev/null and b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.1.25.1.bin differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.2.25.1.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.2.25.1.bin new file mode 100644 index 0000000000..d2a9ddd27c Binary files /dev/null and b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.2.25.1.bin differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/BIGTREE_TFT24_V1.1.24.2.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V24.2/BIGTREE_TFT24_V1.1.24.2.bin similarity index 100% rename from Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/BIGTREE_TFT24_V1.1.24.2.bin rename to Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V24.2/BIGTREE_TFT24_V1.1.24.2.bin diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/BIGTREE_TFT35_V3.0.24.2.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V24.2/BIGTREE_TFT35_V3.0.24.2.bin similarity index 100% rename from Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/BIGTREE_TFT35_V3.0.24.2.bin rename to Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V24.2/BIGTREE_TFT35_V3.0.24.2.bin diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/BIQU_TFT28_V1.0.24.2.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V24.2/BIQU_TFT28_V1.0.24.2.bin similarity index 100% rename from Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/BIQU_TFT28_V1.0.24.2.bin rename to Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V24.2/BIQU_TFT28_V1.0.24.2.bin diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/BIQU_TFT35_APP1_V2.0.24.2.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V24.2/BIQU_TFT35_APP1_V2.0.24.2.bin similarity index 100% rename from Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/BIQU_TFT35_APP1_V2.0.24.2.bin rename to Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V24.2/BIQU_TFT35_APP1_V2.0.24.2.bin diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/BIQU_TFT35_V1.0.24.2.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V24.2/BIQU_TFT35_V1.0.24.2.bin similarity index 100% rename from Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/BIQU_TFT35_V1.0.24.2.bin rename to Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V24.2/BIQU_TFT35_V1.0.24.2.bin diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/BIQU_TFT35_V1.1.24.2.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V24.2/BIQU_TFT35_V1.1.24.2.bin similarity index 100% rename from Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/BIQU_TFT35_V1.1.24.2.bin rename to Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V24.2/BIQU_TFT35_V1.1.24.2.bin diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/BIQU_TFT35_V1.2.24.2.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V24.2/BIQU_TFT35_V1.2.24.2.bin similarity index 100% rename from Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/BIQU_TFT35_V1.2.24.2.bin rename to Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V24.2/BIQU_TFT35_V1.2.24.2.bin diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT24_V1.1.25.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V25/BIGTREE_TFT24_V1.1.25.bin similarity index 100% rename from Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT24_V1.1.25.bin rename to Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V25/BIGTREE_TFT24_V1.1.25.bin diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT35_V3.0.25.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V25/BIGTREE_TFT35_V3.0.25.bin similarity index 100% rename from Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT35_V3.0.25.bin rename to Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V25/BIGTREE_TFT35_V3.0.25.bin diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT28_V1.0.25.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V25/BIQU_TFT28_V1.0.25.bin similarity index 100% rename from Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT28_V1.0.25.bin rename to Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V25/BIQU_TFT28_V1.0.25.bin diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_APP1_V2.0.25.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V25/BIQU_TFT35_APP1_V2.0.25.bin similarity index 100% rename from Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_APP1_V2.0.25.bin rename to Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V25/BIQU_TFT35_APP1_V2.0.25.bin diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.0.25.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V25/BIQU_TFT35_V1.0.25.bin similarity index 100% rename from Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.0.25.bin rename to Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V25/BIQU_TFT35_V1.0.25.bin diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.1.25.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V25/BIQU_TFT35_V1.1.25.bin similarity index 100% rename from Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.1.25.bin rename to Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V25/BIQU_TFT35_V1.1.25.bin diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.2.25.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V25/BIQU_TFT35_V1.2.25.bin similarity index 100% rename from Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.2.25.bin rename to Copy to SD Card root directory to update - Unified Menu Material theme/Firmware archive/V25/BIQU_TFT35_V1.2.25.bin diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.25.1.bin b/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.25.1.bin new file mode 100644 index 0000000000..47d52a5f48 Binary files /dev/null and b/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.25.1.bin differ diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT28_V3.0.25.1.bin b/Copy to SD Card root directory to update/BIGTREE_TFT28_V3.0.25.1.bin new file mode 100644 index 0000000000..613d42d4b1 Binary files /dev/null and b/Copy to SD Card root directory to update/BIGTREE_TFT28_V3.0.25.1.bin differ diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.25.1.bin b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.25.1.bin new file mode 100644 index 0000000000..a807a5a694 Binary files /dev/null and b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.25.1.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.25.1.bin b/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.25.1.bin new file mode 100644 index 0000000000..bf1f7cf314 Binary files /dev/null and b/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.25.1.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.25.1.bin b/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.25.1.bin new file mode 100644 index 0000000000..b50fc48a0a Binary files /dev/null and b/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.25.1.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.25.1.bin b/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.25.1.bin new file mode 100644 index 0000000000..99579004dc Binary files /dev/null and b/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.25.1.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.25.1.bin b/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.25.1.bin new file mode 100644 index 0000000000..3d66b2c047 Binary files /dev/null and b/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.25.1.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.25.1.bin b/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.25.1.bin new file mode 100644 index 0000000000..263dfd3b71 Binary files /dev/null and b/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.25.1.bin differ diff --git a/Copy to SD Card root directory to update/Firmware archive/BIGTREE_TFT24_V1.1.24.2.bin b/Copy to SD Card root directory to update/Firmware archive/V24.2/BIGTREE_TFT24_V1.1.24.2.bin similarity index 100% rename from Copy to SD Card root directory to update/Firmware archive/BIGTREE_TFT24_V1.1.24.2.bin rename to Copy to SD Card root directory to update/Firmware archive/V24.2/BIGTREE_TFT24_V1.1.24.2.bin diff --git a/Copy to SD Card root directory to update/Firmware archive/BIGTREE_TFT35_V3.0.24.2.bin b/Copy to SD Card root directory to update/Firmware archive/V24.2/BIGTREE_TFT35_V3.0.24.2.bin similarity index 100% rename from Copy to SD Card root directory to update/Firmware archive/BIGTREE_TFT35_V3.0.24.2.bin rename to Copy to SD Card root directory to update/Firmware archive/V24.2/BIGTREE_TFT35_V3.0.24.2.bin diff --git a/Copy to SD Card root directory to update/Firmware archive/BIQU_TFT28_V1.0.24.2.bin b/Copy to SD Card root directory to update/Firmware archive/V24.2/BIQU_TFT28_V1.0.24.2.bin similarity index 100% rename from Copy to SD Card root directory to update/Firmware archive/BIQU_TFT28_V1.0.24.2.bin rename to Copy to SD Card root directory to update/Firmware archive/V24.2/BIQU_TFT28_V1.0.24.2.bin diff --git a/Copy to SD Card root directory to update/Firmware archive/BIQU_TFT35_APP1_V2.0.24.2.bin b/Copy to SD Card root directory to update/Firmware archive/V24.2/BIQU_TFT35_APP1_V2.0.24.2.bin similarity index 100% rename from Copy to SD Card root directory to update/Firmware archive/BIQU_TFT35_APP1_V2.0.24.2.bin rename to Copy to SD Card root directory to update/Firmware archive/V24.2/BIQU_TFT35_APP1_V2.0.24.2.bin diff --git a/Copy to SD Card root directory to update/Firmware archive/BIQU_TFT35_V1.0.24.2.bin b/Copy to SD Card root directory to update/Firmware archive/V24.2/BIQU_TFT35_V1.0.24.2.bin similarity index 100% rename from Copy to SD Card root directory to update/Firmware archive/BIQU_TFT35_V1.0.24.2.bin rename to Copy to SD Card root directory to update/Firmware archive/V24.2/BIQU_TFT35_V1.0.24.2.bin diff --git a/Copy to SD Card root directory to update/Firmware archive/BIQU_TFT35_V1.1.24.2.bin b/Copy to SD Card root directory to update/Firmware archive/V24.2/BIQU_TFT35_V1.1.24.2.bin similarity index 100% rename from Copy to SD Card root directory to update/Firmware archive/BIQU_TFT35_V1.1.24.2.bin rename to Copy to SD Card root directory to update/Firmware archive/V24.2/BIQU_TFT35_V1.1.24.2.bin diff --git a/Copy to SD Card root directory to update/Firmware archive/BIQU_TFT35_V1.2.24.2.bin b/Copy to SD Card root directory to update/Firmware archive/V24.2/BIQU_TFT35_V1.2.24.2.bin similarity index 100% rename from Copy to SD Card root directory to update/Firmware archive/BIQU_TFT35_V1.2.24.2.bin rename to Copy to SD Card root directory to update/Firmware archive/V24.2/BIQU_TFT35_V1.2.24.2.bin diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.25.bin b/Copy to SD Card root directory to update/Firmware archive/V25/BIGTREE_TFT24_V1.1.25.bin similarity index 100% rename from Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.25.bin rename to Copy to SD Card root directory to update/Firmware archive/V25/BIGTREE_TFT24_V1.1.25.bin diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.25.bin b/Copy to SD Card root directory to update/Firmware archive/V25/BIGTREE_TFT35_V3.0.25.bin similarity index 100% rename from Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.25.bin rename to Copy to SD Card root directory to update/Firmware archive/V25/BIGTREE_TFT35_V3.0.25.bin diff --git a/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.25.bin b/Copy to SD Card root directory to update/Firmware archive/V25/BIQU_TFT28_V1.0.25.bin similarity index 100% rename from Copy to SD Card root directory to update/BIQU_TFT28_V1.0.25.bin rename to Copy to SD Card root directory to update/Firmware archive/V25/BIQU_TFT28_V1.0.25.bin diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.25.bin b/Copy to SD Card root directory to update/Firmware archive/V25/BIQU_TFT35_APP1_V2.0.25.bin similarity index 100% rename from Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.25.bin rename to Copy to SD Card root directory to update/Firmware archive/V25/BIQU_TFT35_APP1_V2.0.25.bin diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.25.bin b/Copy to SD Card root directory to update/Firmware archive/V25/BIQU_TFT35_V1.0.25.bin similarity index 100% rename from Copy to SD Card root directory to update/BIQU_TFT35_V1.0.25.bin rename to Copy to SD Card root directory to update/Firmware archive/V25/BIQU_TFT35_V1.0.25.bin diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.25.bin b/Copy to SD Card root directory to update/Firmware archive/V25/BIQU_TFT35_V1.1.25.bin similarity index 100% rename from Copy to SD Card root directory to update/BIQU_TFT35_V1.1.25.bin rename to Copy to SD Card root directory to update/Firmware archive/V25/BIQU_TFT35_V1.1.25.bin diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.25.bin b/Copy to SD Card root directory to update/Firmware archive/V25/BIQU_TFT35_V1.2.25.bin similarity index 100% rename from Copy to SD Card root directory to update/BIQU_TFT35_V1.2.25.bin rename to Copy to SD Card root directory to update/Firmware archive/V25/BIQU_TFT35_V1.2.25.bin diff --git a/TFT/src/User/Menu/Fan.c b/TFT/src/User/Menu/Fan.c index 14cdcd94c5..31694ae6e8 100644 --- a/TFT/src/User/Menu/Fan.c +++ b/TFT/src/User/Menu/Fan.c @@ -97,8 +97,8 @@ void menuFan(void) switch(key_num) { case KEY_ICON_0: - if (fanSpeed[curIndex] > 0) - #ifdef SHOW_FAN_PERCENTAGE + if (fanSpeed[curIndex] > 0) { + #ifdef SHOW_FAN_PERCENTAGE if ((fanSpeed[curIndex]-2) > 0) { fanSpeed[curIndex]-=2; //2.55 is 1 percent, rounding down } else { @@ -107,6 +107,7 @@ void menuFan(void) #else fanSpeed[curIndex]--; #endif + } break; case KEY_ICON_3: diff --git a/TFT/src/User/Menu/FeatureSettings.c b/TFT/src/User/Menu/FeatureSettings.c index d304202c1c..88ce026de6 100644 --- a/TFT/src/User/Menu/FeatureSettings.c +++ b/TFT/src/User/Menu/FeatureSettings.c @@ -294,22 +294,19 @@ case SKEY_HIDEACK: infoSettings.terminalACK = (infoSettings.terminalACK + 1) % 2; settingPage[item_index].icon = toggleitem[infoSettings.terminalACK]; - featureSettingsItems.items[key_val].icon = toggleitem[infoSettings.terminalACK];; - menuDrawListItem(&featureSettingsItems.items[key_val], key_val); + featureSettingsItems.items[key_val].icon = toggleitem[infoSettings.terminalACK]; break; case SKEY_INVERT_Y: infoSettings.invert_yaxis = (infoSettings.invert_yaxis + 1) % 2; settingPage[item_index].icon = toggleitem[infoSettings.invert_yaxis]; featureSettingsItems.items[key_val] = settingPage[item_index]; - menuDrawListItem(&featureSettingsItems.items[key_val], key_val); break; case SKEY_INVERT_Z: infoSettings.invert_zaxis = (infoSettings.invert_zaxis + 1) % 2; settingPage[item_index].icon = toggleitem[infoSettings.invert_zaxis]; featureSettingsItems.items[key_val] = settingPage[item_index]; - menuDrawListItem(&featureSettingsItems.items[key_val], key_val); break; #ifdef PS_ON_PIN @@ -317,7 +314,6 @@ item_power_off_i = (item_power_off_i + 1) % ITEM_PS_ON_NUM; settingPage[item_index] = itemPowerOff[item_power_off_i]; featureSettingsItems.items[key_val] = settingPage[item_index]; - menuDrawListItem(&featureSettingsItems.items[key_val], key_val); infoSettings.auto_off = item_power_off[item_power_off_i]; break; #endif @@ -327,7 +323,6 @@ item_runout_i = (item_runout_i + 1) % ITEM_RUNOUT_NUM; settingPage[item_index] = itemRunout[item_runout_i]; featureSettingsItems.items[key_val] = settingPage[item_index]; - menuDrawListItem(&featureSettingsItems.items[key_val], key_val); infoSettings.runout = item_runout[item_runout_i]; break; #endif @@ -336,7 +331,6 @@ infoSettings.move_speed = (infoSettings.move_speed + 1) % ITEM_SPEED_NUM; settingPage[item_index] = itemMoveSpeed[infoSettings.move_speed]; featureSettingsItems.items[key_val] = settingPage[item_index]; - menuDrawListItem(&featureSettingsItems.items[key_val], key_val); break; #ifdef LED_color_PIN @@ -344,7 +338,6 @@ infoSettings.led_color = (infoSettings.led_color + 1) % LED_color_NUM; settingPage[item_index] = itemLedcolor[infoSettings.led_color]; featureSettingsItems.items[key_val] = settingPage[item_index]; - menuDrawListItem(&featureSettingsItems.items[key_val], key_val); ws2812_send_DAT(led_color[infoSettings.led_color]); break; #endif @@ -447,12 +440,6 @@ } - void refreshItemsDisplay(){ - for (uint8_t i = 0; i < ITEM_PER_PAGE; i++) - { - menuDrawListItem(&featureSettingsItems.items[i],i); - } - } void menuFeatureSettings(void) { @@ -472,7 +459,7 @@ if (fe_cur_page > 0){ fe_cur_page--; loadFeatureSettings(); - refreshItemsDisplay(); + menuRefreshListPage(); } } break; @@ -482,7 +469,7 @@ if (fe_cur_page < FE_PAGE_COUNT - 1){ fe_cur_page++; loadFeatureSettings(); - refreshItemsDisplay(); + menuRefreshListPage(); } } break; diff --git a/TFT/src/User/Menu/MachineSettings.c b/TFT/src/User/Menu/MachineSettings.c index 28779cc07a..8f946683e0 100644 --- a/TFT/src/User/Menu/MachineSettings.c +++ b/TFT/src/User/Menu/MachineSettings.c @@ -248,7 +248,6 @@ void menuCustom(void) customItems.items[i].icon = ICONCHAR_BACKGROUND; customItems.items[i].titlelabel.index = LABEL_BACKGROUND; } - menuDrawListItem(&customItems.items[i],i); } // set page up down button according to page count and current page if (CKEY_COUNT <= LISTITEM_PER_PAGE) @@ -272,8 +271,8 @@ void menuCustom(void) customItems.items[6].icon = ICONCHAR_PAGEDOWN; } } - menuDrawListItem(&customItems.items[5],5); - menuDrawListItem(&customItems.items[6],6); + // menuDrawListItem(&customItems.items[5],5); + //menuDrawListItem(&customItems.items[6],6); } void menuCustom(void) @@ -296,7 +295,7 @@ void menuCustom(void) if(GC_PAGE_COUNT > 1){ if (gc_cur_page > 0){ gc_cur_page--; - loaditemsCustomGcode(); + menuRefreshListPage(); } } break; @@ -304,7 +303,7 @@ void menuCustom(void) if(GC_PAGE_COUNT > 1){ if (gc_cur_page < GC_PAGE_COUNT-1){ gc_cur_page++; - loaditemsCustomGcode(); + menuRefreshListPage(); } } break; diff --git a/TFT/src/User/Menu/MachineSettings.h b/TFT/src/User/Menu/MachineSettings.h index 5f1c2fcf76..70312fafe7 100644 --- a/TFT/src/User/Menu/MachineSettings.h +++ b/TFT/src/User/Menu/MachineSettings.h @@ -3,5 +3,6 @@ void menuRGBSettings(void); void menuMachineSettings(void); +void menuCustom(void); #endif diff --git a/TFT/src/User/Menu/MainPage.c b/TFT/src/User/Menu/MainPage.c index bc44e50ebe..8dbd1eb6da 100644 --- a/TFT/src/User/Menu/MainPage.c +++ b/TFT/src/User/Menu/MainPage.c @@ -10,11 +10,11 @@ LABEL_READY, {{ICON_HEAT_FAN, lABEL_UNIFIEDHEAT}, {ICON_HOME_MOVE, LABEL_UNIFIEDMOVE}, {ICON_EXTRUDE, LABEL_EXTRUDE}, - {ICON_PRINT, LABEL_PRINT}, - {ICON_GCODE, LABEL_GCODE}, {ICON_STOP, LABEL_EMERGENCYSTOP}, + {ICON_GCODE, LABEL_GCODE}, + {ICON_CUSTOM, LABEL_CUSTOM}, {ICON_SETTINGS, LABEL_SETTINGS}, - {ICON_BACK, LABEL_BACK},} + {ICON_BACK, LABEL_BACK}} #else {{ICON_HEAT, LABEL_PREHEAT}, {ICON_MOVE, LABEL_MOVE}, @@ -23,7 +23,7 @@ LABEL_READY, {ICON_EXTRUDE, LABEL_EXTRUDE}, {ICON_SETTINGS, LABEL_SETTINGS}, {ICON_BACKGROUND, LABEL_BACKGROUND}, - {ICON_BACK, LABEL_BACK},} + {ICON_BACK, LABEL_BACK}} #endif }; @@ -42,11 +42,11 @@ void menuMain(void) case KEY_ICON_0: infoMenu.menu[++infoMenu.cur] = menuUnifiedHeat; break; case KEY_ICON_1: infoMenu.menu[++infoMenu.cur] = menuUnifiedMove; break; case KEY_ICON_2: infoMenu.menu[++infoMenu.cur] = menuExtrude; break; - case KEY_ICON_3: infoMenu.menu[++infoMenu.cur] = menuPrint; break; - case KEY_ICON_4: infoMenu.menu[++infoMenu.cur] = menuSendGcode; break; - case KEY_ICON_5: { storeCmd("M112\n");} break; // Emergency Stop : Used for emergency stopping, a reset is required to return to operational mode. + case KEY_ICON_3: { storeCmd("M112\n");} break; // Emergency Stop : Used for emergency stopping, a reset is required to return to operational mode. // it may need to wait for a space to open up in the command queue. // Enable EMERGENCY_PARSER in Marlin Firmware for an instantaneous M112 command. + case KEY_ICON_4: infoMenu.menu[++infoMenu.cur] = menuSendGcode; break; + case KEY_ICON_5: infoMenu.menu[++infoMenu.cur] = menuCustom ; break; case KEY_ICON_6: infoMenu.menu[++infoMenu.cur] = menuSettings; break; case KEY_ICON_7: infoMenu.cur--; break; default:break; diff --git a/TFT/src/User/Menu/Move.c b/TFT/src/User/Menu/Move.c index cc555e6eb5..7ed3517149 100644 --- a/TFT/src/User/Menu/Move.c +++ b/TFT/src/User/Menu/Move.c @@ -103,12 +103,6 @@ static u32 update_time = 50; // 1 seconds is 100 void menuMove(void) { KEY_VALUES key_num = KEY_IDLE; - uint32_t B0; - uint32_t B1; - uint32_t B2; - uint32_t B5; - uint32_t B6; - uint32_t B7; #ifdef ALTERNATIVE_MOVE_MENU diff --git a/TFT/src/User/Menu/Parametersetting.c b/TFT/src/User/Menu/Parametersetting.c index f03c17f33c..bd555606b7 100644 --- a/TFT/src/User/Menu/Parametersetting.c +++ b/TFT/src/User/Menu/Parametersetting.c @@ -307,7 +307,6 @@ void parametersetting(void) void temp_Change(void) { //static FP_MENU NUM[MAX_MENU_DEPTH]; - char tempstr[10]; static int16_t compare [2]; if(infoHost.connected == false || infoMenu.menu[infoMenu.cur] == menuPrinting) return; diff --git a/TFT/src/User/Menu/StatusScreen.h b/TFT/src/User/Menu/StatusScreen.h index 09338b80cc..194c9e18d1 100644 --- a/TFT/src/User/Menu/StatusScreen.h +++ b/TFT/src/User/Menu/StatusScreen.h @@ -43,7 +43,7 @@ void gantry_inc(int n, float val); #define STATUS_GANTRY_YOFFSET 6 -#elif defined(TFT28_V1_0) || defined(TFT24_V1_1) +#elif defined(TFT28_V1_0) || defined(TFT24_V1_1) || defined(TFT28_V3_0) #define SSICON_VAL_Y0 47 //#define statusicon_val_charcount 7 diff --git a/TFT/src/User/Menu/menu.c b/TFT/src/User/Menu/menu.c index bd82c52e6e..c2af984945 100644 --- a/TFT/src/User/Menu/menu.c +++ b/TFT/src/User/Menu/menu.c @@ -100,7 +100,6 @@ void menuDrawItem(const ITEM *item, uint8_t positon) void menuDrawIconOnly(const ITEM *item, uint8_t positon) { - uint8_t *content = labelGetAddress(&item->label); const GUI_RECT *rect = rect_of_key + positon; if(item->icon != ICON_BACKGROUND) ICON_ReadDisplay(rect->x0, rect->y0, item->icon); @@ -120,6 +119,13 @@ void menuDrawIconOnly(const ITEM *item, uint8_t positon) ListItem_Display(rect, position, item, false); } } +void menuRefreshListPage(void){ + for (uint8_t i = 0; i < ITEM_PER_PAGE; i++) + { + menuDrawListItem(&curListItems->items[i], i); + } + +} static REMINDER reminder = {{0, 0, LCD_WIDTH, TITLE_END_Y}, 0, STATUS_UNCONNECT, LABEL_UNCONNECTED}; static REMINDER volumeReminder = {{0, 0, LCD_WIDTH, TITLE_END_Y}, 0, STATUS_IDLE, LABEL_BACKGROUND}; diff --git a/TFT/src/User/Menu/menu.h b/TFT/src/User/Menu/menu.h index 75eb44e1ba..38f28a04a1 100644 --- a/TFT/src/User/Menu/menu.h +++ b/TFT/src/User/Menu/menu.h @@ -105,6 +105,7 @@ void GUI_RestoreColorDefault(void); void menuDrawItem (const ITEM * menuItem, uint8_t positon); void menuDrawIconOnly(const ITEM *item, uint8_t positon); void menuDrawListItem(const LISTITEM *item, uint8_t positon); +void menuRefreshListPage(void); void menuDrawTitle(const uint8_t *content); //(const MENUITEMS * menuItems); void menuDrawPage (const MENUITEMS * menuItems); void menuDrawListPage(const LISTITEMS *listItems); diff --git a/platformio.ini b/platformio.ini index 9350d18e2a..a1eaf1d6ab 100644 --- a/platformio.ini +++ b/platformio.ini @@ -25,6 +25,7 @@ default_src_filter = + - - -