Skip to content

[OTA Timeout] Added ability set OTA timeout in the OTA client #1669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 24, 2018
Merged

[OTA Timeout] Added ability set OTA timeout in the OTA client #1669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06fa0b0
[OTA Timeout] Added ability set OTA timeout in the OTA client
tsathishkumar Jul 23, 2018
beb81d1
[OTA Timeout] Changed to method instead of defined value
tsathishkumar Jul 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions libraries/ArduinoOTA/src/ArduinoOTA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "Update.h"


//#define OTA_DEBUG Serial
// #define OTA_DEBUG Serial

ArduinoOTAClass::ArduinoOTAClass()
: _port(0)
Expand All @@ -20,6 +20,7 @@ ArduinoOTAClass::ArduinoOTAClass()
, _size(0)
, _cmd(0)
, _ota_port(0)
, _ota_timeout(1000)
, _start_callback(NULL)
, _end_callback(NULL)
, _error_callback(NULL)
Expand Down Expand Up @@ -260,8 +261,9 @@ void ArduinoOTAClass::_runUpdate() {
}

uint32_t written = 0, total = 0, tried = 0;

while (!Update.isFinished() && client.connected()) {
size_t waited = 1000;
size_t waited = _ota_timeout;
size_t available = client.available();
while (!available && waited){
delay(1);
Expand Down Expand Up @@ -387,6 +389,10 @@ int ArduinoOTAClass::getCommand() {
return _cmd;
}

void ArduinoOTAClass::setTimeout(int timeoutInMillis) {
_ota_timeout = timeoutInMillis;
}

#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_ARDUINOOTA)
ArduinoOTAClass ArduinoOTA;
#endif
#endif
12 changes: 7 additions & 5 deletions libraries/ArduinoOTA/src/ArduinoOTA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

#define INT_BUFFER_SIZE 16


typedef enum {
OTA_IDLE,
OTA_WAITAUTH,
Expand All @@ -25,9 +24,9 @@ typedef enum {
class ArduinoOTAClass
{
public:
typedef std::function<void(void)> THandlerFunction;
typedef std::function<void(ota_error_t)> THandlerFunction_Error;
typedef std::function<void(unsigned int, unsigned int)> THandlerFunction_Progress;
typedef std::function<void(void)> THandlerFunction;
typedef std::function<void(ota_error_t)> THandlerFunction_Error;
typedef std::function<void(unsigned int, unsigned int)> THandlerFunction_Progress;

ArduinoOTAClass();
~ArduinoOTAClass();
Expand Down Expand Up @@ -75,6 +74,8 @@ class ArduinoOTAClass
//Gets update command type after OTA has started. Either U_FLASH or U_SPIFFS
int getCommand();

void setTimeout(int timeoutInMillis);

private:
int _port;
String _password;
Expand All @@ -88,6 +89,7 @@ class ArduinoOTAClass
int _size;
int _cmd;
int _ota_port;
int _ota_timeout;
IPAddress _ota_ip;
String _md5;

Expand All @@ -106,4 +108,4 @@ class ArduinoOTAClass
extern ArduinoOTAClass ArduinoOTA;
#endif

#endif /* __ARDUINO_OTA_H */
#endif /* __ARDUINO_OTA_H */