jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-28 13:16:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change message `Upload buffer miscompare into Not enough space`

Browse Source
This commit is contained in:
Theo Arends 2021-07-22 15:14:58 +02:00
parent 80d5a143a5
commit 3d37712b27
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file.
- ESP32 core library from v1.0.7.1 to v1.0.7.3
- Disable PSRAM on unsupported hardware
- Replace spaces by hyphens in final hostname (#12710)
- Message ``Upload buffer miscompare`` into ``Not enough space``
### Fixed
- Discovery fails when using ``%hostname%`` in a topic (#12710)

1
RELEASENOTES.md
View File

@ -116,6 +116,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
### Changed
- ESP32 core library from v1.0.6 to v1.0.7.3
- IRremoteESP8266 library from v2.7.18 to v2.7.19
- Message ``Upload buffer miscompare`` into ``Not enough space``
- ESP32 Ethernet Phy Type information to IDF v3+
- Speed up initial GUI console refresh
- Enable UFILESYS, GUI_TRASH_FILE and GUI_EDIT_FILE for any device compiled with more than 1M flash size

12
tasmota/xdrv_01_webserver.ino
View File

@ -390,7 +390,8 @@ const char kLoggingLevels[] PROGMEM = D_NONE "|" D_ERROR "|" D_INFO "|" D_DEBUG
const char kEmulationOptions[] PROGMEM = D_NONE "|" D_BELKIN_WEMO "|" D_HUE_BRIDGE;
const char kUploadErrors[] PROGMEM =
D_UPLOAD_ERR_1 "|" D_UPLOAD_ERR_2 "|" D_UPLOAD_ERR_3 "|" D_UPLOAD_ERR_4 "|" D_UPLOAD_ERR_5 "|" D_UPLOAD_ERR_6 "|" D_UPLOAD_ERR_7 "|" D_UPLOAD_ERR_8 "|" D_UPLOAD_ERR_9;
// D_UPLOAD_ERR_1 "|" D_UPLOAD_ERR_2 "|" D_UPLOAD_ERR_3 "|" D_UPLOAD_ERR_4 "|" D_UPLOAD_ERR_5 "|" D_UPLOAD_ERR_6 "|" D_UPLOAD_ERR_7 "|" D_UPLOAD_ERR_8 "|" D_UPLOAD_ERR_9;
D_UPLOAD_ERR_1 "|" D_UPLOAD_ERR_2 "|" D_UPLOAD_ERR_3 "|" D_UPLOAD_ERR_4 "| |" D_UPLOAD_ERR_6 "|" D_UPLOAD_ERR_7 "|" D_UPLOAD_ERR_8 "|" D_UPLOAD_ERR_9;
const uint16_t DNS_PORT = 53;
enum HttpOptions {HTTP_OFF, HTTP_USER, HTTP_ADMIN, HTTP_MANAGER, HTTP_MANAGER_RESET_ONLY};
@ -1830,8 +1831,8 @@ void HandleWifiConfiguration(void) {
if ( WIFI_TEST_FINISHED == Web.wifiTest ) {
Web.wifiTest = WIFI_NOT_TESTING;
if (Web.wifi_test_AP_TIMEOUT) {
WebRestart(1); // Save credentials and Force Restart in STA only mode (11n-only routers)
if (Web.wifi_test_AP_TIMEOUT) {
WebRestart(1); // Save credentials and Force Restart in STA only mode (11n-only routers)
} else {
#if (RESTART_AFTER_INITIAL_WIFI_CONFIG)
WebRestart(3);
@ -2722,7 +2723,8 @@ void HandleUploadLoop(void) {
}
#endif // USE_WEB_FW_UPGRADE
else if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
Web.upload_error = 5; // Upload buffer miscompare
// Web.upload_error = 5; // Upload buffer miscompare
Web.upload_error = 2; // Not enough space
return;
}
if (upload.totalSize && !(upload.totalSize % 102400)) {
@ -3329,7 +3331,7 @@ bool Xdrv01(uint8_t function)
//
// If it fails again, depending on the WIFICONFIG settings, the user will need to wait or will need to
// push 6 times the button to enable Tasmota AP mode again.
if (Web.wifi_test_AP_TIMEOUT) {
if (Web.wifi_test_AP_TIMEOUT) {
Web.wifiTest = WIFI_TEST_FINISHED;
AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_WIFI D_CMND_SSID "1 %s: " D_ATTEMPTING_CONNECTION), SettingsText(SET_STASSID1) );
if (MAX_WIFI_OPTION != Web.old_wificonfig) {