Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit86a14b7

Browse files
committed
third-party/arduino-json: bump to 5.3
1 parente643dcb commit86a14b7

File tree

84 files changed

+581
-259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+581
-259
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ install:
2323
-( cd ${ARDUINO_ESP8266_ROOT}/tools && python get.py )
2424
before_script:
2525
-mkdir -p ${ARDUINO_HOME}/libraries
26-
-( cd ${ARDUINO_HOME}/libraries && ln -s ${TRAVIS_BUILD_DIR} firebase-arduino && ln -s ${TRAVIS_BUILD_DIR}/src/third-party/arduino-json-5.2 ArduinoJson && ln -s ${HOME}/SoftwareSerial ./ && ln -s ${HOME}/Adafruit_NeoPixel ./ && ln -s ${HOME}/Adafruit-GFX-Library ./ && ln -s ${HOME}/Adafruit_SSD1306 ./)
26+
-( cd ${ARDUINO_HOME}/libraries && ln -s ${TRAVIS_BUILD_DIR} firebase-arduino && ln -s ${TRAVIS_BUILD_DIR}/src/third-party/arduino-json-5.3 ArduinoJson && ln -s ${HOME}/SoftwareSerial ./ && ln -s ${HOME}/Adafruit_NeoPixel ./ && ln -s ${HOME}/Adafruit-GFX-Library ./ && ln -s ${HOME}/Adafruit_SSD1306 ./)
2727
script:
2828
-${ARDUINO_ROOT}/arduino-builder -verbose -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M examples/FirebaseDemo_ESP8266/FirebaseDemo_ESP8266.ino
2929
-${ARDUINO_ROOT}/arduino-builder -verbose -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M examples/FirebaseSerialHost_ESP8266/FirebaseSerialHost_ESP8266.ino

‎src/Firebase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
// TODO(edcoyne): move this into our mock_arduino fork where we actually do the
2727
// override.
2828
#defineARDUINO_STRING_OVERRIDE
29-
#include"third-party/arduino-json-5.2/include/ArduinoJson.h"
29+
#include"third-party/arduino-json-5.3/include/ArduinoJson.h"
3030

3131
classFirebaseGet;
3232
classFirebaseSet;

‎src/third-party/arduino-json-5.2/include/ArduinoJson/Arduino/Print.hpp

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎src/third-party/arduino-json-5.2/include/ArduinoJson/Internals/JsonWriter.hpp

Lines changed: 0 additions & 85 deletions
This file was deleted.

‎src/third-party/arduino-json-5.2/CHANGELOG.mdrenamed to‎src/third-party/arduino-json-5.3/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
ArduinoJson: change log
22
=======================
33

