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

Supports AutoConnectAux

Browse Source
pull/41/head
Hieromon Ikasamo 6 years ago
parent c48ecfff4a
commit dc75ab7b6d
8 changed files with 347 additions and 143 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. 240
      examples/mqttRSSI/mqttRSSI.ino
  2. 26
      src/AutoConnect.cpp
  3. 1
      src/AutoConnect.h
  4. 174
      src/AutoConnectAux.cpp
  5. 1
      src/AutoConnectAux.h
  6. 5
      src/AutoConnectDefs.h
  7. 1
      src/AutoConnectElementBasis.h
  8. 14
      src/AutoConnectElementBasisImpl.h

240
examples/mqttRSSI/mqttRSSI.ino
Unescape View File

@ -17,22 +17,134 @@
#include <ESP8266WiFi.h> #include <ESP8266WiFi.h>
#elif defined(ARDUINO_ARCH_ESP32) #elif defined(ARDUINO_ARCH_ESP32)
#include <WiFi.h> #include <WiFi.h>
#include <SPIFFS.h>
#endif #endif
#include <FS.h>
#include <PubSubClient.h> #include <PubSubClient.h>
#include <AutoConnect.h> #include <AutoConnect.h>
#define MQTT_USER_KEY "****************" // Replace to User API Key. #define PARAM_FILE "/param.json"
#define CHANNEL_ID "******" // Replace to Channel ID. #define AUX_SETTING_URI "/mqtt_setting"
#define CHANNEL_API_KEY_WR "****************" // Replace to the write API Key. #define AUX_SAVE_URI "/mqtt_save"
#define MQTT_UPDATE_INTERVAL 40000 static const char AUX_mqtt_setting[] PROGMEM = R"raw(
#define MQTT_TOPIC "channels/" CHANNEL_ID "/publish/" CHANNEL_API_KEY_WR [
#define MQTT_USER_ID "anyone" {
#define MQTT_SERVER "mqtt.thingspeak.com" "title": "MQTT Setting",
"uri": "/mqtt_setting",
"menu": true,
"element": [
{
"name": "header",
"type": "ACText",
"value": "<h2>MQTT broker settings</h2>",
"style": "text-align:center;color:#2f4f4f;padding:10px;"
},
{
"name": "caption",
"type": "ACText",
"value": "Publishing the WiFi signal strength to MQTT channel. RSSI value of ESP8266 to the channel created on ThingSpeak",
"style": "font-family:serif;color:#4682b4;"
},
{
"name": "mqttserver",
"type": "ACInput",
"value": "mqtt.thingspeak.com",
"placeholder": "MQTT broker server",
"label": "Server"
},
{
"name": "channelid",
"type": "ACInput",
"value": "454951",
"label": "Channel ID"
},
{
"name": "userkey",
"type": "ACInput",
"value": "NRTFYGJ6TJFGX4RC",
"label": "User Key"
},
{
"name": "apikey",
"type": "ACInput",
"value": "HBVQ2XV6VYBI4582",
"label": "API Key"
},
{
"name": "period",
"type": "ACRadio",
"label": "Update period",
"value": [
"30 sec.",
"60 sec.",
"180 sec."
],
"arrange": "vertical",
"checked": 1
},
{
"name": "newline",
"type": "ACElement",
"value": "<hr>"
},
{
"name": "uniqueid",
"type": "ACCheckbox",
"value": "unique",
"label": "Use APID unique",
"checked": true
},
{
"name": "hostname",
"type": "ACInput",
"label": "ESP host name",
"value": ""
},
{
"name": "save",
"type": "ACSubmit",
"value": "Save&Start",
"uri": "/mqtt_save"
},
{
"name": "discard",
"type": "ACSubmit",
"value": "Discard",
"uri": "/"
}
]
},
{
"title": "MQTT Setting",
"uri": "/mqtt_save",
"name": "mqttsave",
"element": [
{
"name": "caption",
"type": "ACText",
"value": "<h4>Parameters saved as:</h4>",
"style": "text-align:center;color:#2f4f4f;padding:10px;"
}
]
}
]
)raw";
AutoConnect portal; AutoConnect portal;
AutoConnectConfig config;
WiFiClient wifiClient; WiFiClient wifiClient;
PubSubClient mqttClient(wifiClient); PubSubClient mqttClient(wifiClient);
String serverName;
String channelId;
String userKey;
String apiKey;
String apid;
String hostName;
unsigned int updateInterval = 0;
unsigned long lastPub = 0;
#define MQTT_USER_ID "anyone"
bool mqttConnect() { bool mqttConnect() {
static const char alphanum[] = "0123456789" static const char alphanum[] = "0123456789"
@ -42,14 +154,18 @@ bool mqttConnect() {
uint8_t retry = 10; uint8_t retry = 10;
while (!mqttClient.connected()) { while (!mqttClient.connected()) {
Serial.println("Attempting MQTT broker:" MQTT_SERVER); if (serverName.length() <= 0)
break;
mqttClient.setServer(serverName.c_str(), 1883);
Serial.println(String("Attempting MQTT broker:") + serverName);
for (uint8_t i = 0; i < 8; i++) { for (uint8_t i = 0; i < 8; i++) {
clientId[i] = alphanum[random(62)]; clientId[i] = alphanum[random(62)];
} }
clientId[8] = '\0'; clientId[8] = '\0';
if (mqttClient.connect(clientId, MQTT_USER_ID, MQTT_USER_KEY)) { if (mqttClient.connect(clientId, MQTT_USER_ID, userKey.c_str())) {
Serial.println("Established:" + String(clientId)); Serial.println("Established:" + String(clientId));
return true; return true;
} else { } else {
@ -63,7 +179,7 @@ bool mqttConnect() {
} }
void mqttPublish(String msg) { void mqttPublish(String msg) {
String path = String(MQTT_TOPIC); String path = String("channels/") + channelId + String("/publish/") + apiKey;
int tLen = path.length(); int tLen = path.length();
char topic[tLen]; char topic[tLen];
path.toCharArray(topic, tLen + 1); path.toCharArray(topic, tLen + 1);
@ -83,16 +199,104 @@ int getStrength(uint8_t points) {
rssi += WiFi.RSSI(); rssi += WiFi.RSSI();
delay(20); delay(20);
} }
return points ? (int)(rssi / points) : 0; return points ? static_cast<int>(rssi / points) : 0;
} }
unsigned long lastPub = 0; String loadParams(AutoConnectAux& aux, PageArgument& args) {
(void)(args);
SPIFFS.begin();
File param = SPIFFS.open(PARAM_FILE, "r");
if (param) {
aux.loadElement(param);
param.close();
}
else
Serial.println(PARAM_FILE " open failed");
SPIFFS.end();
return "";
}
String saveParams(AutoConnectAux& aux, PageArgument& args) {
String echo;
serverName = args.arg("mqttserver");
serverName.trim();
echo = "mqttserver: " + serverName + "<br>";
channelId = args.arg("channelid");
channelId.trim();
echo += "channelid: " + channelId + "<br>";
userKey = args.arg("userkey");
userKey.trim();
echo += "userkey: " + userKey + "<br>";
apiKey = args.arg("apikey");
apiKey.trim();
echo += "apikey: " + apiKey + "<br>";
String upd = args.arg("period");
updateInterval = upd.substring(0, 2).toInt() * 1000;
echo += "period: " + String(updateInterval) + "<br>";
String uniqueid = args.arg("uniqueid");
echo += "uniqueid: " + uniqueid + "<br>";
hostName = args.arg("hostname");
hostName.trim();
echo += "hostname: " + hostName + "<br>";
SPIFFS.begin();
File param = SPIFFS.open(PARAM_FILE, "w");
portal.aux("/mqtt_setting")->saveElement(param, { "mqttserver", "channelid", "userkey", "apikey", "period", "uniqueid", "hostname" });
param.close();
SPIFFS.end();
return echo;
}
void handleRoot() {
String content =
"<html>"
"<head>"
"<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">"
"</head>"
"<body>"
"<iframe width=\"450\" height=\"260\" style=\"transform:scale(0.79);-o-transform:scale(0.79);-webkit-transform:scale(0.79);-moz-transform:scale(0.79);-ms-transform:scale(0.79);transform-origin:0 0;-o-transform-origin:0 0;-webkit-transform-origin:0 0;-moz-transform-origin:0 0;-ms-transform-origin:0 0;border: 1px solid #cccccc;\" src=\"https://thingspeak.com/channels/454951/charts/1?bgcolor=%23ffffff&color=%23d62020&dynamic=true&type=line\"></iframe>"
"<p style=\"padding-top:10px;text-align:center\">" AUTOCONNECT_LINK(COG_24) "</p>"
"</body>"
"</html>";
#if defined(ARDUINO_ARCH_ESP8266)
ESP8266WebServer& server = portal.host();
#elif defined(ARDUINO_ARCH_ESP32)
WebServer& server = portal.host();
#endif
server.send(200, "text/html", content);
}
void setup() { void setup() {
delay(1000); delay(1000);
Serial.begin(115200); Serial.begin(115200);
Serial.println(); Serial.println();
if (portal.load(FPSTR(AUX_mqtt_setting))) {
AutoConnectAux* setting = portal.aux(AUX_SETTING_URI);
AutoConnectCheckbox& uniqueidElm = setting->getElement<AutoConnectCheckbox>("uniqueid");
AutoConnectInput& hostnameElm = setting->getElement<AutoConnectInput>("hostname");
if (uniqueidElm.checked) {
config.apid = String("ESP") + "_" + String(ESP.getChipId(), HEX);
}
if (hostnameElm.value.length()) {
config.hostName = hostnameElm.value;
}
portal.on(AUX_SETTING_URI, loadParams);
portal.on(AUX_SAVE_URI, saveParams, AC_EXIT_LATER);
portal.config(config);
}
else
Serial.println("load error");
Serial.print("WiFi "); Serial.print("WiFi ");
if (portal.begin()) { if (portal.begin()) {
Serial.println("connected:" + WiFi.SSID()); Serial.println("connected:" + WiFi.SSID());
@ -104,11 +308,18 @@ void setup() {
yield(); yield();
} }
} }
mqttClient.setServer(MQTT_SERVER, 1883);
#if defined(ARDUINO_ARCH_ESP8266)
ESP8266WebServer& server = portal.host();
#elif defined(ARDUINO_ARCH_ESP32)
WebServer& server = portal.host();
#endif
server.on("/", handleRoot);
} }
void loop() { void loop() {
if (millis() - lastPub > MQTT_UPDATE_INTERVAL) { if (updateInterval > 0) {
if (millis() - lastPub > updateInterval) {
if (!mqttClient.connected()) { if (!mqttClient.connected()) {
mqttConnect(); mqttConnect();
} }
@ -117,5 +328,6 @@ void loop() {
mqttClient.loop(); mqttClient.loop();
lastPub = millis(); lastPub = millis();
} }
}
portal.handleClient(); portal.handleClient();
} }

26
src/AutoConnect.cpp
Unescape View File

@ -656,6 +656,26 @@ String AutoConnect::_invokeResult(PageArgument& args) {
*/ */
bool AutoConnect::_classifyHandle(HTTPMethod method, String uri) { bool AutoConnect::_classifyHandle(HTTPMethod method, String uri) {
AC_DBG("Host:%s, URI:%s", _webServer->hostHeader().c_str(), uri.c_str()); AC_DBG("Host:%s, URI:%s", _webServer->hostHeader().c_str(), uri.c_str());
// At the time when handleClient calls RequestHandler, the parsed http
// argument remains the last one in the request.
// If the current request argument contains AutoConnectElement, it is
// the form data of the AutoConnectAux page and with this timing save
// the value of each element.
if (_webServer->hasArg(String(AUTOCONNECT_AUXURI_PARAM))) {
String auxUri = _webServer->arg(AUTOCONNECT_AUXURI_PARAM);
auxUri.replace(String("&#47;"), String("/"));
AutoConnectAux* aux = _aux.get();
while (aux) {
if (aux->_uriStr == auxUri) {
aux->_storeElements(_webServer.get());
break;
}
aux = aux->_next.get();
}
}
// Here, classify requested uri
if (uri == _uri) { if (uri == _uri) {
AC_DBG_DUMB(", already allocated\n", _uri.c_str()); AC_DBG_DUMB(", already allocated\n", _uri.c_str());
return true; // The response page already exists. return true; // The response page already exists.
@ -747,12 +767,10 @@ wl_status_t AutoConnect::_waitForConnect(unsigned long timeout) {
if (millis() - st > timeout) if (millis() - st > timeout)
break; break;
} }
#ifdef AC_DEBUG AC_DBG_DUMB("%c", '.');
AC_DEBUG_PORT.print('.');
#endif // !AC_DEBUG
delay(300); delay(300);
} }
AC_DBG("%s IP:%s\n", wifiStatus == WL_CONNECTED ? "established" : "time out", WiFi.localIP().toString().c_str()); AC_DBG_DUMB("%s IP:%s\n", wifiStatus == WL_CONNECTED ? "established" : "time out", WiFi.localIP().toString().c_str());
return wifiStatus; return wifiStatus;
} }

1
src/AutoConnect.h
Unescape View File

@ -235,7 +235,6 @@ class AutoConnect {
/** Extended pages made up with AutoConnectAux */ /** Extended pages made up with AutoConnectAux */
std::unique_ptr<AutoConnectAux> _aux; std::unique_ptr<AutoConnectAux> _aux;
String _auxLastUri;
/** Saved configurations */ /** Saved configurations */
AutoConnectConfig _apConfig; AutoConnectConfig _apConfig;

174
src/AutoConnectAux.cpp
Unescape View File

@ -53,7 +53,7 @@ const char AutoConnectAux::_PAGE_AUX[] PROGMEM = {
"function _sa(url) {" "function _sa(url) {"
"var uri=document.createElement('input');" "var uri=document.createElement('input');"
"uri.setAttribute('type','hidden');" "uri.setAttribute('type','hidden');"
"uri.setAttribute('name','uri');" "uri.setAttribute('name','" AUTOCONNECT_AUXURI_PARAM "');"
"uri.setAttribute('value','{{AUX_URI}}');" "uri.setAttribute('value','{{AUX_URI}}');"
"document.getElementById('_aux').appendChild(uri);" "document.getElementById('_aux').appendChild(uri);"
"document.getElementById('_aux').action=url;" "document.getElementById('_aux').action=url;"
@ -75,6 +75,16 @@ AutoConnectAux::~AutoConnectAux() {
_ac.release(); _ac.release();
} }
/**
* Returns a null element as static storage.
* This static element is referred by invalid JSON data.
* @return A reference of a static element defined by name as null.
*/
AutoConnectElement& AutoConnectAux::_nullElement() {
static AutoConnectElement nullElement("", "");
return nullElement;
}
/** /**
* Add an AutoConnectElement * Add an AutoConnectElement
* @param addon A reference of AutoConnectElement. * @param addon A reference of AutoConnectElement.
@ -89,8 +99,8 @@ void AutoConnectAux::add(AutoConnectElement& addon) {
* @param addons AutoConnectElementVT collection. * @param addons AutoConnectElementVT collection.
*/ */
void AutoConnectAux::add(AutoConnectElementVT addons) { void AutoConnectAux::add(AutoConnectElementVT addons) {
for (std::size_t n = 0; n < addons.size(); n++) for (AutoConnectElement& element : addons)
add(addons[n]); add(element);
} }
/** /**
@ -99,9 +109,9 @@ void AutoConnectAux::add(AutoConnectElementVT addons) {
* @return A pointer to the registered AutoConnectElement. * @return A pointer to the registered AutoConnectElement.
*/ */
AutoConnectElement* AutoConnectAux::getElement(const String& name) { AutoConnectElement* AutoConnectAux::getElement(const String& name) {
for (std::size_t n = 0; n < _addonElm.size(); n++) for (AutoConnectElement& elm : _addonElm)
if (name.equalsIgnoreCase(_addonElm[n].get().name)) if (elm.name.equalsIgnoreCase(name))
return &(_addonElm[n].get()); return &elm;
AC_DBG("Element<%s> not registered\n", name.c_str()); AC_DBG("Element<%s> not registered\n", name.c_str());
return nullptr; return nullptr;
} }
@ -127,28 +137,6 @@ bool AutoConnectAux::release(const String& name) {
return rc; return rc;
} }
/**
* Set the value to AutoConnectRadio element.
* @param name A string of AutoConnectRadio element name to set the value.
* @param checked A checked value.
* @return true The value was set.
* @return false An element specified name is not registered,
* or its element value does not match storage type.
*/
//bool AutoConnectAux::setElementValue(const String& name, const uint8_t checked) {
// AutoConnectElement* elm = getElement(name);
// if (elm) {
// if (elm->typeOf() == AC_Radio) {
// AutoConnectRadio* elmRadio = reinterpret_cast<AutoConnectRadio*>(elm);
// elmRadio->checked = checked;
// return true;
// }
// else
// AC_DBG("Element<%s> value type mismatch\n", name.c_str());
// }
// return false;
//}
/** /**
* Set the value to specified element. * Set the value to specified element.
* @param name A string of element name to set the value. * @param name A string of element name to set the value.
@ -169,7 +157,7 @@ bool AutoConnectAux::setElementValue(const String& name, const String value) {
} }
else if (elm->typeOf() == AC_Radio) { else if (elm->typeOf() == AC_Radio) {
AutoConnectRadio* elmRadio = reinterpret_cast<AutoConnectRadio*>(elm); AutoConnectRadio* elmRadio = reinterpret_cast<AutoConnectRadio*>(elm);
elmRadio->checked = static_cast<uint8_t>(value.toInt()); elmRadio->check(value);
} }
else else
elm->value = value; elm->value = value;
@ -251,12 +239,30 @@ void AutoConnectAux::_join(AutoConnect& ac) {
_next->_join(ac); _next->_join(ac);
} }
/**
* Inject the <li> element depending on the "luxbar-item" attribute
* for implementing the AutoConnect menu.
* @param args A reference of PageArgument but it's only used for
* interface alignment and is not actually used.
* @return A concatenated string of <li> elements for the menu item of
* AutoConnect.
*/
const String AutoConnectAux::_injectMenu(PageArgument& args) {
String menuItem;
if (_menu)
menuItem = String(FPSTR("<li class=\"luxbar-item\"><a href=\"")) + String(_uri) + String("\">") + _title + String(FPSTR("</a></li>"));
if (_next)
menuItem += _next->_injectMenu(args);
return menuItem;
}
/** /**
* Insert the uri that caused the request to the aux. * Insert the uri that caused the request to the aux.
*/ */
const String AutoConnectAux::_indicateUri(PageArgument& args) { const String AutoConnectAux::_indicateUri(PageArgument& args) {
AC_UNUSED(args); AC_UNUSED(args);
String lastUri = _ac->_auxLastUri; String lastUri = _uriStr;
lastUri.replace(String("/"), String("&#47;")); lastUri.replace(String("/"), String("&#47;"));
return lastUri; return lastUri;
} }
@ -268,35 +274,8 @@ const String AutoConnectAux::_indicateUri(PageArgument& args) {
* @return HTML string that should be inserted. * @return HTML string that should be inserted.
*/ */
const String AutoConnectAux::_insertElement(PageArgument& args) { const String AutoConnectAux::_insertElement(PageArgument& args) {
// Save elements owned by AutoConnectAux that caused the request. String body = String("");
String auxUri = args.arg("uri");
if (auxUri.length()) {
auxUri.replace(String("&#47;"), String("/"));
AutoConnectAux* auxPage = _ac->_aux.get();
while (auxPage) {
if (auxPage->_uriStr == auxUri)
break;
auxPage = auxPage->_next.get();
}
// Caused page is exist, restore elements value.
if (auxPage) {
for (size_t n = 0; n < args.size(); n++) {
String elmName = args.argName(n);
String elmValue = args.arg(n);
AutoConnectElement* elm = auxPage->getElement(elmName);
if (elm) {
if (elm->typeOf() == AC_Checkbox)
elmValue = "checked";
auxPage->setElementValue(elmName, elmValue);
}
}
}
}
// Save invoked Aux.
_ac->_auxLastUri = _uriStr;
// Build the current Aux page.
String body = String();
if (_handler) { if (_handler) {
if (_order & AC_EXIT_AHEAD) { if (_order & AC_EXIT_AHEAD) {
AC_DBG("CB in AHEAD %s\n", uri()); AC_DBG("CB in AHEAD %s\n", uri());
@ -304,10 +283,12 @@ const String AutoConnectAux::_insertElement(PageArgument& args) {
} }
} }
for (std::size_t n = 0; n < _addonElm.size(); n++) { for (AutoConnectElement& addon : _addonElm)
AutoConnectElement& addon = _addonElm[n];
body += addon.toHTML(); body += addon.toHTML();
} //for (std::size_t n = 0; n < _addonElm.size(); n++) {
// AutoConnectElement& addon = _addonElm[n];
// body += addon.toHTML();
//}
if (_handler) { if (_handler) {
if (_order & AC_EXIT_LATER) { if (_order & AC_EXIT_LATER) {
@ -362,31 +343,21 @@ PageElement* AutoConnectAux::_setupPage(String uri) {
} }
/** /**
* Inject the <li> element depending on the "luxbar-item" attribute * Store element values owned by AutoConnectAux that caused the request.
* for implementing the AutoConnect menu. * Save the current arguments remaining in the Web server object when
* @param args A reference of PageArgument but it's only used for * this function invoked.
* interface alignment and is not actually used. * @param webServer A pointer to the class object of WebServerClass
* @return A concatenated string of <li> elements for the menu item of
* AutoConnect.
*/ */
const String AutoConnectAux::_injectMenu(PageArgument& args) { void AutoConnectAux::_storeElements(WebServerClass* webServer) {
String menuItem; for (uint8_t n = 0; n < webServer->args(); n++) {
String elmValue = webServer->arg(n);
if (_menu) AutoConnectElement* elm = getElement(webServer->argName(n));
menuItem = String(FPSTR("<li class=\"luxbar-item\"><a href=\"")) + String(_uri) + String("\">") + _title + String(FPSTR("</a></li>")); if (elm) {
if (_next) if (elm->typeOf() == AC_Checkbox)
menuItem += _next->_injectMenu(args); elmValue = "checked";
return menuItem; setElementValue(webServer->argName(n), elmValue);
}
} }
/**
* Returns a null element as static storage.
* This static element is referred by invalid JSON data.
* @return A reference of a static element defined by name as null.
*/
AutoConnectElement& AutoConnectAux::_nullElement() {
static AutoConnectElement nullElement("", "");
return nullElement;
} }
#ifndef AUTOCONNECT_USE_JSON #ifndef AUTOCONNECT_USE_JSON
@ -931,31 +902,24 @@ size_t AutoConnectAux::saveElement(Stream& out, std::vector<String> const& names
bufferSize += JSON_OBJECT_SIZE(4); bufferSize += JSON_OBJECT_SIZE(4);
if (amount != 1) if (amount != 1)
bufferSize += JSON_ARRAY_SIZE(amount); bufferSize += JSON_ARRAY_SIZE(amount);
for (size_t n = 0; n < amount; n++) {
for (size_t e = 0; e < stores; e++) { for (String name : names)
AutoConnectElement& elm = _addonElm[e]; for (AutoConnectElement& elm : _addonElm)
if (elm.name.equalsIgnoreCase(names[n])) { if (elm.name.equalsIgnoreCase(name)) {
bufferSize += elm.getObjectSize(); bufferSize += elm.getObjectSize();
break; break;
} }
}
}
if (bufferSize > 0) { if (bufferSize > 0) {
DynamicJsonBuffer jb(bufferSize); DynamicJsonBuffer jb(bufferSize);
if (amount == 1) { if (amount == 1) {
JsonObject& element = jb.createObject(); JsonObject& element = jb.createObject();
for (size_t e = 0; e < stores; e++) { for (AutoConnectElement& elm : _addonElm)
AutoConnectElement& elm = _addonElm[e];
if (elm.name.equalsIgnoreCase(names[0])) { if (elm.name.equalsIgnoreCase(names[0])) {
elm.serialize(element); elm.serialize(element);
break; break;
} }
}
size_n = element.printTo(out); size_n = element.printTo(out);
AC_DBG("");
element.printTo(Serial);
AC_DBG_DUMB("\n");
} }
else if (amount == 0) { else if (amount == 0) {
JsonObject& json = jb.createObject(); JsonObject& json = jb.createObject();
@ -963,32 +927,22 @@ size_t AutoConnectAux::saveElement(Stream& out, std::vector<String> const& names
json[F(AUTOCONNECT_JSON_KEY_URI)] = _uriStr; json[F(AUTOCONNECT_JSON_KEY_URI)] = _uriStr;
json[F(AUTOCONNECT_JSON_KEY_MENU)] = _menu; json[F(AUTOCONNECT_JSON_KEY_MENU)] = _menu;
JsonArray& elements = json.createNestedArray(F(AUTOCONNECT_JSON_KEY_ELEMENT)); JsonArray& elements = json.createNestedArray(F(AUTOCONNECT_JSON_KEY_ELEMENT));
for (size_t e = 0; e < stores; e++) { for (AutoConnectElement& elm : _addonElm) {
JsonObject& element = elements.createNestedObject(); JsonObject& element = elements.createNestedObject();
AutoConnectElement& elm = _addonElm[e];
elm.serialize(element); elm.serialize(element);
} }
size_n = json.prettyPrintTo(out); size_n = json.prettyPrintTo(out);
AC_DBG("");
json.printTo(Serial);
AC_DBG_DUMB("\n");
} }
else if (amount >= 2) { else if (amount >= 2) {
JsonArray& elements = jb.createArray(); JsonArray& elements = jb.createArray();
for (size_t n = 0; n < amount; n++) { for (String name : names)
for (size_t e = 0; e < stores; e++) { for (AutoConnectElement& elm : _addonElm)
AutoConnectElement& elm = _addonElm[e]; if (elm.name.equalsIgnoreCase(name)) {
if (elm.name.equalsIgnoreCase(names[n])) {
JsonObject& element = elements.createNestedObject(); JsonObject& element = elements.createNestedObject();
elm.serialize(element); elm.serialize(element);
break; break;
} }
}
}
size_n = elements.prettyPrintTo(out); size_n = elements.prettyPrintTo(out);
AC_DBG("");
elements.printTo(Serial);
AC_DBG_DUMB("\n");
} }
} }
return size_n; return size_n;

1
src/AutoConnectAux.h
Unescape View File

@ -83,6 +83,7 @@ class AutoConnectAux : public PageBuilder {
const String _injectTitle(PageArgument& args) const { (void)(args); return _title; } /**< Returns title of this page to PageBuilder */ const String _injectTitle(PageArgument& args) const { (void)(args); return _title; } /**< Returns title of this page to PageBuilder */
const String _injectMenu(PageArgument& args); /**< Inject menu title of this page to PageBuilder */ const String _injectMenu(PageArgument& args); /**< Inject menu title of this page to PageBuilder */
const String _indicateUri(PageArgument& args); /**< Inject the uri that caused the request */ const String _indicateUri(PageArgument& args); /**< Inject the uri that caused the request */
void _storeElements(WebServerClass* webServer); /**< Store element values from contained in request arguments */
static AutoConnectElement& _nullElement(void); /**< A static returning value as invalid */ static AutoConnectElement& _nullElement(void); /**< A static returning value as invalid */
#ifdef AUTOCONNECT_USE_JSON #ifdef AUTOCONNECT_USE_JSON

5
src/AutoConnectDefs.h
Unescape View File

@ -65,6 +65,11 @@
#define AUTOCONNECT_HOMEURI "/" #define AUTOCONNECT_HOMEURI "/"
#endif // !AUTOCONNECT_HOMEURI #endif // !AUTOCONNECT_HOMEURI
// AutoConnectAux form argument name
#ifndef AUTOCONNECT_AUXURI_PARAM
#define AUTOCONNECT_AUXURI_PARAM "_acuri"
#endif // !AUTOCONNECT_AUXURI_PARAM
// AutoConnect menu title // AutoConnect menu title
#ifndef AUTOCONNECT_MENU_TITLE #ifndef AUTOCONNECT_MENU_TITLE
#define AUTOCONNECT_MENU_TITLE "AutoConnect" #define AUTOCONNECT_MENU_TITLE "AutoConnect"

1
src/AutoConnectElementBasis.h
Unescape View File

@ -127,6 +127,7 @@ class AutoConnectRadioBasis : virtual public AutoConnectElementBasis {
const String toHTML(void) const override; const String toHTML(void) const override;
void add(const String value) { _values.push_back(value); } void add(const String value) { _values.push_back(value); }
void empty(void) { _values.clear(); } void empty(void) { _values.clear(); }
void check(const String& value);
String label; /**< A label for a subsequent radio buttons */ String label; /**< A label for a subsequent radio buttons */
ACArrange_t order; /**< layout order */ ACArrange_t order; /**< layout order */

14
src/AutoConnectElementBasisImpl.h
Unescape View File

@ -88,6 +88,20 @@ const String AutoConnectRadioBasis::toHTML(void) const {
return html; return html;
} }
/**
* Indicate an entry with the specified value in the value's collection.
* @param value The value to indicates in the collection.
*/
void AutoConnectRadioBasis::check(const String& value) {
for (std::size_t n = 0; n < _values.size(); n++) {
String& v = _values[n];
if (v.equalsIgnoreCase(value)) {
checked = n + 1;
break;
}
}
}
/** /**
* Generate an HTML <select> element with an <option> element. * Generate an HTML <select> element with an <option> element.
* The attribute value of the <option> element is given to the * The attribute value of the <option> element is given to the

Write Preview
Loading…
Cancel
Save