arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-27 18:02:17 +03:00
Code Activity

WIP - Update ArduinoOTA and examples with MDNS.update() calls (#5494)

Browse Source 
* ArduinoOTA: allow use without MDNS, add MDNS.update() in handle()

* Update examples with MDNS.update() in loop

* Update CaptivePortalAdvanced.ino

Fix typo

* Update CaptivePortalAdvanced.ino

astyle

* Update Arduino_Wifi_AVRISP.ino

astyle
This commit is contained in:
Develo
2018-12-14 03:29:32 -03:00
committed by GitHub
parent 8ede8f1459
commit e9d052c621
18 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libraries/ArduinoOTA/ArduinoOTA.cpp
View File

@ -33,6 +33,7 @@ ArduinoOTAClass::ArduinoOTAClass()
, _udp_ota(0)
, _initialized(false)
, _rebootOnSuccess(true)
, _useMDNS(true)
, _state(OTA_IDLE)
, _size(0)
, _cmd(0)
@ -103,10 +104,12 @@ void ArduinoOTAClass::setRebootOnSuccess(bool reboot){
_rebootOnSuccess = reboot;
}
void ArduinoOTAClass::begin() {
void ArduinoOTAClass::begin(bool useMDNS) {
if (_initialized)
return;
_useMDNS = useMDNS;
if (!_hostname.length()) {
char tmp[15];
sprintf(tmp, "esp8266-%06x", ESP.getChipId());
@ -127,12 +130,15 @@ void ArduinoOTAClass::begin() {
if(!_udp_ota->listen(IP_ADDR_ANY, _port))
return;
_udp_ota->onRx(std::bind(&ArduinoOTAClass::_onRx, this));
MDNS.begin(_hostname.c_str());
if (_password.length()) {
MDNS.enableArduino(_port, true);
} else {
MDNS.enableArduino(_port);
if(_useMDNS) {
MDNS.begin(_hostname.c_str());
if (_password.length()) {
MDNS.enableArduino(_port, true);
} else {
MDNS.enableArduino(_port);
}
}
_initialized = true;
_state = OTA_IDLE;
@ -348,11 +354,15 @@ void ArduinoOTAClass::_runUpdate() {
}
}
//this needs to be called in the loop()
void ArduinoOTAClass::handle() {
if (_state == OTA_RUNUPDATE) {
_runUpdate();
_state = OTA_IDLE;
}
if(_useMDNS)
MDNS.update(); //handle MDNS update as well, given that ArduinoOTA relies on it anyways
}
int ArduinoOTAClass::getCommand() {

5
libraries/ArduinoOTA/ArduinoOTA.h
View File

@ -60,9 +60,9 @@ class ArduinoOTAClass
void onProgress(THandlerFunction_Progress fn);
//Starts the ArduinoOTA service
void begin();
void begin(bool useMDNS = true);
//Call this in loop() to run the service
//Call this in loop() to run the service. Also calls MDNS.update() when begin() or begin(true) is used.
void handle();
//Gets update command type after OTA has started. Either U_FLASH or U_SPIFFS
@ -76,6 +76,7 @@ class ArduinoOTAClass
UdpContext *_udp_ota;
bool _initialized;
bool _rebootOnSuccess;
bool _useMDNS;
ota_state_t _state;
int _size;
int _cmd;