feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Simplified JsonArray

Browse Source
This commit is contained in:
Benoit Blanchon
2014-10-25 21:02:13 +02:00
parent 9f69fabe20
commit 618a54579f
3 changed files with 15 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/ArduinoJson/JsonArray.hpp
View File

@ -24,12 +24,14 @@ class JsonArray : public JsonContainer {
JsonValue operator[](int index) const;
void add(bool value);
void add(const char *value);
void add(double value, int decimals = 2);
void add(int value) { add(static_cast<long>(value)); }
void add(long value);
void add(JsonContainer nestedArray); // TODO: should allow JsonValue too
template <typename T>
void add(T value) {
addNewValue() = value;
}
void add(double value, int decimals = 2) {
addNewValue().set(value, decimals);
}
JsonArray createNestedArray();
JsonObject createNestedObject();
@ -41,5 +43,8 @@ class JsonArray : public JsonContainer {
const_iterator begin() const { return const_iterator(firstChild()); }
const_iterator end() const { return const_iterator(0); }
private:
JsonValue addNewValue();
};
}

5
include/ArduinoJson/JsonContainer.hpp
View File

@ -7,15 +7,12 @@
#pragma once
#include "Arduino/Printable.hpp"
#include "ForwardDeclarations.hpp"
#include "Internals/JsonNodeIterator.hpp"
#include "Internals/JsonNodeWrapper.hpp"
namespace ArduinoJson {
class JsonContainer : public Printable, public Internals::JsonNodeWrapper {
friend class JsonArray;
public:
JsonContainer() {}
@ -44,6 +41,6 @@ class JsonContainer : public Printable, public Internals::JsonNodeWrapper {
void addChild(Internals::JsonNode *);
void removeChild(Internals::JsonNode *);
Internals::JsonNode *createNode();
Internals::JsonNode* firstChild() const;
Internals::JsonNode *firstChild() const;
};
}