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

Reduced the size of JsonValue to 6 bytes !

Browse Source
This commit is contained in:
Benoît Blanchon
2014-07-07 13:27:12 +02:00
parent be6c4bf4d1
commit 3b6ce65054
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
JsonGenerator/JsonValue.cpp
View File

@ -12,11 +12,6 @@ size_t JsonValue::printBoolTo(const Content& c, Print& p)
return p.print(c.asBool ? "true" : "false"); return p.print(c.asBool ? "true" : "false");
} }
size_t JsonValue::printDoubleTo(const Content& c, Print& p)
{
return p.print(c.asDouble.value, c.asDouble.digits);
}
size_t JsonValue::printLongTo(const Content& c, Print& p) size_t JsonValue::printLongTo(const Content& c, Print& p)
{ {
return p.print(c.asLong); return p.print(c.asLong);

28
JsonGenerator/JsonValue.h
View File

@ -49,9 +49,8 @@ namespace ArduinoJson
template<int DIGITS> template<int DIGITS>
void set(double value) void set(double value)
{ {
printToImpl = &printDoubleTo; printToImpl = &printDoubleTo<DIGITS>;
content.asDouble.value = value; content.asDouble = value;
content.asDouble.digits = DIGITS;
} }
size_t printTo(Print& p) const size_t printTo(Print& p) const
@ -67,22 +66,23 @@ namespace ArduinoJson
long asLong; long asLong;
Printable* asPrintable; Printable* asPrintable;
const char* asString; const char* asString;
double asDouble;
struct {
double value;
uint8_t digits;
} asDouble;
}; };
Content content; Content content;
size_t(*printToImpl)(const Content&, Print& p); size_t(*printToImpl)(const Content&, Print&);
static size_t printBoolTo(const Content&, Print& p); static size_t printBoolTo(const Content&, Print&);
static size_t printDoubleTo(const Content&, Print& p); static size_t printLongTo(const Content&, Print&);
static size_t printLongTo(const Content&, Print& p); static size_t printPrintableTo(const Content&, Print&);
static size_t printPrintableTo(const Content&, Print& p); static size_t printStringTo(const Content&, Print&);
static size_t printStringTo(const Content&, Print& p);
template<int DIGITS>
static size_t printDoubleTo(const Content& c, Print& p)
{
return p.print(c.asDouble, DIGITS);
}
}; };
} }
} }