Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
arduino-esp32
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
arduino-esp32
Commits
2fda054b
Commit
2fda054b
authored
Jul 24, 2018
by
Sathishkumar T
Committed by
Me No Dev
Jul 24, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[OTA Timeout] Added ability set OTA timeout in the OTA client (#1669)
parent
e157ec06
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
8 deletions
+16
-8
libraries/ArduinoOTA/src/ArduinoOTA.cpp
libraries/ArduinoOTA/src/ArduinoOTA.cpp
+9
-3
libraries/ArduinoOTA/src/ArduinoOTA.h
libraries/ArduinoOTA/src/ArduinoOTA.h
+7
-5
No files found.
libraries/ArduinoOTA/src/ArduinoOTA.cpp
View file @
2fda054b
...
...
@@ -9,7 +9,7 @@
#include "Update.h"
//#define OTA_DEBUG Serial
//
#define OTA_DEBUG Serial
ArduinoOTAClass
::
ArduinoOTAClass
()
:
_port
(
0
)
...
...
@@ -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
)
...
...
@@ -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
);
...
...
@@ -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
\ No newline at end of file
libraries/ArduinoOTA/src/ArduinoOTA.h
View file @
2fda054b
...
...
@@ -7,7 +7,6 @@
#define INT_BUFFER_SIZE 16
typedef
enum
{
OTA_IDLE
,
OTA_WAITAUTH
,
...
...
@@ -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
;
...
...
@@ -88,6 +89,7 @@ class ArduinoOTAClass
int
_size
;
int
_cmd
;
int
_ota_port
;
int
_ota_timeout
;
IPAddress
_ota_ip
;
String
_md5
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment