wirtz
/
AutoConnect
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #131 from Hieromon/patches/v102

Browse Source 
Patches/v102
pull/91/merge v1.0.2
Hieromon Ikasamo 5 years ago committed by GitHub
parent b23032cb28 ae9866267c
commit f91ec7232f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 56 additions and 48 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      .travis.yml
  2. 3
      README.md
  3. 13
      docs/changelog.html
  4. 2
      docs/search/search_index.json
  5. 58
      docs/sitemap.xml
  6. BIN
      docs/sitemap.xml.gz
  7. 3
      mkdocs/changelog.md
  8. 15
      src/AutoConnectUpdate.cpp

10
.travis.yml
Unescape View File

@ -6,8 +6,10 @@ env:
global:
- IDE_VERSION=1.8.8
matrix:
- BOARD="esp8266:esp8266:generic:xtal=80,eesz=4M3M,ip=lm2f,exception=disabled,FlashMode=qio,FlashFreq=80"
- BOARD="esp32:esp32:esp32:FlashFreq=80,FlashSize=4M"
- BOARD="esp8266:esp8266:generic:xtal=80,eesz=4M3M,ip=lm2f,exception=disabled,FlashMode=qio,FlashFreq=80" ARDJSON="5.13.5"
- BOARD="esp32:esp32:esp32:FlashFreq=80,FlashSize=4M" ARDJSON="5.13.5"
- BOARD="esp8266:esp8266:generic:xtal=80,eesz=4M3M,ip=lm2f,exception=disabled,FlashMode=qio,FlashFreq=80" ARDJSON="6.12.0"
- BOARD="esp32:esp32:esp32:FlashFreq=80,FlashSize=4M" ARDJSON="6.12.0"
before_install:
- "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16"
- sleep 3
@ -24,9 +26,7 @@ before_install:
arduino --install-boards esp32:esp32;
fi
- arduino --install-library PubSubClient,PageBuilder:1.3.4
- arduino --install-library ArduinoJson:5.13.5
- buildExampleSketch() { arduino --verify --board $BOARD $PWD/examples/$1/$1.ino; }
- arduino --install-library ArduinoJson:6.12.0
- arduino --install-library ArduinoJson:$ARDJSON
- buildExampleSketch() { arduino --verify --board $BOARD $PWD/examples/$1/$1.ino; }
install:
- mkdir -p ~/Arduino/libraries

3
README.md
Unescape View File

