Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-26 08:55:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Also accept invalid spelling from Updater

Browse source 
Fixes https://github.com/esphome/issues/issues/564 partly.

At least the error message will now be a better one.
This commit is contained in:
Otto Winter 2019-09-01 11:42:37 +02:00
parent be1e4c0a1d
commit fd1dc24ac6
No known key found for this signature in database
GPG key ID: DB66C0BE6013F97E
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
esphome/components/ota/ota_component.cpp
View file

@ -182,11 +182,11 @@ void OTAComponent::handle_() {
error_code = OTA_RESPONSE_ERROR_INVALID_BOOTSTRAPPING; error_code = OTA_RESPONSE_ERROR_INVALID_BOOTSTRAPPING;
goto error; goto error;
} }
if (ss.indexOf("new Flash config wrong") != -1) { if (ss.indexOf("new Flash config wrong") != -1 || ss.indexOf("new Flash config wsong") != -1) {
error_code = OTA_RESPONSE_ERROR_WRONG_NEW_FLASH_CONFIG; error_code = OTA_RESPONSE_ERROR_WRONG_NEW_FLASH_CONFIG;
goto error; goto error;
} }
if (ss.indexOf("Flash config wrong real") != -1) { if (ss.indexOf("Flash config wrong real") != -1 || ss.indexOf("Flash config wsong real") != -1) {
error_code = OTA_RESPONSE_ERROR_WRONG_CURRENT_FLASH_CONFIG; error_code = OTA_RESPONSE_ERROR_WRONG_CURRENT_FLASH_CONFIG;
goto error; goto error;
} }

3
esphome/espota2.py
View file

@ -127,7 +127,8 @@ def check_error(data, expect):
"correct 'board' option (esp01_1m always works) and then flash over USB.") "correct 'board' option (esp01_1m always works) and then flash over USB.")
if dat == RESPONSE_ERROR_WRONG_NEW_FLASH_CONFIG: if dat == RESPONSE_ERROR_WRONG_NEW_FLASH_CONFIG:
raise OTAError("Error: ESP does not have the requested flash size (wrong board). Please " raise OTAError("Error: ESP does not have the requested flash size (wrong board). Please "
"choose the correct 'board' option (esp01_1m always works) and try again.") "choose the correct 'board' option (esp01_1m always works) and try "
"uploading again.")
if dat == RESPONSE_ERROR_ESP8266_NOT_ENOUGH_SPACE: if dat == RESPONSE_ERROR_ESP8266_NOT_ENOUGH_SPACE:
raise OTAError("Error: ESP does not have enough space to store OTA file. Please try " raise OTAError("Error: ESP does not have enough space to store OTA file. Please try "
"flashing a minimal firmware (remove everything except ota)") "flashing a minimal firmware (remove everything except ota)")