bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-29 02:07:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changed the JsonParser template parameter to be the max number of tokens instead of the number of bytes

Browse Source
This commit is contained in:
Benoit Blanchon
2014-01-15 20:55:29 +01:00
parent 9fd5288c4d
commit 4e41eb515b
3 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
JsonParser.h
View File

@ -9,16 +9,41 @@
#include "JsonHashTable.h"
#include "JsonArray.h"
template <int SIZE> // SIZE of the parser in bytes (128, 256 or more are recommended)
/*
* The JSON parser.
*
* You need to specifiy the number of token to be allocated for that parser.
* Values from 16 to 32 are recommended.
* The parser size will be MAX_TOKEN*8 bytes.
* Don't forget that the memory size of standard Arduino board is only 2KB
*
* CAUTION: JsonArray and JsonHashTable contain pointers to tokens of the
* JsonParser, so they need the JsonParser to be in memory to work.
* As a result, you must not create JsonArray and JsonHashTable that have a
* longer life that the JsonParser.
*/
template <int MAX_TOKENS>
class JsonParser
{
public:
/*
* Parse the JSON string and return a array.
*
* The content of the string may be altered to add '\0' at the
* end of string tokens
*/
JsonArray parseArray(char* json)
{
return JsonArray(json, parse(json));
}
/*
* Parse the JSON string and return a array.
*
* The content of the string may be altered to add '\0' at the
* end of string tokens
*/
JsonHashTable parseHashTable(char* json)
{
return JsonHashTable(json, parse(json));
@ -31,16 +56,13 @@ private:
jsmn_parser parser;
jsmn_init(&parser);
jsmntok_t* tokens = (jsmntok_t*) buffer;
int maxTokenCount = SIZE / sizeof(jsmntok_t);
if (JSMN_SUCCESS != jsmn_parse(&parser, json, tokens, maxTokenCount))
if (JSMN_SUCCESS != jsmn_parse(&parser, json, tokens, MAX_TOKENS))
return 0;
return tokens;
}
char buffer[SIZE];
jsmntok_t tokens[MAX_TOKENS];
};
#endif