Supports AutoConnectAux

src/AutoConnectAux.cpp

@@ -77,7 +77,7 @@ AutoConnectAux::~AutoConnectAux() {
  */
 void AutoConnectAux::add(AutoConnectElement& addon) {
   _addonElm.push_back(addon);
-  AC_DBG("%s placed on %s\n", addon.name.length() ? addon.name.c_str() : "*nonamed*", uri());
+  AC_DBG("%s placed on %s\n", addon.name.length() ? addon.name.c_str() : "*noname", uri());
 }
 
 /**
@@ -258,6 +258,10 @@ AutoConnectElement* AutoConnectAux::_createElement(const JsonObject& json) {
     AutoConnectInput* cert_elm = new AutoConnectInput;
     return reinterpret_cast<AutoConnectElement*>(cert_elm);
   }
+  case AC_Radio: {
+    AutoConnectRadio*  cert_elm = new AutoConnectRadio;
+    return reinterpret_cast<AutoConnectElement*>(cert_elm);
+  }
   case AC_Select: {
     AutoConnectSelect*  cert_elm = new AutoConnectSelect;
     return reinterpret_cast<AutoConnectElement*>(cert_elm);
@@ -274,18 +278,87 @@ AutoConnectElement* AutoConnectAux::_createElement(const JsonObject& json) {
   return elm;
 }
 
+/**
+ * Constructs an AutoConnectAux instance by reading all the
+ * AutoConnectElements of the specified URI from the elements defined JSON.
+ * @param  in    AutoConnectAux element data which is described by JSON.
+ * @param  uri   AutoConnectAux uri to be loaded.
+ * @return true  The element collection successfully loaded.
+ * @return false Invalid JSON data occurred. 
+ */
+bool AutoConnectAux::load(const char* in, const String uri) {
+  DynamicJsonBuffer jsonBuffer;
+  JsonObject& jb = jsonBuffer.parseObject(in);
+  return _load(jb, uri);
+}
+
+bool AutoConnectAux::load(const __FlashStringHelper* in, const String uri) {
+  DynamicJsonBuffer jsonBuffer;
+  JsonObject& jb = jsonBuffer.parseObject(in);
+  return _load(jb, uri);
+}
+
+bool AutoConnectAux::load(Stream& in, const String uri) {
+  DynamicJsonBuffer jsonBuffer;
+  JsonObject& jb = jsonBuffer.parseObject(in);
+  return _load(jb, uri);
+}
+
+bool AutoConnectAux::_load(JsonObject& jb, const String uri) {
+  bool rc = jb.success();
+  if (rc) {
+    JsonArray&  aux = jb[AUTOCONNECT_JSON_KEY_AUX];
+    if ((rc = aux.success())) {
+      rc = false;
+      for (JsonObject& page : aux) {
+        const String  j_uri = page.get<String>(F(AUTOCONNECT_JSON_KEY_URI));
+        if (uri == j_uri) {
+          AC_DBG("Loading %s\n", j_uri.c_str());
+          _title = page.get<String>(F(AUTOCONNECT_JSON_KEY_TITLE));
+          _menu = page.get<bool>(F(AUTOCONNECT_JSON_KEY_MENU));
+          _uriStr = j_uri;
+          setUri(_uriStr.c_str());
+          (void)_loadElement(jb, "*");
+          rc = true;
+          break;
+        }
+      }
+    }
+  }
+  return rc;
+}
+
 /**
  * Load element specified by the name parameter from the stream
  * described by JSON. Usually, the Stream is specified a storm file of
  * SD or SPIFFS. The Stream must be opened before invoking the function.
  * @param  in    Reference of the Stream which contains the parameter
  * file described by JSON.
- * @param  name  The element name to be loaded.
+ * @param  name  The element name to be loaded. '*'specifies that all
+ * elements are to be loaded.
  * @return A reference of loaded AutoConnectElement instance.
  */
+AutoConnectElement& AutoConnectAux::loadElement(const char* in, const String name) {
+  DynamicJsonBuffer jsonBuffer;
+  JsonObject& jb = jsonBuffer.parseObject(in);
+  return _loadElement(jb, name);
+}
+
+AutoConnectElement& AutoConnectAux::loadElement(const __FlashStringHelper* in, const String name) {
+  DynamicJsonBuffer jsonBuffer;
+  JsonObject& jb = jsonBuffer.parseObject(in);
+  return _loadElement(jb, name);
+}
+
 AutoConnectElement& AutoConnectAux::loadElement(Stream& in, const String name) {
   DynamicJsonBuffer jsonBuffer;
   JsonObject& jb = jsonBuffer.parseObject(in);
+  return _loadElement(jb, name);
+}
+
+AutoConnectElement& AutoConnectAux::_loadElement(JsonObject& jb, const String name) {
+  AutoConnectElement* auxElm = nullptr;
+  bool  wc = name == "*";
 
   if (!jb.success())
     return _nullElement();
@@ -295,38 +368,39 @@ AutoConnectElement& AutoConnectAux::loadElement(Stream& in, const String name) {
     return _nullElement();
 
   for (JsonObject& page : aux) {
-    if (page["uri"].as<String>() == String(uri())) {
+    if (page[AUTOCONNECT_JSON_KEY_URI].as<String>() == String(uri())) {
       JsonArray& element = page[AUTOCONNECT_JSON_KEY_ELEMENT];
       for (JsonObject& elm : element) {
-        if (name.equalsIgnoreCase(elm.get<String>(F(AUTOCONNECT_JSON_KEY_NAME)))) {
+        String  elmName = elm.get<String>(F(AUTOCONNECT_JSON_KEY_NAME));
+        if (wc || name.equalsIgnoreCase(elmName)) {
           // The specified element is defined in the JSON stream.
           // Loads from JSON object.
           const String  inType = elm[AUTOCONNECT_JSON_KEY_TYPE].as<String>();
-          AutoConnectElement* auxElm = _getElement(name);
+          auxElm = _getElement(elmName);
           // The element is not created yet, create new one.
           if (!auxElm) {
             if ((auxElm = _createElement(elm))) {
-              AC_DBG("%s<%d> of %s created\n", name.c_str(), (int)(auxElm->typeOf()), uri());
+              AC_DBG("%s<%d> of %s created\n", elmName.c_str(), (int)(auxElm->typeOf()), uri());
               add(*auxElm);   // Insert to AutoConnect
             }
             else {
-              AC_DBG("%s unknown element type\n", name.c_str());
+              AC_DBG("%s unknown element type\n", elmName.c_str());
-              return _nullElement();
+              continue;
             }
           }
           if (auxElm->loadElement(elm)) {
-            AC_DBG("%s<%d> of %s loaded\n", name.c_str(), (int)auxElm->typeOf(), uri());
+            AC_DBG("%s<%d> of %s loaded\n", auxElm->name.c_str(), (int)auxElm->typeOf(), uri());
           }
           else {
             // Element type mismatch
-            AC_DBG("Type of %s element mismatched\n", name.c_str());
+            AC_DBG("Type of %s element mismatched\n", elmName.c_str());
-            return _nullElement();
+            continue;
           }
         }
       }
     }
   }
-  return _nullElement();
+  return auxElm ? *auxElm : _nullElement();
 }
 
 /**
@@ -387,6 +461,7 @@ const ACElement_t AutoConnectAux::_asElementType(const String type) {
     { AUTOCONNECT_JSON_TYPE_ACCHECKBOX, AC_Checkbox },
     { AUTOCONNECT_JSON_TYPE_ACELEMENT, AC_Element },
     { AUTOCONNECT_JSON_TYPE_ACINPUT, AC_Input },
+    { AUTOCONNECT_JSON_TYPE_ACRADIO, AC_Radio },
     { AUTOCONNECT_JSON_TYPE_ACSELECT, AC_Select },
     { AUTOCONNECT_JSON_TYPE_ACSUBMIT, AC_Submit },
     { AUTOCONNECT_JSON_TYPE_ACTEXT, AC_Text }

src/AutoConnectAux.h

@@ -10,11 +10,14 @@
 #ifndef _AUTOCONNECTAUX_H_
 #define _AUTOCONNECTAUX_H_
 
+#include "AutoConnectDefs.h"
 #include <vector>
 #include <memory>
 #include <functional>
+#ifdef AUTOCONNECT_USE_JSON
+#include <Stream.h>
+#endif
 #include <PageBuilder.h>
-#include "AutoConnectDefs.h"
 #include "AutoConnectElement.h"
 
 class AutoConnect;
@@ -57,7 +60,12 @@ class AutoConnectAux : public PageBuilder {
   void  on(const AuxHandlerFunctionT handler, const AutoConnectExitOrder_t order = AC_EXIT_AHEAD) { _handler = handler; _order = order; }   /**< Set user handler */
 
 #ifdef AUTOCONNECT_USE_JSON
-  AutoConnectElement& loadElement(Stream& in, const String name);
+  bool load(const char* in, const String uri);
+  bool load(const __FlashStringHelper* in, const String uri);
+  bool load(Stream& in, const String uri);
+  AutoConnectElement& loadElement(const char* in, const String name = "*");
+  AutoConnectElement& loadElement(const __FlashStringHelper* in, const String name = "*");
+  AutoConnectElement& loadElement(Stream& in, const String name = "*");
   size_t  saveElement(Stream& out, const AutoConnectElement& element);
 #endif
 
@@ -70,6 +78,8 @@ class AutoConnectAux : public PageBuilder {
   const String  _injectMenu(PageArgument& args);
 
 #ifdef AUTOCONNECT_USE_JSON
+  bool _load(JsonObject& in, const String uri);
+  AutoConnectElement& _loadElement(JsonObject& in, const String name);
   AutoConnectElement* _createElement(const JsonObject& json);
   AutoConnectElement* _getElement(const String name);
   static const ACElement_t  _asElementType(const String type);
@@ -78,6 +88,7 @@ class AutoConnectAux : public PageBuilder {
 
   String  _title;                             /**< A title of the page */
   bool    _menu;                              /**< Switch for menu displaying */
+  String  _uriStr;                            /**< uri as String */
   AutoConnectElementVT  _addonElm;            /**< A vector set of AutoConnectElements placed on this auxiliary page */
   std::unique_ptr<AutoConnectAux> _next;      /**< Auxiliary pages chain list */
   std::unique_ptr<AutoConnect>    _ac;        /**< Hosted AutoConnect instance */

src/AutoConnectElement.h

@@ -11,15 +11,14 @@
 #define _AUTOCONENCTELEMENT_H_
 
 #include "AutoConnectElementBasis.h"
-//#include "AutoConnectElementBasisImpl.h"
 #ifdef AUTOCONNECT_USE_JSON
 #include <ArduinoJson.h>
 #include "AutoConnectElementJson.h"
-//#include "AutoConnectElementJsonImpl.h"
 using AutoConnectElement  = AutoConnectElementJson;
 using AutoConnectButton   = AutoConnectButtonJson;
 using AutoConnectCheckbox = AutoConnectCheckboxJson;
 using AutoConnectInput    = AutoConnectInputJson;
+using AutoConnectRadio    = AutoConnectRadioJson;
 using AutoConnectSelect   = AutoConnectSelectJson;
 using AutoConnectSubmit   = AutoConnectSubmitJson;
 using AutoConnectText     = AutoConnectTextJson;
@@ -28,6 +27,7 @@ using AutoConnectElement  = AutoConnectElementBasis;
 using AutoConnectButton   = AutoConnectButtonBasis;
 using AutoConnectCheckbox = AutoConnectCheckboxBasis;
 using AutoConnectInput    = AutoConnectInputBasis;
+using AutoConnectRadio    = AutoConnectRadioBasis;
 using AutoConnectSelect   = AutoConnectSelectBasis;
 using AutoConnectSubmit   = AutoConnectSubmitBasis;
 using AutoConnectText     = AutoConnectTextBasis;
@@ -42,6 +42,7 @@ using AutoConnectText     = AutoConnectTextBasis;
 #define ACButton(n, ...)   AutoConnectButton n(#n, ##__VA_ARGS__)
 #define ACCheckbox(n, ...) AutoConnectCheckbox n(#n, ##__VA_ARGS__)
 #define ACInput(n, ...)    AutoConnectInput n(#n, ##__VA_ARGS__)
+#define ACRadio(n, ...)    AutoConnectRadio n(#n, ##__VA_ARGS__)
 #define ACSelect(n, ...)   AutoConnectSelect n(#n, ##__VA_ARGS__)
 #define ACSubmit(n, ...)   AutoConnectSubmit n(#n, ##__VA_ARGS__)
 #define ACText(n, ...)     AutoConnectText n(#n, ##__VA_ARGS__)

src/AutoConnectElementBasis.h

@@ -18,12 +18,18 @@ typedef enum {
   AC_Checkbox,
   AC_Element,
   AC_Input,
+  AC_Radio,
   AC_Select,
   AC_Submit,
   AC_Text,
   AC_Unknown
 } ACElement_t;      /**< AutoConnectElement class type */
 
+typedef enum {
+  AC_Horizontal,
+  AC_Vertical
+} ACArrange_t;      /**< The element arrange order */
+
 /**
  * AutoConnectAux element base.
  * Placed a raw text that can be added by user sketch.
@@ -103,6 +109,32 @@ class AutoConnectInputBasis : virtual public AutoConnectElementBasis {
   String  label;      /**< A label for a subsequent input box */
 };
 
+/**
+ * Radio-button arrangement class, a part of AutoConnectAux element.
+ * Place a group of radio-button items and selectable mark checked.
+ * @param  name     Radio-button name string.
+ * @param  options  Array of value collection.
+ * @param  label    A label string that follows radio-buttons group.
+ * @param  checked  Index of check marked item.
+ */
+class AutoConnectRadioBasis : virtual public AutoConnectElementBasis {
+ public:
+  explicit AutoConnectRadioBasis(const char* name = "", std::vector<String> values = {}, const char* label = "", const ACArrange_t order = AC_Vertical, const uint8_t checked = 0) : AutoConnectElementBasis(name, ""), _values(values), label(label), order(order), checked(checked) {
+    _type = AC_Radio;
+  }
+  virtual ~AutoConnectRadioBasis() {}
+  const String  toHTML(void) const;
+  void  option(const String value) { _values.push_back(value); }
+  void  empty(void) { _values.clear(); }
+
+  String      label;    /**< A label for a subsequent radio buttons */
+  ACArrange_t order;    /**< layout order */
+  uint8_t     checked;  /**< Index of check marked item */          
+
+ protected:
+  std::vector<String> _values; /**< Items in a group */
+};
+
 /**
  * Selection-box arrangement class, A part of AutoConnectAux element.
  * Place a optionally labeled Selection-box that can be added by user sketch.

src/AutoConnectElementBasisImpl.h

@@ -62,6 +62,28 @@ const String AutoConnectInputBasis::toHTML(void) const {
   return html;
 }
 
+/**
+*  Generate an HTML <input type=radio> element with an <option> element.
+*  @return String  an HTML string.
+*/
+const String AutoConnectRadioBasis::toHTML(void) const {
+  String  html = String();
+
+  if (label.length())
+    html = String(FPSTR("<label for=\"")) + name + String("\">") + label + String(FPSTR("</label>"));
+  if (order == AC_Vertical)
+    html += String("<br>");
+  for (std::size_t n = 0; n < _values.size(); n++) {
+    html += String(FPSTR("<input type=\"radio\" id=\"")) + name + String(FPSTR("\" name=\"")) + name + String(FPSTR("\" value=\"")) + _values[n] + String("\"");
+    if (n == checked - 1)
+      html += String(FPSTR(" checked"));
+    html += String(">") + _values[n];
+    if (order == AC_Vertical)
+      html += String("<br>");
+  }
+  return html;
+}
+
 /**
  *  Generate an HTML <select> element with an <option> element.
  *  The attribute value of the <option> element is given to the

src/AutoConnectElementJson.h

@@ -13,21 +13,27 @@
 #include "AutoConnectElementBasis.h"
 #include <ArduinoJson.h>
 
-#define AUTOCONNECT_JSON_KEY_AUX         "aux"
-#define AUTOCONNECT_JSON_KEY_ELEMENT     "element"
 #define AUTOCONNECT_JSON_KEY_ACTION      "action"
+#define AUTOCONNECT_JSON_KEY_ARRANGE     "arrange"
+#define AUTOCONNECT_JSON_KEY_AUX         "aux"
 #define AUTOCONNECT_JSON_KEY_CHECKED     "checked"
+#define AUTOCONNECT_JSON_KEY_ELEMENT     "element"
+#define AUTOCONNECT_JSON_KEY_HORIZONTAL  "horizontal"
 #define AUTOCONNECT_JSON_KEY_LABEL       "label"
+#define AUTOCONNECT_JSON_KEY_MENU        "menu"
 #define AUTOCONNECT_JSON_KEY_NAME        "name"
-#define AUTOCONNECT_JSON_KEY_OPTIONS     "options"
+#define AUTOCONNECT_JSON_KEY_OPTION      "option"
 #define AUTOCONNECT_JSON_KEY_STYLE       "style"
+#define AUTOCONNECT_JSON_KEY_TITLE       "title"
 #define AUTOCONNECT_JSON_KEY_TYPE        "type"
 #define AUTOCONNECT_JSON_KEY_URI         "uri"
 #define AUTOCONNECT_JSON_KEY_VALUE       "value"
+#define AUTOCONNECT_JSON_KEY_VERTICAL    "vertival"
 #define AUTOCONNECT_JSON_TYPE_ACBUTTON   "ACButton"
 #define AUTOCONNECT_JSON_TYPE_ACCHECKBOX "ACCheckBox"
 #define AUTOCONNECT_JSON_TYPE_ACELEMENT  "ACElement"
 #define AUTOCONNECT_JSON_TYPE_ACINPUT    "ACInput"
+#define AUTOCONNECT_JSON_TYPE_ACRADIO    "ACRadio"
 #define AUTOCONNECT_JSON_TYPE_ACSELECT   "ACSelect"
 #define AUTOCONNECT_JSON_TYPE_ACSUBMIT   "ACSubmit"
 #define AUTOCONNECT_JSON_TYPE_ACTEXT     "ACText"
@@ -111,6 +117,27 @@ class AutoConnectInputJson : public AutoConnectElementJson, public AutoConnectIn
   bool  loadElement(const JsonObject& json);
 };
 
+/**
+* Radio-button arrangement class, a part of AutoConnectAux element.
+* Place a group of radio-button items and selectable mark checked.
+* @param  name     Radio-button name string.
+* @param  options  Array of value collection.
+* @param  label    A label string that follows radio-buttons group.
+* @param  checked  Index of check marked item.
+*/
+class AutoConnectRadioJson : public AutoConnectElementJson, public AutoConnectRadioBasis {
+ public:
+  explicit AutoConnectRadioJson(const char* name = "", std::vector<String> values = {}, const char* label = "", const ACArrange_t order = AC_Vertical, const uint8_t checked = 0) {
+    AutoConnectRadioBasis::name = name;
+    AutoConnectRadioBasis::_values = values;
+    AutoConnectRadioBasis::label = label;
+    AutoConnectRadioBasis::order = order;
+    AutoConnectRadioBasis::checked = checked;
+  }
+  ~AutoConnectRadioJson() {}
+  bool loadElement(const JsonObject& json);
+};
+
 /**
  * Selection-box arrangement class, A part of AutoConnectAux element.
  * Place a optionally labeled Selection-box that can be added by user sketch.

src/AutoConnectElementJsonImpl.h

@@ -85,6 +85,32 @@ bool AutoConnectInputJson::loadElement(const JsonObject& json) {
   return false;
 }
 
+/**
+* Load a radio-button element attribute member from the JSON object.
+* @param  json  A JSON object with the definition of AutoConnectElement.
+* @return true  AutoConnectElement loaded
+* @return false Type of AutoConnectElement is mismatched.
+*/
+bool AutoConnectRadioJson::loadElement(const JsonObject& json) {
+  String  type = json.get<String>(F(AUTOCONNECT_JSON_KEY_TYPE));
+  if (type.equalsIgnoreCase(F(AUTOCONNECT_JSON_TYPE_ACRADIO))) {
+    _setElement(json);
+    label = json.get<String>(F(AUTOCONNECT_JSON_KEY_LABEL));
+    checked = static_cast<uint8_t>(json.get<int>(F(AUTOCONNECT_JSON_KEY_CHECKED)));
+    String  arrange = json.get<String>(F(AUTOCONNECT_JSON_KEY_ARRANGE));
+    if (arrange.equalsIgnoreCase(F(AUTOCONNECT_JSON_KEY_VERTICAL)))
+      order = AC_Vertical;
+    else if (arrange.equalsIgnoreCase(F(AUTOCONNECT_JSON_KEY_HORIZONTAL)))
+      order = AC_Horizontal;
+    empty();
+    JsonArray& optionArray = json[AUTOCONNECT_JSON_KEY_VALUE];
+    for (auto value : optionArray)
+      option(value.as<String>());
+    return true;
+  }
+  return false;
+}
+
 /**
  * Load a select element attribute member from the JSON object.
  * @param  json  A JSON object with the definition of AutoConnectElement.
@@ -95,9 +121,9 @@ bool AutoConnectSelectJson::loadElement(const JsonObject& json) {
   String  type = json.get<String>(F(AUTOCONNECT_JSON_KEY_TYPE));
   if (type.equalsIgnoreCase(F(AUTOCONNECT_JSON_TYPE_ACSELECT))) {
     _setElement(json);
-    empty();
     label = json.get<String>(F(AUTOCONNECT_JSON_KEY_LABEL));
-    JsonArray& optionArray = json[AUTOCONNECT_JSON_KEY_OPTIONS];
+    empty();
+    JsonArray& optionArray = json[AUTOCONNECT_JSON_KEY_OPTION];
     for (auto value : optionArray)
       option(value.as<String>());
     return true;

src/AutoConnectPage.cpp

@@ -139,6 +139,9 @@ const char AutoConnect::_CSS_INPUT_BUTTON[] PROGMEM = {
   "width:16em;"
   "}"
   ".aux-page input[type=\"button\"]{"
+  "font-weight:normal;"
+  "padding:8px 14px;"
+  "margin:12px;"
   "width:auto;"
   "}"
   "input#sb[type=\"submit\"]{"