@ -101,7 +101,8 @@ Full documentation is available on https://Hieromon.github.io/AutoConnect, some
## Change log
### [1.0.2] Sept. 17, 2019
### [1.0.2] Sept. 19, 2019
- Fixed compilation error that no member named 'success' with ArduinoJson 5. (issue #130)
- Fixed SSID non termination. (issue #128)
- Fixed compilation error that getBytesLength missing with ESP32. (issue #125)
- Added #include directive restriction for EEPROM and ESP8266httpUpdate to FAQ. (issue #127)

13
docs/changelog.html
Unescape View File

@ -122,7 +122,7 @@
<input class="md-toggle" data-md-toggle="search" type="checkbox" id="__search" autocomplete="off">
<label class="md-overlay" data-md-component="overlay" for="__drawer"></label>
<a href="#102-sept-17-2019" tabindex="1" class="md-skip">
<a href="#102-sept-19-2019" tabindex="1" class="md-skip">
Skip to content
</a>
@ -726,8 +726,8 @@
<ul class="md-nav__list" data-md-scrollfix>
<li class="md-nav__item">
<a href="#102-sept-17-2019" title="[1.0.2] Sept. 17, 2019" class="md-nav__link">
[1.0.2] Sept. 17, 2019
<a href="#102-sept-19-2019" title="[1.0.2] Sept. 19, 2019" class="md-nav__link">
[1.0.2] Sept. 19, 2019
</a>
</li>
@ -872,8 +872,8 @@
<ul class="md-nav__list" data-md-scrollfix>
<li class="md-nav__item">
<a href="#102-sept-17-2019" title="[1.0.2] Sept. 17, 2019" class="md-nav__link">
[1.0.2] Sept. 17, 2019
<a href="#102-sept-19-2019" title="[1.0.2] Sept. 19, 2019" class="md-nav__link">
[1.0.2] Sept. 19, 2019
</a>
</li>
@ -995,8 +995,9 @@
<h1>Change log</h1>
<h4 id="102-sept-17-2019">[1.0.2] Sept. 17, 2019<a class="headerlink" href="#102-sept-17-2019" title="Permanent link">&para;</a></h4>
<h4 id="102-sept-19-2019">[1.0.2] Sept. 19, 2019<a class="headerlink" href="#102-sept-19-2019" title="Permanent link">&para;</a></h4>
<ul>
<li>Fixed compilation error that no member named 'success' with ArduinoJson 5.</li>
<li>Fixed SSID non termination.</li>
<li>Fixed compilation error that getBytesLength missing with ESP32.</li>
<li>Added #include directive restriction for EEPROM and ESP8266httpUpdate to FAQ.</li>

2
docs/search/search_index.json
View File

File diff suppressed because one or more lines are too long

58
docs/sitemap.xml
Unescape View File

@ -2,147 +2,147 @@
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://Hieromon.github.io/AutoConnect/index.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/gettingstarted.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/menu.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/basicusage.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/advancedusage.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/acintro.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/acelements.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/acjson.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/achandling.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/otaupdate.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/otabrowser.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/otaserver.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/api.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/apiaux.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/apiconfig.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/apielements.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/apiupdate.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/apiextra.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/howtoembed.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/datatips.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/menuize.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/wojson.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/lsbegin.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/credit.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/acupload.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/colorized.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/faq.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/changelog.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://Hieromon.github.io/AutoConnect/license.html</loc>
<lastmod>2019-09-17</lastmod>
<lastmod>2019-09-18</lastmod>
<changefreq>daily</changefreq>
</url>
</urlset>

BIN
docs/sitemap.xml.gz
View File

Binary file not shown.

3
mkdocs/changelog.md
Unescape View File

@ -1,4 +1,5 @@
#### [1.0.2] Sept. 17, 2019
#### [1.0.2] Sept. 19, 2019
- Fixed compilation error that no member named 'success' with ArduinoJson 5.
- Fixed SSID non termination.
- Fixed compilation error that getBytesLength missing with ESP32.
- Added #include directive restriction for EEPROM and ESP8266httpUpdate to FAQ.

15
src/AutoConnectUpdate.cpp
Unescape View File

@ -2,8 +2,8 @@
* AutoConnectUpdate class implementation.
* @file AutoConnectUpdate.cpp
* @author hieromon@gmail.com
* @version 1.0.0
* @date 2019-08-15
* @version 1.0.2
* @date 2019-09-18
* @copyright MIT license.
*/
@ -396,7 +396,7 @@ String AutoConnectUpdateAct::_onCatalog(AutoConnectAux& catalog, PageArgument& a
#if ARDUINOJSON_VERSION_MAJOR<=5
ArduinoJsonObject json = jb.parseObject(responseBody);
parse = jb.success();
parse = json.success();
#else
DeserializationError err = deserializeJson(jb, responseBody);
ArduinoJsonObject json = jb.as<JsonObject>();
@ -417,8 +417,13 @@ String AutoConnectUpdateAct::_onCatalog(AutoConnectAux& catalog, PageArgument& a
}
}
else {
caption.value = String(F("Invalid catalog list:")) + String(err.c_str());
AC_DBG("JSON:%s\n", err.c_str());
#if ARDUINOJSON_VERSION_MAJOR<=5
String errCaption = String(F("JSON parse error"));
#else
String errCaption = String(err.c_str());
#endif
caption.value = String(F("Invalid catalog list:")) + errCaption;
AC_DBG("JSON:%s\n", errCaption.c_str());
break;
}
} while (responseBody.findUntil(endOfEntry, endOfList));

Write Preview
Loading…
Cancel
Save