enhance/v120
Hieromon Ikasamo 5 years ago
parent ba7d9fb066
commit 6d0e30d382
  1. 4
      src/AutoConnectAux.cpp
  2. 6
      src/AutoConnectCredential.cpp
  3. 4
      src/AutoConnectDefs.h
  4. 6
      src/AutoConnectUpdate.cpp
  5. 2
      src/AutoConnectUpdate.h

@ -333,7 +333,7 @@ void AutoConnectAux::upload(const String& requestUri, const HTTPUpload& upload)
* AutoConnectAux is collected in the chain list and each object is * AutoConnectAux is collected in the chain list and each object is
* chained by the "_next". AutoConnect follows the "_next" to manage * chained by the "_next". AutoConnect follows the "_next" to manage
* auxiliary pages. The _concat function concatenates subsequent * auxiliary pages. The _concat function concatenates subsequent
* AutoConnectAuxs. * AutoConnectAuxes.
* @param aux A reference of AutoConnectAux. * @param aux A reference of AutoConnectAux.
*/ */
void AutoConnectAux::_concat(AutoConnectAux& aux) { void AutoConnectAux::_concat(AutoConnectAux& aux) {
@ -648,7 +648,7 @@ bool AutoConnect::load(Stream& aux) {
/** /**
* Load AutoConnectAux page from JSON object. * Load AutoConnectAux page from JSON object.
* @param aux A JsonVariant object that stores each element of AutoConnectAuxl. * @param aux A JsonVariant object that stores each element of AutoConnectAux.
* @return true Successfully loaded. * @return true Successfully loaded.
*/ */
bool AutoConnect::_load(JsonVariant& auxJson) { bool AutoConnect::_load(JsonVariant& auxJson) {

@ -26,7 +26,7 @@
* ssid: SSID string with null termination. * ssid: SSID string with null termination.
* password : Password string with null termination. * password : Password string with null termination.
* bssid : BSSID 6 bytes. * bssid : BSSID 6 bytes.
* d : DHCP is in available. 0:DCHP 1:Static IP * d : DHCP is in available. 0:DHCP 1:Static IP
* ip - dns2 : Optional fields for static IPs configuration, these fields are available when d=1. * ip - dns2 : Optional fields for static IPs configuration, these fields are available when d=1.
* ip : Static IP (uint32_t) * ip : Static IP (uint32_t)
* gw : Gateway address (uint32_t) * gw : Gateway address (uint32_t)
@ -353,7 +353,7 @@ void AutoConnectCredential::_retrieveEntry(station_config_t* config) {
* ssid: SSID string with null termination. * ssid: SSID string with null termination.
* password : Password string with null termination. * password : Password string with null termination.
* bssid : BSSID 6 bytes. * bssid : BSSID 6 bytes.
* d : DHCP is in available. 0:DCHP 1:Static IP * d : DHCP is in available. 0:DHCP 1:Static IP
* ip - dns2 : Optional fields for static IPs configuration, these fields are available when d=1. * ip - dns2 : Optional fields for static IPs configuration, these fields are available when d=1.
* ip : Static IP (uint32_t) * ip : Static IP (uint32_t)
* gw : Gateway address (uint32_t) * gw : Gateway address (uint32_t)
@ -576,7 +576,7 @@ size_t AutoConnectCredential::_commit(void) {
} }
/** /**
* Actualy delete the credential entry for the specified SSID from Preferences. * Delete the credential entry Actually for the specified SSID from Preferences.
* @param ssid A SSID character string to be deleted. * @param ssid A SSID character string to be deleted.
* @param commit If false, delete only a credential entry without updating Preferences. * @param commit If false, delete only a credential entry without updating Preferences.
* @retval true The entry successfully delete. * @retval true The entry successfully delete.

@ -160,14 +160,14 @@
// Flicker pulse width during AP operation (8bit resolution) // Flicker pulse width during AP operation (8bit resolution)
#ifndef AUTOCONNECT_FLICKER_WIDTHAP #ifndef AUTOCONNECT_FLICKER_WIDTHAP
#define AUTOCONNECT_FLICKER_WIDTHAP 96 #define AUTOCONNECT_FLICKER_WIDTHAP 96
#endif // !AUTOCONNECT_FLICKER_WIDTHAPSTA #endif // !AUTOCONNECT_FLICKER_WIDTHAP
// Flicker pulse width while WiFi is not connected (8bit resolution) // Flicker pulse width while WiFi is not connected (8bit resolution)
#ifndef AUTOCONNECT_FLICKER_WIDTHDC #ifndef AUTOCONNECT_FLICKER_WIDTHDC
#define AUTOCONNECT_FLICKER_WIDTHDC 16 #define AUTOCONNECT_FLICKER_WIDTHDC 16
#endif // !AUTOCONNECT_FLICKER_WIDTHDISCON #endif // !AUTOCONNECT_FLICKER_WIDTHDISCON
// Ticker port // Ticker port
#ifndef AUTOCONNECT_TICKER_PORT #ifndef AUTOCONNECT_TICKER_PORT
#if defined(BUILDIN_LED) || defined(LED_BUILTIN) #if defined(BUILTIN_LED) || defined(LED_BUILTIN)
#define AUTOCONNECT_TICKER_PORT LED_BUILTIN #define AUTOCONNECT_TICKER_PORT LED_BUILTIN
#else // Native pin for the arduino #else // Native pin for the arduino
#define AUTOCONNECT_TICKER_PORT 2 #define AUTOCONNECT_TICKER_PORT 2

@ -41,7 +41,7 @@
* description: * description:
* [ * [
* { * {
* "name": "somefoler", * "name": "somefolder",
* "type": "directory" * "type": "directory"
* }, * },
* { * {
@ -488,7 +488,7 @@ String AutoConnectUpdateAct::_onResult(AutoConnectAux& result, PageArgument& arg
switch (_status) { switch (_status) {
case UPDATE_SUCCESS: case UPDATE_SUCCESS:
resForm = String(F(" sucessfully updated. restart...")); resForm = String(F(" successfully updated. restart..."));
resColor = String(F("blue")); resColor = String(F("blue"));
restart = true; restart = true;
break; break;
@ -512,7 +512,7 @@ String AutoConnectUpdateAct::_onResult(AutoConnectAux& result, PageArgument& arg
/** /**
* A handler for notifying the client of the progress of update processing. * A handler for notifying the client of the progress of update processing.
* This handler specifies the URI behavior defined as THndlerFunc of * This handler specifies the URI behavior defined as THandlerFunc of
* ESP8266 WebServer (WebServer for ESP32). * ESP8266 WebServer (WebServer for ESP32).
* Usually, that URI is /_ac/update_progress and will return the * Usually, that URI is /_ac/update_progress and will return the
* processed amount of update processing to the client. * processed amount of update processing to the client.

@ -116,7 +116,7 @@ class AutoConnectUpdateAct : public AutoConnectUpdateVoid, public HTTPUpdateClas
~AutoConnectUpdateAct(); ~AutoConnectUpdateAct();
void attach(AutoConnect& portal) override; /**< Attach the update class to AutoConnect */ void attach(AutoConnect& portal) override; /**< Attach the update class to AutoConnect */
void enable(void) override; /**< Enable the AutoConnectUpdateAct */ void enable(void) override; /**< Enable the AutoConnectUpdateAct */
void disable(const bool activte = false) override; /**< Disable the AutoConnectUpdateAct */ void disable(const bool activate = false) override; /**< Disable the AutoConnectUpdateAct */
void handleUpdate(void) override; /**< Behaves the update process */ void handleUpdate(void) override; /**< Behaves the update process */
bool isEnabled(void) override { return _auxCatalog ? _auxCatalog->isMenu() : false; } /**< Returns current updater effectiveness */ bool isEnabled(void) override { return _auxCatalog ? _auxCatalog->isMenu() : false; } /**< Returns current updater effectiveness */
AC_UPDATESTATUS_t status(void) override { return _status; } /**< reports the current update behavior status */ AC_UPDATESTATUS_t status(void) override { return _status; } /**< reports the current update behavior status */

Loading…
Cancel
Save