4+
v5.3.0
5+
------
6+
7+
* Added custom implementation of`ftoa` (issues#266,#267,#269 and#270)
8+
* Added`JsonVariant JsonBuffer::parse()` (issue#265)
9+
* Fixed`unsigned long` printed as`signed long` (issue#170)
10+
411
v5.2.0
512
------
613

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Copyright Benoit Blanchon 2014-2016
2+
// MIT License
3+
//
4+
// Arduino JSON library
5+
// https://github.com/bblanchon/ArduinoJson
6+
// If you like this project, please add a star!
7+
8+
#pragma once
9+
10+
#ifndef ARDUINO
11+
12+
#include<stddef.h>
13+
#include<stdint.h>
14+
15+
// This class reproduces Arduino's Print class
16+
classPrint {
17+
public:
18+
virtual~Print() {}
19+
20+
virtualsize_twrite(uint8_t) = 0;
21+
22+
size_tprint(constchar* s) {
23+
size_t n =0;
24+
while (*s) {
25+
n +=write(*s++);
26+
}
27+
return n;
28+
}
29+
30+
size_tprintln() {returnwrite('\r') +write('\n'); }
31+
};
32+
33+
#else
34+
35+
#include<Print.h>
36+
37+
#endif

‎src/third-party/arduino-json-5.2/include/ArduinoJson/Arduino/String.hpprenamed to‎src/third-party/arduino-json-5.3/include/ArduinoJson/Arduino/String.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@
99

1010
#ifndef ARDUINO
1111

12-
#ifndef ARDUINO_STRING_OVERRIDE
13-
#defineARDUINO_STRING_OVERRIDE
1412
#include<string>
1513
typedef std::string String;
16-
#endif
1714

1815
#else
1916

‎src/third-party/arduino-json-5.2/include/ArduinoJson/Internals/JsonInteger.hpprenamed to‎src/third-party/arduino-json-5.3/include/ArduinoJson/Internals/JsonInteger.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,13 @@ namespace Internals {
1414

1515
#if ARDUINOJSON_USE_LONG_LONG
1616
typedeflonglong JsonInteger;
17+
typedefunsignedlonglong JsonUInt;
1718
#elif ARDUINOJSON_USE_INT64
1819
typedef __int64 JsonInteger;
20+
typedefunsigned _int64 JsonUInt;
1921
#else
2022
typedeflong JsonInteger;
23+
typedefunsignedlong JsonUInt;
2124
#endif
2225
}
2326
}

‎src/third-party/arduino-json-5.2/include/ArduinoJson/Internals/JsonParser.hpprenamed to‎src/third-party/arduino-json-5.3/include/ArduinoJson/Internals/JsonParser.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ class JsonParser {
2727
JsonArray &parseArray();
2828
JsonObject &parseObject();
2929

30+
JsonVariantparseVariant() {
31+
JsonVariant result;
32+
parseAnythingTo(&result);
33+
return result;
34+
}
35+
3036
private:
3137
boolskip(char charToSkip);
3238

‎src/third-party/arduino-json-5.2/include/ArduinoJson/Internals/JsonVariantContent.hpprenamed to‎src/third-party/arduino-json-5.3/include/ArduinoJson/Internals/JsonVariantContent.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ namespace Internals {
2020
// A union that defines the actual content of a JsonVariant.
2121
// The enum JsonVariantType determines which member is in use.
2222
union JsonVariantContent {
23-
JsonFloat asFloat;// used for double and float
24-
JsonInteger asInteger;// used for bool, char, short, int and longs
25-
constchar* asString;// asString can be null
26-
JsonArray* asArray;// asArray cannot be null
27-
JsonObject* asObject;// asObject cannot be null
23+
JsonFloat asFloat;// used for double and float
24+
JsonUInt asInteger;// used for bool, char, short, int and longs
25+
constchar* asString;// asString can be null
26+
JsonArray* asArray;// asArray cannot be null
27+
JsonObject* asObject;// asObject cannot be null
2828
};
2929
}
3030
}

‎src/third-party/arduino-json-5.2/include/ArduinoJson/Internals/JsonVariantType.hpprenamed to‎src/third-party/arduino-json-5.3/include/ArduinoJson/Internals/JsonVariantType.hpp

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@ namespace Internals {
1616
// Enumerated type to know the current type of a JsonVariant.
1717
// The value determines which member of JsonVariantContent is used.
1818
enum JsonVariantType {
19-
JSON_UNDEFINED,// the JsonVariant has not been initialized
20-
JSON_UNPARSED,// the JsonVariant contains an unparsed string
21-
JSON_STRING,// the JsonVariant stores a const char*
22-
JSON_BOOLEAN,// the JsonVariant stores a bool
23-
JSON_INTEGER,// the JsonVariant stores an integer
24-
JSON_ARRAY,// the JsonVariant stores a pointer to a JsonArray
25-
JSON_OBJECT,// the JsonVariant stores a pointer to a JsonObject
19+
JSON_UNDEFINED,// JsonVariant has not been initialized
20+
JSON_UNPARSED,// JsonVariant contains an unparsed string
21+
JSON_STRING,// JsonVariant stores a const char*
22+
JSON_BOOLEAN,// JsonVariant stores a bool
23+
JSON_POSITIVE_INTEGER,// JsonVariant stores an unsigned long
24+
JSON_NEGATIVE_INTEGER,// JsonVariant stores an unsigned long that must be
25+
// negated
26+
JSON_ARRAY,// JsonVariant stores a pointer to a JsonArray
27+
JSON_OBJECT,// JsonVariant stores a pointer to a JsonObject
2628

2729
// The following values are reserved for float values
2830
// Multiple values are used for double, depending on the number of decimal

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp