forked from bblanchon/ArduinoJson
Compare commits
832 Commits
v6.14.1
...
replace-ex
Author | SHA1 | Date | |
---|---|---|---|
53f858f55c | |||
6cdd59034d | |||
6ccac18fd4 | |||
3f6fff7d0c | |||
cc2fea45cd | |||
4159af66eb | |||
05942b620a | |||
23c73b061e | |||
c2e756d942 | |||
94aacf873e | |||
bd2dccda0e | |||
411424b74e | |||
5e5c287978 | |||
377cf63075 | |||
3252013509 | |||
deab127a2f | |||
96281de682 | |||
f0e84e4933 | |||
91397f9f06 | |||
7f75985e47 | |||
05b68fc7cc | |||
b06cee8f4d | |||
e03d8ae885 | |||
cb1dcfa5e4 | |||
67dd3120e6 | |||
9f3cf04415 | |||
01e49b33b7 | |||
8f7e793f37 | |||
254fa5712a | |||
de05814294 | |||
e33e78d202 | |||
ed5f890d28 | |||
8931651317 | |||
c078957282 | |||
cf084ae6b4 | |||
f02fcc96a2 | |||
594dc707cb | |||
5f8e3c0f0f | |||
afc0a29c2c | |||
a256ec7fff | |||
019e8326b7 | |||
bee1095042 | |||
de59dce527 | |||
57a9c50b38 | |||
5e7653b36a | |||
8110058729 | |||
7946ebe1a3 | |||
f9fe8557f1 | |||
e007d71b4f | |||
67a512a923 | |||
9cf4f3871d | |||
31253dbe13 | |||
1110d62128 | |||
c6c0649d70 | |||
61ec2c4f95 | |||
0dd6231b3f | |||
20219d74f0 | |||
64cbaa6ff7 | |||
2512993617 | |||
48ee4a178b | |||
cd4b2b2463 | |||
f806a42cc2 | |||
c1a507c158 | |||
a1809d0f31 | |||
d92eee8736 | |||
dd1d96e28f | |||
3b64197869 | |||
1f7a3f3174 | |||
fd6314e132 | |||
e4e2557b76 | |||
3b6bf45b8a | |||
65ba36622c | |||
33452c1f37 | |||
ee02c0d573 | |||
0278e94fce | |||
7643dadaec | |||
c0bebe35f1 | |||
b5bcb37657 | |||
b4a5b053ca | |||
e297932a98 | |||
e682337655 | |||
4ada3f849c | |||
5dd203bca4 | |||
362201241f | |||
2be24eded8 | |||
4327f72140 | |||
f7f1b9745d | |||
cec18177b0 | |||
f2894552f2 | |||
d3721cb122 | |||
ab72bb8601 | |||
09c89dcacf | |||
a2b09bfbd2 | |||
386105be90 | |||
83516e1740 | |||
bf99aeedb1 | |||
22dd4da3af | |||
55c3b9b3a7 | |||
d83515dcda | |||
e34c27723a | |||
b23ff65b99 | |||
556785dc1e | |||
e9c87858d1 | |||
208e7a3304 | |||
45611924f3 | |||
5b88b2c1f6 | |||
e4f3fd8c91 | |||
aec642be20 | |||
5a60c55be7 | |||
f99b2d63f9 | |||
1db803bcd3 | |||
04326d2655 | |||
9e0c56acc3 | |||
60f9f7eff6 | |||
0fe202af03 | |||
c41e8cc634 | |||
d486157a9e | |||
91aad55412 | |||
98fca74f66 | |||
60fb268d9a | |||
f1899d3049 | |||
4b779a7c1d | |||
5d1aa04e21 | |||
2f6db1edb0 | |||
aeb30ef307 | |||
1c5e5db071 | |||
68a13117dc | |||
071f718473 | |||
00949f8276 | |||
2c670e0148 | |||
002b07f0c5 | |||
5f5f927693 | |||
4d074840da | |||
82de20ee14 | |||
ece4d030a8 | |||
4d5c17b5f6 | |||
18a9a5b590 | |||
cd4bf33132 | |||
2cfefe22ac | |||
0d43e51d48 | |||
ef28064317 | |||
7c62cdb264 | |||
0ab4bdd691 | |||
af8c615266 | |||
bd13375729 | |||
5f8502ce9d | |||
1404b1ef70 | |||
36e1eecc7d | |||
ca2f80aeaf | |||
f17fc055d3 | |||
04ac53d114 | |||
483a2c9101 | |||
848c0cdc7e | |||
46a807bd30 | |||
cb0dc94db4 | |||
72642e3090 | |||
c98b05e207 | |||
2a87cc5839 | |||
296fe79bfd | |||
650d537b5d | |||
0435945a62 | |||
844a50296f | |||
1b143d383b | |||
94783fdd2a | |||
e41d5d4fa1 | |||
5dfa25d3dc | |||
a7bfc2212c | |||
315cc722e9 | |||
ca0dda7ac1 | |||
08cac13c43 | |||
44d2d47863 | |||
3571db6290 | |||
cc42373367 | |||
9dc43d14f3 | |||
3fa6b6e04f | |||
2d47b3931d | |||
0e8a236583 | |||
955815fbfa | |||
4cd03fbd26 | |||
f7dcea562f | |||
4774ca3d29 | |||
26b2ff4c0f | |||
7e6b89d21f | |||
d20e64187b | |||
86e06c901f | |||
6fe4b9c01d | |||
9b34069a3b | |||
30ea01bc31 | |||
92c9faf69f | |||
b20653ee1a | |||
750d53f8c7 | |||
7bd2ea1072 | |||
51c5f1a73a | |||
ac9b74df65 | |||
305e80c09d | |||
fc1f06822c | |||
a8c763c40e | |||
7ab6fc078c | |||
c98ba999af | |||
1d583f68da | |||
e93fd7657f | |||
78399c2d78 | |||
8cc645c40c | |||
11373af344 | |||
53d54ba9d7 | |||
2f31c932d7 | |||
93cb3d2fdc | |||
be5d5300a2 | |||
ea5b019552 | |||
bc6707b10c | |||
adea7f4131 | |||
7f459adc4b | |||
cdc1262127 | |||
f422b7b37d | |||
7a587ac2e2 | |||
38941d5807 | |||
57454cf97b | |||
af6954c224 | |||
3003756adb | |||
218a12ca46 | |||
752d01a7f1 | |||
43eed00cd9 | |||
bc8ea36781 | |||
8fb187baed | |||
db5b5f9ee2 | |||
9122d87f12 | |||
9a11d98117 | |||
30ec507989 | |||
7a76da3bc7 | |||
a8329564e2 | |||
00c9d8680a | |||
2fdacb1ca0 | |||
228c4cf9fa | |||
9d2d257851 | |||
5458e916ea | |||
1a14499612 | |||
f427706e06 | |||
8be0d57d24 | |||
8fcaebb44a | |||
bd2d232b40 | |||
b69a952e69 | |||
727a1013ca | |||
781e449e78 | |||
d4af8cffa7 | |||
0f3c73a211 | |||
0f319e7ca4 | |||
42b2840009 | |||
65c67d317a | |||
c4e5051a7a | |||
068c40d6ed | |||
c203c86a42 | |||
8aec448adf | |||
9538bc32af | |||
b2aa0029b9 | |||
57e9134540 | |||
fb4cb96c6c | |||
5e3f84c718 | |||
64922343e6 | |||
1d07abddcd | |||
21bf4973de | |||
da845ae01d | |||
5a9d3422f5 | |||
7a9feb4d6e | |||
39e8b63746 | |||
c37990d791 | |||
fac5b5a7a7 | |||
5ceb5d1813 | |||
ec4c73db0b | |||
f86b22cf4f | |||
78a74c4017 | |||
dae0182914 | |||
0f511b873d | |||
1d96826371 | |||
f6b014582f | |||
555f3dd5fe | |||
04973ca494 | |||
01b9b40bd2 | |||
c8517ee5b6 | |||
23b01a89b1 | |||
688e21e75f | |||
d921cd6d02 | |||
af8bdfbc8f | |||
68b1602c35 | |||
7bc73d7849 | |||
67bbb4c90d | |||
fffed4fba6 | |||
8d7bbffe10 | |||
488475fe16 | |||
ba8d102432 | |||
e96680eb29 | |||
4c0fb4eb55 | |||
db2fb01795 | |||
18ae8ab7b9 | |||
87c96f9306 | |||
262747b419 | |||
3e0ba2028c | |||
972f665b07 | |||
519e32badb | |||
d90b36c009 | |||
8147625921 | |||
2cf7fc5427 | |||
4871380060 | |||
2a663db3c7 | |||
437307a955 | |||
56b3b4d5a9 | |||
f5355a9eb5 | |||
779ee07de9 | |||
ab4e8547cb | |||
585795d002 | |||
68a167b167 | |||
78d4f721ff | |||
a97bcb6b2d | |||
2da1f2553d | |||
c267b55dec | |||
3a73ccf027 | |||
8ab45e6f82 | |||
da45c4bc4f | |||
48acf963fb | |||
ccccd1da11 | |||
78a30496be | |||
636c8c36eb | |||
5070fa6562 | |||
d9e035a288 | |||
aba8974148 | |||
044a4753d2 | |||
ff0deee793 | |||
37357086e2 | |||
9321f8fdab | |||
167ea08c53 | |||
5c0338970c | |||
6b4dd3ff2f | |||
fead19560c | |||
86772d33bc | |||
a035116018 | |||
806fa907ab | |||
95f5d9d134 | |||
03139a08af | |||
acfbf26e37 | |||
461cdaa818 | |||
dd46813dc0 | |||
5d796781fb | |||
f5e7570f84 | |||
003087406c | |||
b7c8e0d25c | |||
30c111fd3d | |||
9d0714efdf | |||
d8f3058efa | |||
7c0fa7c276 | |||
6eb4f45fb9 | |||
b3132cac3a | |||
d95a3bd19a | |||
22e4f216c3 | |||
e9850152a7 | |||
5e0e35615c | |||
c4b879645a | |||
6afa6b647c | |||
acd465b365 | |||
e858570afb | |||
0643c2e708 | |||
bcf1339e89 | |||
dc463a2f72 | |||
a7cdf638e7 | |||
57810af2ac | |||
2eb726b744 | |||
912137ccfb | |||
035c913c72 | |||
3f43c2b816 | |||
0328f66340 | |||
b3eada9c7f | |||
8516b368ad | |||
d0fff5a0b5 | |||
4c8d4b4e20 | |||
5faa3df43f | |||
540901e219 | |||
db9258bcd7 | |||
24aaab6e3e | |||
17a482a9b1 | |||
5edd435fe9 | |||
de9239caab | |||
c89a2025ce | |||
42ae8c3037 | |||
319ececf26 | |||
886254c41e | |||
4e7099dc73 | |||
26948cb83a | |||
0f8698e655 | |||
b2b995edb3 | |||
33a4773fbd | |||
daa87e12dc | |||
5abf512276 | |||
0dd4a68913 | |||
8971127b66 | |||
1b66a217bf | |||
34dd46110b | |||
8f7211a50f | |||
2be4ee732a | |||
3bdedc9a2f | |||
f699954f4d | |||
407fc2cd45 | |||
91fe6dcae8 | |||
62dea9d364 | |||
e0bdc4bff1 | |||
007b4f3362 | |||
94b2b3f9ce | |||
c2de812cbd | |||
669ee4dfe3 | |||
e054cba610 | |||
3d8287265c | |||
de7afc2015 | |||
ae0499fd57 | |||
b33966c755 | |||
d2cd13bf2e | |||
06b2263329 | |||
d4bb839ce9 | |||
6013a1a56f | |||
34b38e07c7 | |||
1ec16ca94f | |||
b350a96643 | |||
bf93779b4f | |||
dd0f7019ef | |||
175e5b3062 | |||
7885155634 | |||
1909ffe0f9 | |||
3345255f16 | |||
c49adfd6da | |||
5094b84a46 | |||
191fc5dff4 | |||
cb9c90f2d0 | |||
09f9bd6b8b | |||
67abbef818 | |||
7ed2559e9e | |||
ac8e5f01db | |||
396d2a7b3b | |||
de725e0a4e | |||
2a32803e9e | |||
d602232b9f | |||
b0730f04f7 | |||
ef8ed28aec | |||
b8eff868e6 | |||
d0b619ea93 | |||
652d70fe2c | |||
8228aec74b | |||
2f2e0e9415 | |||
3a9803679f | |||
dc42d93b0f | |||
dff07ebfe8 | |||
4c456a95a3 | |||
83e5d9d150 | |||
7079aa99d7 | |||
208a22e324 | |||
9afae963e8 | |||
1828dec658 | |||
afe2434baf | |||
e08f8d5b51 | |||
7e3b40f379 | |||
584770dc6f | |||
5d2a440c69 | |||
ac14f29e6c | |||
3d62fa8af2 | |||
0f85a55cac | |||
21db92af47 | |||
6447520b5b | |||
079ccadbee | |||
615f675840 | |||
2182c83b87 | |||
b8d1dccb21 | |||
c3d5e9382d | |||
ecb72f9a9d | |||
7004c39af6 | |||
057956225c | |||
b27990f780 | |||
61c6f8ba59 | |||
d8d37ba7ad | |||
92d6bae25c | |||
6e17c3e6f9 | |||
8ee67b0229 | |||
07b9153ae4 | |||
abfcac4674 | |||
cde8cd50f8 | |||
cf4436e581 | |||
2b6bb78a09 | |||
ffa7f8d22d | |||
f73be9cf0f | |||
8002722f3b | |||
62e83133cd | |||
1d21027e2a | |||
5705247e5f | |||
dde9e9fc26 | |||
a6da4ad452 | |||
e2a29eef24 | |||
043ee651a9 | |||
84b7037b3e | |||
c5838a876b | |||
750cd0be92 | |||
758580bfb6 | |||
04872b6db8 | |||
58c7c919f2 | |||
cd8373ad32 | |||
3b3ab8c4e1 | |||
5b06b1564e | |||
77b4270d97 | |||
7c2ca773ff | |||
e2bb2cec7b | |||
ff4e837df5 | |||
fb904033d3 | |||
e6cd16aec4 | |||
ee74c3bb1c | |||
37faa7ce13 | |||
3d6c328a4f | |||
5577d18377 | |||
1d103a1528 | |||
7b19a4b6e7 | |||
ac1d29fac0 | |||
98037e5742 | |||
d0e3808dd0 | |||
3760a643cb | |||
fc9d8aa31e | |||
ccfbb5fd1d | |||
c9fbc5e40a | |||
67b6797b6d | |||
8d9504239b | |||
bf5d0c790c | |||
f4379f97ae | |||
3dc67c5663 | |||
47f90b02c3 | |||
27c924746b | |||
7abf875071 | |||
e3e375f5cd | |||
ff06292d74 | |||
c1278797f2 | |||
421ecec0dd | |||
89ed54362b | |||
986f77fa15 | |||
f831ed395d | |||
a880614a75 | |||
ef8379df1b | |||
702f8c2e2f | |||
6806393285 | |||
dea8387586 | |||
6ea2815341 | |||
3c145f1782 | |||
21b2c76524 | |||
4f6244eef4 | |||
973858b835 | |||
ee12155617 | |||
4b4c68df5f | |||
fcae33d574 | |||
896f50eeb9 | |||
9693fd2d74 | |||
37f1c87338 | |||
4977de38fc | |||
9f4750637b | |||
0c65e13aa3 | |||
af18994deb | |||
8f9599cd19 | |||
78660c6e07 | |||
4f786db82d | |||
ad7b749dec | |||
29ba744d64 | |||
a2e1021d7d | |||
d20c3c65c8 | |||
8f029e6096 | |||
91ed68b4a6 | |||
67fc2d9897 | |||
055304bf01 | |||
c2800ace32 | |||
ec7ffa20f2 | |||
ada1f2a894 | |||
184a7c4fbd | |||
84e9447f12 | |||
ca073fda46 | |||
0f529a3587 | |||
e16767af92 | |||
3166356484 | |||
abdd9d81db | |||
3bf47761c8 | |||
f39d8f548f | |||
90d750e4d9 | |||
ca24ed48f5 | |||
51937778dd | |||
be70f6ddd7 | |||
a27398e445 | |||
43b2e2e774 | |||
62f9b94ab1 | |||
b06bbd9d2a | |||
2df1bc7d4f | |||
599e927590 | |||
0429016ff1 | |||
bd42b9638a | |||
b1a826b03a | |||
5ed5f3687b | |||
943a902a0b | |||
a7873389c6 | |||
acfa174333 | |||
8418845c8d | |||
df4a4b9e1d | |||
7f5497db55 | |||
e4658e963f | |||
7764515f56 | |||
7046c38c84 | |||
9e9bb30a57 | |||
41d1be24cc | |||
7d3b475e24 | |||
f82a227da6 | |||
fcd8159617 | |||
f51ccb5c3f | |||
e0cd5b6405 | |||
6a71f31820 | |||
3428ab1e89 | |||
956e4a7cbb | |||
669bad27d4 | |||
2c3ae1c181 | |||
f570fe8c37 | |||
1b74ad0731 | |||
6717700d3b | |||
b810833145 | |||
9d58e566fd | |||
6632fa8da1 | |||
5790f3c8f7 | |||
4073b52c00 | |||
f5c7a6478e | |||
ebf58320ca | |||
09ddb0f824 | |||
f02a699c26 | |||
67d0931c19 | |||
19d079c33c | |||
40723a4cc7 | |||
8a9a26588c | |||
219475630a | |||
52e856fa6f | |||
cb2c029e57 | |||
ef7579394b | |||
fc4f175300 | |||
a6fc9311b4 | |||
14639f129e | |||
9182c2068d | |||
cb1b3be723 | |||
5ccd62a789 | |||
145d45c746 | |||
f235157466 | |||
ba5cdab619 | |||
eab5ae2f07 | |||
2f0b3c0e63 | |||
4e261068a1 | |||
1d24caf066 | |||
dc76c5165f | |||
de11b36a98 | |||
c4a4ed5272 | |||
a24edac5a9 | |||
9dbf44388d | |||
6b8e93e05e | |||
6b5239b9d5 | |||
214c06b771 | |||
e32a8552be | |||
9bcb409648 | |||
3b10afd2ab | |||
af3bb131c8 | |||
622e7dd287 | |||
68082e6fc1 | |||
36bcc7b355 | |||
c7c0b729c1 | |||
6aeefda3b6 | |||
4780174ee1 | |||
ab23625091 | |||
a88cf8fab7 | |||
2be528a3fa | |||
337864618c | |||
526cad54d7 | |||
506cf7f438 | |||
4b89878c10 | |||
06fad301cb | |||
7be0c2c650 | |||
43f0db45ad | |||
892c37db08 | |||
d8a1d1a120 | |||
64e52e97ee | |||
2a777a659a | |||
898f429826 | |||
88fbe3ac34 | |||
4ddc674846 | |||
fc4f5fd05f | |||
a002393716 | |||
a889f6560c | |||
4db17ecd93 | |||
2a57f2b365 | |||
803e07c188 | |||
ff44d93e68 | |||
d5d2209d09 | |||
c81e8fc93a | |||
347ac422f4 | |||
d7f5b56ca4 | |||
53d6f0d492 | |||
e4ce75e20c | |||
9094179856 | |||
3aab36fec2 | |||
744d61f6fd | |||
05498aa178 | |||
b1eb273d5b | |||
8a3f8510d6 | |||
22904a48a6 | |||
1730304f46 | |||
1038fc35df | |||
71f44aaee1 | |||
cc7ebfd11e | |||
54d4b308f4 | |||
5234c8124b | |||
e22d4bf31f | |||
21f7b90f03 | |||
769e8440f5 | |||
33de2b6cf3 | |||
3975b07371 | |||
abd64102aa | |||
d2174d1580 | |||
c72eccdd35 | |||
ab902128dc | |||
c70a491f59 | |||
322d13de0d | |||
97b7161d78 | |||
1360b6a396 | |||
16e51b83ab | |||
aa7cc5351c | |||
30da920135 | |||
bcdf5b7e52 | |||
c711fe592d | |||
9d5c1b3742 | |||
6b26cd0977 | |||
10ec0f21b0 | |||
ff66182dc6 | |||
d02ce2f1bb | |||
2664a2d0da | |||
1f7350658e | |||
41132b701b | |||
712005219c | |||
0bd17aff8a | |||
f3f44d7812 | |||
8385d5fa3a | |||
726f8be341 | |||
fee029b86e | |||
c3504ddf0a | |||
6a878ee444 | |||
c4ec2ba88f | |||
c907ca6e5d | |||
8993a093e9 | |||
d04669d0cc | |||
05fc136915 | |||
8d37939086 | |||
6d2ad4539f | |||
5ab53f42b2 | |||
f448e805e9 | |||
67aa8efd5a | |||
61a5273aea | |||
35a39b8d8f | |||
96b6571352 | |||
74e7dd053f | |||
1f8636d762 | |||
e4cfa701d8 | |||
b85181a6db | |||
6841b80466 | |||
298864bafe | |||
4d7f03836c | |||
c63eb80b95 | |||
0c0bf80074 | |||
144ff3b06e | |||
d6c50c3596 | |||
51b177ce47 | |||
824b7a25ca | |||
2223d40640 | |||
4df29fbac1 | |||
6dc36125c2 | |||
40085609e2 | |||
ebb6d80092 | |||
764ff2cd53 | |||
8ef226bcb8 | |||
63606c0985 | |||
1600d39693 | |||
04c59985a1 | |||
7e58347fbe | |||
0e794a28a1 | |||
6fb52c3638 | |||
b72ef09451 | |||
f7de027617 | |||
bc4c2dde33 | |||
95f05dad66 | |||
3bb0a7aa8e | |||
dcf7eeef28 | |||
3b923b6e4e | |||
8050f7404b | |||
959b1d9e4c | |||
daa279d57b | |||
ae9b7926a2 | |||
1f7a5e6943 | |||
9e354803de | |||
3ea5eb3f3a | |||
ec43bf4fe9 | |||
2097ffaabf | |||
67e78f0751 | |||
1791dccbf2 | |||
40d1cfe7af | |||
4627f851ca | |||
fc9e609ab5 | |||
8b3d861a9d | |||
9ef864b27c | |||
275b80a462 | |||
763be4f266 | |||
5b812522fa | |||
9cb0ddb5e7 | |||
735bea1f47 | |||
0853b04589 | |||
c1b3705df1 | |||
2540b4e01b | |||
2641697e0b | |||
2996503b27 | |||
0214c9bcad | |||
a471aed6db | |||
af0edecddb | |||
300323cfd7 | |||
d8724e0a0b | |||
0001dabfd1 | |||
ad78001241 | |||
5a837a591e | |||
fd79d23910 | |||
1902c0ec93 | |||
85499be855 | |||
e6ddfc7afb | |||
58298ec5ba | |||
0814fc185f | |||
8f8c82d400 | |||
372b7d3d9d | |||
fbffadb2cf | |||
6e52f242b2 | |||
d2a67f362f | |||
66b12da4e7 |
@ -1,5 +1,12 @@
|
|||||||
# http://clang.llvm.org/docs/ClangFormatStyleOptions.html
|
# http://clang.llvm.org/docs/ClangFormatStyleOptions.html
|
||||||
|
|
||||||
BasedOnStyle: Google
|
BasedOnStyle: Google
|
||||||
Standard: Cpp03
|
Standard: c++11
|
||||||
AllowShortFunctionsOnASingleLine: Empty
|
AllowShortFunctionsOnASingleLine: Empty
|
||||||
|
IncludeBlocks: Preserve
|
||||||
|
IndentPPDirectives: AfterHash
|
||||||
|
DerivePointerAlignment: false
|
||||||
|
|
||||||
|
# Always break after if to get accurate coverage
|
||||||
|
AllowShortIfStatementsOnASingleLine: false
|
||||||
|
AllowShortLoopsOnASingleLine: false
|
||||||
|
18
.devcontainer/clang10/devcontainer.json
Normal file
18
.devcontainer/clang10/devcontainer.json
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"name": "Clang 10",
|
||||||
|
"image": "conanio/clang10",
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-clang10"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
18
.devcontainer/clang11/devcontainer.json
Normal file
18
.devcontainer/clang11/devcontainer.json
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"name": "Clang 11",
|
||||||
|
"image": "conanio/clang11",
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-clang11"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
5
.devcontainer/clang13/Dockerfile
Normal file
5
.devcontainer/clang13/Dockerfile
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
FROM ubuntu:22.04
|
||||||
|
|
||||||
|
RUN apt-get update
|
||||||
|
RUN apt-get install -y cmake git clang-13 libc++-13-dev libc++abi-13-dev
|
||||||
|
ENV CC=clang-13 CXX=clang++-13
|
20
.devcontainer/clang13/devcontainer.json
Normal file
20
.devcontainer/clang13/devcontainer.json
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"name": "Clang 13",
|
||||||
|
"build": {
|
||||||
|
"dockerfile": "Dockerfile"
|
||||||
|
},
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-clang13"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
5
.devcontainer/clang14/Dockerfile
Normal file
5
.devcontainer/clang14/Dockerfile
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
FROM ubuntu:22.04
|
||||||
|
|
||||||
|
RUN apt-get update
|
||||||
|
RUN apt-get install -y cmake git clang-14 libc++-14-dev libc++abi-14-dev
|
||||||
|
ENV CC=clang-14 CXX=clang++-14
|
20
.devcontainer/clang14/devcontainer.json
Normal file
20
.devcontainer/clang14/devcontainer.json
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"name": "Clang 14",
|
||||||
|
"build": {
|
||||||
|
"dockerfile": "Dockerfile"
|
||||||
|
},
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-clang14"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
5
.devcontainer/clang15/Dockerfile
Normal file
5
.devcontainer/clang15/Dockerfile
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
FROM ubuntu:22.04
|
||||||
|
|
||||||
|
RUN apt-get update
|
||||||
|
RUN apt-get install -y cmake git clang-15 libc++-15-dev libc++abi-15-dev
|
||||||
|
ENV CC=clang-15 CXX=clang++-15
|
20
.devcontainer/clang15/devcontainer.json
Normal file
20
.devcontainer/clang15/devcontainer.json
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"name": "Clang 15",
|
||||||
|
"build": {
|
||||||
|
"dockerfile": "Dockerfile"
|
||||||
|
},
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-clang15"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
5
.devcontainer/clang16/Dockerfile
Normal file
5
.devcontainer/clang16/Dockerfile
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
FROM ubuntu:22.04
|
||||||
|
|
||||||
|
RUN apt-get update
|
||||||
|
RUN apt-get install -y cmake git clang-16 libc++-16-dev libc++abi-16-dev
|
||||||
|
ENV CC=clang-16 CXX=clang++-16
|
20
.devcontainer/clang16/devcontainer.json
Normal file
20
.devcontainer/clang16/devcontainer.json
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"name": "Clang 16",
|
||||||
|
"build": {
|
||||||
|
"dockerfile": "Dockerfile"
|
||||||
|
},
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-clang16"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
5
.devcontainer/clang17/Dockerfile
Normal file
5
.devcontainer/clang17/Dockerfile
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
FROM ubuntu:24.04
|
||||||
|
|
||||||
|
RUN apt-get update
|
||||||
|
RUN apt-get install -y cmake git clang-17 libc++-17-dev libc++abi-17-dev
|
||||||
|
ENV CC=clang-17 CXX=clang++-17
|
20
.devcontainer/clang17/devcontainer.json
Normal file
20
.devcontainer/clang17/devcontainer.json
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"name": "Clang 17",
|
||||||
|
"build": {
|
||||||
|
"dockerfile": "Dockerfile"
|
||||||
|
},
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-clang17"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
18
.devcontainer/clang5/devcontainer.json
Normal file
18
.devcontainer/clang5/devcontainer.json
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"name": "Clang 5",
|
||||||
|
"image": "conanio/clang50",
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-clang5"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
18
.devcontainer/clang6/devcontainer.json
Normal file
18
.devcontainer/clang6/devcontainer.json
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"name": "Clang 6",
|
||||||
|
"image": "conanio/clang60",
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-clang6"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
18
.devcontainer/clang7/devcontainer.json
Normal file
18
.devcontainer/clang7/devcontainer.json
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"name": "Clang 7",
|
||||||
|
"image": "conanio/clang7",
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-clang7"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
18
.devcontainer/clang8/devcontainer.json
Normal file
18
.devcontainer/clang8/devcontainer.json
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"name": "Clang 8",
|
||||||
|
"image": "conanio/clang8",
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-clang8"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
18
.devcontainer/clang9/devcontainer.json
Normal file
18
.devcontainer/clang9/devcontainer.json
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"name": "Clang 9",
|
||||||
|
"image": "conanio/clang9",
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-clang9"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
18
.devcontainer/gcc10/devcontainer.json
Normal file
18
.devcontainer/gcc10/devcontainer.json
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"name": "GCC 10",
|
||||||
|
"image": "conanio/gcc10",
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-gcc10"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
18
.devcontainer/gcc11/devcontainer.json
Normal file
18
.devcontainer/gcc11/devcontainer.json
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"name": "GCC 11",
|
||||||
|
"image": "conanio/gcc11",
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-gcc11"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
4
.devcontainer/gcc12/Dockerfile
Normal file
4
.devcontainer/gcc12/Dockerfile
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
FROM ubuntu:22.04
|
||||||
|
|
||||||
|
RUN apt-get update
|
||||||
|
RUN apt-get install -y cmake git g++-12
|
20
.devcontainer/gcc12/devcontainer.json
Normal file
20
.devcontainer/gcc12/devcontainer.json
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"name": "GCC 12",
|
||||||
|
"build": {
|
||||||
|
"dockerfile": "Dockerfile",
|
||||||
|
},
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-gcc12"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
20
.devcontainer/gcc48/devcontainer.json
Normal file
20
.devcontainer/gcc48/devcontainer.json
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"name": "GCC 4.8",
|
||||||
|
"image": "conanio/gcc48",
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-gcc48"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools",
|
||||||
|
"josetr.cmake-language-support-vscode",
|
||||||
|
"ms-vscode.cpptools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
18
.devcontainer/gcc5/devcontainer.json
Normal file
18
.devcontainer/gcc5/devcontainer.json
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"name": "GCC 5",
|
||||||
|
"image": "conanio/gcc5",
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-gcc5"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
18
.devcontainer/gcc6/devcontainer.json
Normal file
18
.devcontainer/gcc6/devcontainer.json
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"name": "GCC 6",
|
||||||
|
"image": "conanio/gcc6",
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-gcc6"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
18
.devcontainer/gcc7/devcontainer.json
Normal file
18
.devcontainer/gcc7/devcontainer.json
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"name": "GCC 7",
|
||||||
|
"image": "conanio/gcc7",
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-gcc7"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
18
.devcontainer/gcc8/devcontainer.json
Normal file
18
.devcontainer/gcc8/devcontainer.json
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"name": "GCC 8",
|
||||||
|
"image": "conanio/gcc8",
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-gcc8"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
18
.devcontainer/gcc9/devcontainer.json
Normal file
18
.devcontainer/gcc9/devcontainer.json
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"name": "GCC 9",
|
||||||
|
"image": "conanio/gcc9",
|
||||||
|
"runArgs": [
|
||||||
|
"--name=ArduinoJson-gcc9"
|
||||||
|
],
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cmake-tools"
|
||||||
|
],
|
||||||
|
"settings": {
|
||||||
|
"cmake.generator": "Unix Makefiles",
|
||||||
|
"cmake.buildDirectory": "/tmp/build"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -1 +1,2 @@
|
|||||||
|
* text=auto
|
||||||
*.sh text eol=lf
|
*.sh text eol=lf
|
5
.github/FUNDING.yml
vendored
5
.github/FUNDING.yml
vendored
@ -1 +1,4 @@
|
|||||||
custom: https://arduinojson.org/book/
|
github: bblanchon
|
||||||
|
custom:
|
||||||
|
- https://arduinojson.org/book/
|
||||||
|
- https://donate.benoitblanchon.fr/
|
||||||
|
14
.github/ISSUE_TEMPLATE.md
vendored
14
.github/ISSUE_TEMPLATE.md
vendored
@ -1,14 +0,0 @@
|
|||||||
<!--
|
|
||||||
Before opening an issue, please read the FAQ:
|
|
||||||
https://arduinojson.org/faq/
|
|
||||||
|
|
||||||
Please provide all the relevant information:
|
|
||||||
* good title
|
|
||||||
* short description of the problem
|
|
||||||
* target platform
|
|
||||||
* compiler model and version
|
|
||||||
* MVCE (https://stackoverflow.com/help/mcve)
|
|
||||||
* compiler output
|
|
||||||
|
|
||||||
Good questions get fast answers!
|
|
||||||
-->
|
|
54
.github/ISSUE_TEMPLATE/bug_report.md
vendored
Normal file
54
.github/ISSUE_TEMPLATE/bug_report.md
vendored
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
---
|
||||||
|
name: 🐛 Bug report
|
||||||
|
about: Report a bug in ArduinoJson
|
||||||
|
title: ''
|
||||||
|
labels: 'bug'
|
||||||
|
assignees: ''
|
||||||
|
---
|
||||||
|
|
||||||
|
<!-- ⚠️ IMPORTANT ⚠️
|
||||||
|
Before opening a bug report, please use the ArduinoJson Troubleshooter as it may find a solution to your issue; if not, please include the Troubleshooter's report in the description.
|
||||||
|
-->
|
||||||
|
|
||||||
|
**Describe the bug**
|
||||||
|
A clear and concise description of what the bug is.
|
||||||
|
|
||||||
|
**Troubleshooter report**
|
||||||
|
Here is the report generated by the [ArduinoJson Troubleshooter](https://arduinojson.org/v7/troubleshooter/):
|
||||||
|
[Paste the report here]
|
||||||
|
|
||||||
|
**Environment**
|
||||||
|
Here is the environment that I used:
|
||||||
|
* Microcontroller: [e.g. ESP8266]
|
||||||
|
* Core/runtime: [e.g. ESP8266 core for Arduino v3.0.2]
|
||||||
|
* IDE: [e.g. Arduino IDE 1.8.16]
|
||||||
|
|
||||||
|
**Reproduction**
|
||||||
|
Here is a small snippet that reproduces the issue.
|
||||||
|
|
||||||
|
```c++
|
||||||
|
JsonDocument doc;
|
||||||
|
|
||||||
|
DeserializationError error = deserializeJson(doc, "{\"hello\":\"world\"}");
|
||||||
|
|
||||||
|
[insert repro code here]
|
||||||
|
```
|
||||||
|
|
||||||
|
**Compiler output**
|
||||||
|
If relevant, include the complete compiler output (i.e. not just the line that contains the error.)
|
||||||
|
|
||||||
|
|
||||||
|
**Program output**
|
||||||
|
If relevant, include the repro program output.
|
||||||
|
|
||||||
|
Expected output:
|
||||||
|
|
||||||
|
```
|
||||||
|
[insert expected output here]
|
||||||
|
```
|
||||||
|
|
||||||
|
Actual output:
|
||||||
|
|
||||||
|
```
|
||||||
|
[insert actual output here]
|
||||||
|
```
|
8
.github/ISSUE_TEMPLATE/config.yml
vendored
Normal file
8
.github/ISSUE_TEMPLATE/config.yml
vendored
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
blank_issues_enabled: true
|
||||||
|
contact_links:
|
||||||
|
- name: 👨🏫 ArduinoJson Assistant
|
||||||
|
url: https://arduinojson.org/v7/assistant/
|
||||||
|
about: An online tool that computes memory requirements and generates scaffolding code for your project.
|
||||||
|
- name: 👨⚕️ ArduinoJson Troubleshooter
|
||||||
|
url: https://arduinojson.org/v7/troubleshooter/
|
||||||
|
about: An online tool that helps you diagnose the most common issues with ArduinoJson.
|
19
.github/ISSUE_TEMPLATE/feature_request.md
vendored
Normal file
19
.github/ISSUE_TEMPLATE/feature_request.md
vendored
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
---
|
||||||
|
name: 💡 Feature request
|
||||||
|
about: Suggest an idea for ArduinoJson
|
||||||
|
title: ''
|
||||||
|
labels: enhancement
|
||||||
|
assignees: ''
|
||||||
|
---
|
||||||
|
|
||||||
|
**Is your feature request related to a problem? Please describe.**
|
||||||
|
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
|
||||||
|
|
||||||
|
**Describe the solution you'd like**
|
||||||
|
A clear and concise description of what you want to happen.
|
||||||
|
|
||||||
|
**Describe alternatives you've considered**
|
||||||
|
A clear and concise description of any alternative solutions or features you've considered.
|
||||||
|
|
||||||
|
**Additional context**
|
||||||
|
Add any other context or screenshots about the feature request here.
|
51
.github/ISSUE_TEMPLATE/help.md
vendored
Normal file
51
.github/ISSUE_TEMPLATE/help.md
vendored
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
---
|
||||||
|
name: 😭 Help!
|
||||||
|
about: Ask for help
|
||||||
|
title: ''
|
||||||
|
labels: 'question'
|
||||||
|
assignees: ''
|
||||||
|
---
|
||||||
|
|
||||||
|
<!-- ⚠️ IMPORTANT ⚠️
|
||||||
|
Before asking for help, please use the ArduinoJson Troubleshooter as it may find a solution to your issue; if not, please include the Troubleshooter's report in the description.
|
||||||
|
-->
|
||||||
|
|
||||||
|
**Describe the issue**
|
||||||
|
A clear and concise description of what you're trying to do.
|
||||||
|
You don't need to explain every aspect of your project: focus on the problem you're having.
|
||||||
|
|
||||||
|
**Troubleshooter report**
|
||||||
|
Here is the report generated by the [ArduinoJson Troubleshooter](https://arduinojson.org/v7/troubleshooter/):
|
||||||
|
[Paste the report here]
|
||||||
|
|
||||||
|
**Environment**
|
||||||
|
Here is the environment that I'm using':
|
||||||
|
* Microconroller: [e.g. ESP8266]
|
||||||
|
* Core/runtime: [e.g. ESP8266 core for Arduino v3.0.2]
|
||||||
|
* IDE: [e.g. Arduino IDE 1.8.16]
|
||||||
|
|
||||||
|
**Reproduction**
|
||||||
|
Here is a small snippet that demonstrate the problem.
|
||||||
|
|
||||||
|
```c++
|
||||||
|
JsonDocument doc;
|
||||||
|
|
||||||
|
DeserializationError error = deserializeJson(doc, "{\"hello\":\"world\"}");
|
||||||
|
|
||||||
|
// insert code here
|
||||||
|
```
|
||||||
|
|
||||||
|
**Program output**
|
||||||
|
If relevant, include the program output.
|
||||||
|
|
||||||
|
Expected output:
|
||||||
|
|
||||||
|
```
|
||||||
|
[insert expected output here]
|
||||||
|
```
|
||||||
|
|
||||||
|
Actual output:
|
||||||
|
|
||||||
|
```
|
||||||
|
[insert actual output here]
|
||||||
|
```
|
7
.github/lock.yml
vendored
7
.github/lock.yml
vendored
@ -1,7 +0,0 @@
|
|||||||
# Configuration for Lock Threads - https://github.com/dessant/lock-threads
|
|
||||||
|
|
||||||
# Number of days of inactivity before a closed issue or pull request is locked
|
|
||||||
daysUntilLock: 30
|
|
||||||
|
|
||||||
# Comment to post before locking. Set to `false` to disable
|
|
||||||
lockComment: false
|
|
601
.github/workflows/ci.yml
vendored
Normal file
601
.github/workflows/ci.yml
vendored
Normal file
@ -0,0 +1,601 @@
|
|||||||
|
name: Continuous Integration
|
||||||
|
|
||||||
|
on: [push, pull_request]
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: ${{ github.workflow }}-${{ github.ref }}
|
||||||
|
cancel-in-progress: true
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
lint:
|
||||||
|
name: Lint
|
||||||
|
runs-on: ubuntu-22.04
|
||||||
|
steps:
|
||||||
|
- name: Install
|
||||||
|
run: sudo apt-get install -y clang-format
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Symlinks
|
||||||
|
run: find * -type l -printf "::error::%p is a symlink. This is forbidden by the Arduino Library Specification." -exec false {} +
|
||||||
|
- name: Clang-format
|
||||||
|
run: |
|
||||||
|
find src/ extras/ -name '*.[ch]pp' | xargs clang-format -i --verbose --style=file
|
||||||
|
git diff --exit-code
|
||||||
|
- name: Check URLs
|
||||||
|
run: |
|
||||||
|
grep -hREo "(http|https)://[a-zA-Z0-9./?=_%:-]*" src/ | sort -u | while read -r URL
|
||||||
|
do
|
||||||
|
STATUS=$(curl -s -o /dev/null -I -w "%{http_code}" "$URL")
|
||||||
|
[ "$STATUS" -ge 400 ] && echo "::warning title=HTTP $STATUS::$URL returned $STATUS"
|
||||||
|
done || true
|
||||||
|
|
||||||
|
gcc:
|
||||||
|
name: GCC
|
||||||
|
needs: lint
|
||||||
|
runs-on: ubuntu-22.04
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- gcc: "4.8"
|
||||||
|
- gcc: "5"
|
||||||
|
- gcc: "6"
|
||||||
|
- gcc: "7"
|
||||||
|
cxxflags: -fsanitize=leak -fno-sanitize-recover=all
|
||||||
|
- gcc: "8"
|
||||||
|
cxxflags: -fsanitize=undefined -fno-sanitize-recover=all
|
||||||
|
- gcc: "9"
|
||||||
|
cxxflags: -fsanitize=address -fno-sanitize-recover=all
|
||||||
|
- gcc: "10"
|
||||||
|
cxxflags: -funsigned-char # Issue #1715
|
||||||
|
- gcc: "11"
|
||||||
|
- gcc: "12"
|
||||||
|
steps:
|
||||||
|
- name: Workaround for actions/runner-images#9491
|
||||||
|
run: sudo sysctl vm.mmap_rnd_bits=28
|
||||||
|
|
||||||
|
- name: Install
|
||||||
|
run: |
|
||||||
|
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5 3B4FE6ACC0B21F32
|
||||||
|
sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ xenial main universe'
|
||||||
|
sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ bionic main universe'
|
||||||
|
sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ focal main universe'
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y gcc-${{ matrix.gcc }} g++-${{ matrix.gcc }}
|
||||||
|
timeout-minutes: 5
|
||||||
|
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
timeout-minutes: 1
|
||||||
|
|
||||||
|
- name: Configure
|
||||||
|
run: cmake -DCMAKE_BUILD_TYPE=Debug .
|
||||||
|
env:
|
||||||
|
CC: gcc-${{ matrix.gcc }}
|
||||||
|
CXX: g++-${{ matrix.gcc }}
|
||||||
|
CXXFLAGS: ${{ matrix.cxxflags }}
|
||||||
|
timeout-minutes: 1
|
||||||
|
|
||||||
|
- name: Build
|
||||||
|
run: cmake --build .
|
||||||
|
timeout-minutes: 10
|
||||||
|
|
||||||
|
- name: Test
|
||||||
|
run: ctest --output-on-failure -C Debug .
|
||||||
|
env:
|
||||||
|
UBSAN_OPTIONS: print_stacktrace=1
|
||||||
|
timeout-minutes: 2
|
||||||
|
|
||||||
|
clang:
|
||||||
|
name: Clang
|
||||||
|
needs: lint
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- clang: "7"
|
||||||
|
runner: ubuntu-22.04
|
||||||
|
archive: focal
|
||||||
|
- clang: "8"
|
||||||
|
cxxflags: -fsanitize=leak -fno-sanitize-recover=all
|
||||||
|
runner: ubuntu-22.04
|
||||||
|
archive: focal
|
||||||
|
- clang: "9"
|
||||||
|
cxxflags: -fsanitize=undefined -fno-sanitize-recover=all
|
||||||
|
runner: ubuntu-22.04
|
||||||
|
archive: focal
|
||||||
|
- clang: "10"
|
||||||
|
cxxflags: -fsanitize=address -fno-sanitize-recover=all
|
||||||
|
runner: ubuntu-22.04
|
||||||
|
archive: focal
|
||||||
|
- clang: "11"
|
||||||
|
runner: ubuntu-22.04
|
||||||
|
- clang: "12"
|
||||||
|
runner: ubuntu-22.04
|
||||||
|
- clang: "13"
|
||||||
|
runner: ubuntu-22.04
|
||||||
|
- clang: 14
|
||||||
|
- clang: 15
|
||||||
|
- clang: 16
|
||||||
|
- clang: 17
|
||||||
|
- clang: 18
|
||||||
|
- clang: 19
|
||||||
|
runs-on: ${{ matrix.runner || 'ubuntu-latest' }}
|
||||||
|
steps:
|
||||||
|
- name: Add archive repositories
|
||||||
|
if: matrix.archive
|
||||||
|
run: |
|
||||||
|
sudo gpg --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
|
||||||
|
sudo gpg --export 3B4FE6ACC0B21F32 | sudo tee /etc/apt/trusted.gpg.d/ubuntu-keyring.gpg > /dev/null
|
||||||
|
sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ ${{ matrix.archive }} main'
|
||||||
|
sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ ${{ matrix.archive }} universe'
|
||||||
|
- name: Install Clang ${{ matrix.clang }}
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y clang-${{ matrix.clang }}
|
||||||
|
- name: Install libc++ ${{ matrix.clang }}
|
||||||
|
run: sudo apt-get install -y libc++-${{ matrix.clang }}-dev libc++abi-${{ matrix.clang }}-dev
|
||||||
|
- name: Install libunwind ${{ matrix.clang }}
|
||||||
|
if: matrix.clang == 12 # dependency is missing in Ubuntu 22.04
|
||||||
|
run: sudo apt-get install -y libunwind-${{ matrix.clang }}-dev
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Configure
|
||||||
|
run: cmake -DCMAKE_BUILD_TYPE=Debug .
|
||||||
|
env:
|
||||||
|
CC: clang-${{ matrix.clang }}
|
||||||
|
CXX: clang++-${{ matrix.clang }}
|
||||||
|
CXXFLAGS: >-
|
||||||
|
${{ matrix.cxxflags }}
|
||||||
|
${{ matrix.clang < 11 && '-I/usr/lib/llvm-10/include/c++/v1/' || '' }}
|
||||||
|
- name: Build
|
||||||
|
run: cmake --build .
|
||||||
|
- name: Test
|
||||||
|
run: ctest --output-on-failure -C Debug .
|
||||||
|
env:
|
||||||
|
UBSAN_OPTIONS: print_stacktrace=1
|
||||||
|
|
||||||
|
conf_test:
|
||||||
|
name: Test configuration on Linux
|
||||||
|
needs: [gcc, clang]
|
||||||
|
runs-on: ubuntu-22.04
|
||||||
|
steps:
|
||||||
|
- name: Install
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y g++-multilib gcc-avr avr-libc
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: AVR
|
||||||
|
run: avr-g++ -std=c++11 -Isrc extras/conf_test/avr.cpp
|
||||||
|
- name: GCC 32-bit
|
||||||
|
run: g++ -std=c++11 -m32 -Isrc extras/conf_test/x86.cpp
|
||||||
|
- name: GCC 64-bit
|
||||||
|
run: g++ -std=c++11 -m64 -Isrc extras/conf_test/x64.cpp
|
||||||
|
- name: Clang 32-bit
|
||||||
|
run: clang++ -std=c++11 -m32 -Isrc extras/conf_test/x86.cpp
|
||||||
|
- name: Clang 64-bit
|
||||||
|
run: clang++ -std=c++11 -m64 -Isrc extras/conf_test/x64.cpp
|
||||||
|
|
||||||
|
conf_test_windows:
|
||||||
|
name: Test configuration on Windows
|
||||||
|
runs-on: windows-2019
|
||||||
|
needs: [gcc, clang]
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: 32-bit
|
||||||
|
run: |
|
||||||
|
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
|
||||||
|
cl /Isrc extras/conf_test/x86.cpp
|
||||||
|
shell: cmd
|
||||||
|
- name: 64-bit
|
||||||
|
run: |
|
||||||
|
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
|
||||||
|
cl /Isrc extras/conf_test/x64.cpp
|
||||||
|
shell: cmd
|
||||||
|
|
||||||
|
xcode:
|
||||||
|
name: XCode
|
||||||
|
needs: clang
|
||||||
|
runs-on: macos-13
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- xcode: "14.1"
|
||||||
|
- xcode: "14.2"
|
||||||
|
- xcode: "14.3.1"
|
||||||
|
- xcode: "15.0.1"
|
||||||
|
- xcode: "15.1"
|
||||||
|
- xcode: "15.2"
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Select XCode version
|
||||||
|
run: sudo xcode-select --switch /Applications/Xcode_${{ matrix.xcode }}.app
|
||||||
|
- name: Configure
|
||||||
|
run: cmake -DCMAKE_BUILD_TYPE=Debug .
|
||||||
|
- name: Build
|
||||||
|
run: cmake --build .
|
||||||
|
- name: Test
|
||||||
|
run: ctest --output-on-failure -C Debug .
|
||||||
|
|
||||||
|
# DISABLED: Running on AppVeyor instead because it supports older versions of the compiler
|
||||||
|
# msvc:
|
||||||
|
# name: Visual Studio
|
||||||
|
# strategy:
|
||||||
|
# fail-fast: false
|
||||||
|
# matrix:
|
||||||
|
# include:
|
||||||
|
# - os: windows-2016
|
||||||
|
# - os: windows-2019
|
||||||
|
# runs-on: ${{ matrix.os }}
|
||||||
|
# steps:
|
||||||
|
# - name: Checkout
|
||||||
|
# uses: actions/checkout@v4
|
||||||
|
# - name: Configure
|
||||||
|
# run: cmake -DCMAKE_BUILD_TYPE=Debug .
|
||||||
|
# - name: Build
|
||||||
|
# run: cmake --build .
|
||||||
|
# - name: Test
|
||||||
|
# run: ctest --output-on-failure -C Debug .
|
||||||
|
|
||||||
|
arduino:
|
||||||
|
name: Arduino
|
||||||
|
needs: gcc
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- core: arduino:avr
|
||||||
|
board: arduino:avr:uno
|
||||||
|
- core: arduino:samd
|
||||||
|
board: arduino:samd:mkr1000
|
||||||
|
runs-on: ubuntu-22.04
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Install arduino-cli
|
||||||
|
run: curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR=/usr/local/bin sh
|
||||||
|
- name: Install core
|
||||||
|
run: arduino-cli core install ${{ matrix.core }}
|
||||||
|
- name: Install libraries
|
||||||
|
run: arduino-cli lib install SD Ethernet
|
||||||
|
- name: Build JsonConfigFile
|
||||||
|
run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/JsonConfigFile/JsonConfigFile.ino"
|
||||||
|
- name: Build JsonFilterExample
|
||||||
|
run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/JsonFilterExample/JsonFilterExample.ino"
|
||||||
|
- name: Build JsonGeneratorExample
|
||||||
|
run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/JsonGeneratorExample/JsonGeneratorExample.ino"
|
||||||
|
- name: Build JsonHttpClient
|
||||||
|
run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/JsonHttpClient/JsonHttpClient.ino"
|
||||||
|
- name: Build JsonParserExample
|
||||||
|
run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/JsonParserExample/JsonParserExample.ino"
|
||||||
|
- name: Build JsonServer
|
||||||
|
run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/JsonServer/JsonServer.ino"
|
||||||
|
- name: Build JsonUdpBeacon
|
||||||
|
run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/JsonUdpBeacon/JsonUdpBeacon.ino"
|
||||||
|
- name: Build MsgPackParser
|
||||||
|
run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/MsgPackParser/MsgPackParser.ino"
|
||||||
|
- name: Build ProgmemExample
|
||||||
|
run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/ProgmemExample/ProgmemExample.ino"
|
||||||
|
- name: Build StringExample
|
||||||
|
run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/StringExample/StringExample.ino"
|
||||||
|
|
||||||
|
platformio:
|
||||||
|
name: PlatformIO
|
||||||
|
needs: gcc
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- platform: atmelavr
|
||||||
|
board: leonardo
|
||||||
|
libraries:
|
||||||
|
- SD
|
||||||
|
- Ethernet
|
||||||
|
conf_test: avr
|
||||||
|
- platform: espressif8266
|
||||||
|
board: huzzah
|
||||||
|
conf_test: esp8266
|
||||||
|
- platform: espressif32
|
||||||
|
board: esp32dev
|
||||||
|
libraries:
|
||||||
|
- Ethernet
|
||||||
|
conf_test: esp8266
|
||||||
|
- platform: atmelsam
|
||||||
|
board: mkr1000USB
|
||||||
|
libraries:
|
||||||
|
- SD
|
||||||
|
- Ethernet
|
||||||
|
conf_test: esp8266
|
||||||
|
- platform: teensy
|
||||||
|
board: teensy31
|
||||||
|
conf_test: esp8266
|
||||||
|
- platform: ststm32
|
||||||
|
board: adafruit_feather_f405
|
||||||
|
libraries:
|
||||||
|
- SD
|
||||||
|
- Ethernet
|
||||||
|
conf_test: esp8266
|
||||||
|
- platform: nordicnrf52
|
||||||
|
board: adafruit_feather_nrf52840
|
||||||
|
libraries:
|
||||||
|
- SD
|
||||||
|
- Ethernet
|
||||||
|
conf_test: esp8266
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Set up cache for pip
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cache/pip
|
||||||
|
key: ${{ runner.os }}-pip
|
||||||
|
- name: Set up Python 3.x
|
||||||
|
uses: actions/setup-python@v5
|
||||||
|
with:
|
||||||
|
python-version: "3.x"
|
||||||
|
- name: Install PlatformIO
|
||||||
|
run: pip install platformio
|
||||||
|
- name: Install adafruit-nrfutil
|
||||||
|
if: ${{ matrix.platform == 'nordicnrf52' }}
|
||||||
|
run: pip install adafruit-nrfutil
|
||||||
|
- name: Include Adafruit_TinyUSB.h # https://github.com/adafruit/Adafruit_nRF52_Arduino/issues/653
|
||||||
|
if: ${{ matrix.platform == 'nordicnrf52' }}
|
||||||
|
run: find examples/ -name '*.ino' -exec sed -i 's/\(#include <ArduinoJson.h>\)/\1\n#include <Adafruit_TinyUSB.h>/' {} +
|
||||||
|
- name: Set up cache for platformio
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.platformio
|
||||||
|
key: ${{ runner.os }}-platformio-${{ matrix.platform }}
|
||||||
|
- name: Install platform "${{ matrix.platform }}"
|
||||||
|
run: platformio platform install ${{ matrix.platform }}
|
||||||
|
- name: Install libraries
|
||||||
|
if: ${{ matrix.libraries }}
|
||||||
|
run: platformio lib install arduino-libraries/${{ join(matrix.libraries, ' arduino-libraries/') }}
|
||||||
|
- name: Test configuration
|
||||||
|
run: platformio ci "extras/conf_test/${{ matrix.conf_test }}.cpp" -l '.' -b ${{ matrix.board }}
|
||||||
|
if: ${{ matrix.conf_test }}
|
||||||
|
- name: Build JsonConfigFile
|
||||||
|
run: platformio ci "examples/JsonConfigFile/JsonConfigFile.ino" -l '.' -b ${{ matrix.board }}
|
||||||
|
- name: Build JsonFilterExample
|
||||||
|
run: platformio ci "examples/JsonFilterExample/JsonFilterExample.ino" -l '.' -b ${{ matrix.board }}
|
||||||
|
- name: Build JsonGeneratorExample
|
||||||
|
run: platformio ci "examples/JsonGeneratorExample/JsonGeneratorExample.ino" -l '.' -b ${{ matrix.board }}
|
||||||
|
- name: Build JsonHttpClient
|
||||||
|
run: platformio ci "examples/JsonHttpClient/JsonHttpClient.ino" -l '.' -b ${{ matrix.board }}
|
||||||
|
- name: Build JsonParserExample
|
||||||
|
run: platformio ci "examples/JsonParserExample/JsonParserExample.ino" -l '.' -b ${{ matrix.board }}
|
||||||
|
- name: Build JsonServer
|
||||||
|
if: ${{ matrix.platform != 'espressif32' }}
|
||||||
|
run: platformio ci "examples/JsonServer/JsonServer.ino" -l '.' -b ${{ matrix.board }}
|
||||||
|
- name: Build JsonUdpBeacon
|
||||||
|
run: platformio ci "examples/JsonUdpBeacon/JsonUdpBeacon.ino" -l '.' -b ${{ matrix.board }}
|
||||||
|
- name: Build MsgPackParser
|
||||||
|
run: platformio ci "examples/MsgPackParser/MsgPackParser.ino" -l '.' -b ${{ matrix.board }}
|
||||||
|
- name: Build ProgmemExample
|
||||||
|
run: platformio ci "examples/ProgmemExample/ProgmemExample.ino" -l '.' -b ${{ matrix.board }}
|
||||||
|
- name: Build StringExample
|
||||||
|
run: platformio ci "examples/StringExample/StringExample.ino" -l '.' -b ${{ matrix.board }}
|
||||||
|
- name: PlatformIO prune
|
||||||
|
if: ${{ always() }}
|
||||||
|
run: platformio system prune -f
|
||||||
|
|
||||||
|
particle:
|
||||||
|
name: Particle
|
||||||
|
needs: gcc
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: github.event_name == 'push'
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- board: argon
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Install Particle CLI
|
||||||
|
run: sudo npm install -g particle-cli
|
||||||
|
- name: Login to Particle
|
||||||
|
run: particle login -t "${{ secrets.PARTICLE_TOKEN }}"
|
||||||
|
- name: Compile
|
||||||
|
run: extras/ci/particle.sh ${{ matrix.board }}
|
||||||
|
|
||||||
|
arm:
|
||||||
|
name: GCC for ARM processor
|
||||||
|
needs: gcc
|
||||||
|
runs-on: ubuntu-22.04
|
||||||
|
steps:
|
||||||
|
- name: Install
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y g++-arm-linux-gnueabihf
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Configure
|
||||||
|
run: cmake .
|
||||||
|
env:
|
||||||
|
CC: arm-linux-gnueabihf-gcc
|
||||||
|
CXX: arm-linux-gnueabihf-g++
|
||||||
|
- name: Build
|
||||||
|
run: cmake --build .
|
||||||
|
|
||||||
|
coverage:
|
||||||
|
needs: gcc
|
||||||
|
name: Coverage
|
||||||
|
runs-on: ubuntu-22.04
|
||||||
|
steps:
|
||||||
|
- name: Install
|
||||||
|
run: sudo apt-get install -y lcov ninja-build
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Configure
|
||||||
|
run: cmake -G Ninja -DCOVERAGE=true .
|
||||||
|
- name: Build
|
||||||
|
run: ninja
|
||||||
|
- name: Test
|
||||||
|
run: ctest --output-on-failure -LE 'WillFail|Fuzzing' -T test
|
||||||
|
- name: lcov --capture
|
||||||
|
run: lcov --capture --no-external --directory . --output-file coverage.info
|
||||||
|
- name: lcov --remove
|
||||||
|
run: lcov --remove coverage.info "$(pwd)/extras/*" --output-file coverage_filtered.info
|
||||||
|
- name: genhtml
|
||||||
|
run: mkdir coverage && genhtml coverage_filtered.info -o coverage -t ArduinoJson
|
||||||
|
- name: Upload HTML report
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: Coverage report
|
||||||
|
path: coverage
|
||||||
|
- name: Upload to Coveralls
|
||||||
|
uses: coverallsapp/github-action@v2
|
||||||
|
with:
|
||||||
|
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
path-to-lcov: coverage_filtered.info
|
||||||
|
|
||||||
|
valgrind:
|
||||||
|
needs: gcc
|
||||||
|
name: Valgrind
|
||||||
|
runs-on: ubuntu-22.04
|
||||||
|
steps:
|
||||||
|
- name: Install
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y valgrind ninja-build
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Configure
|
||||||
|
run: cmake -G Ninja -D MEMORYCHECK_COMMAND_OPTIONS="--error-exitcode=1 --leak-check=full" .
|
||||||
|
- name: Build
|
||||||
|
run: ninja
|
||||||
|
- name: Memcheck
|
||||||
|
run: ctest --output-on-failure -LE WillFail -T memcheck
|
||||||
|
id: memcheck
|
||||||
|
- name: MemoryChecker.*.log
|
||||||
|
run: cat Testing/Temporary/MemoryChecker.*.log > $GITHUB_STEP_SUMMARY
|
||||||
|
if: failure()
|
||||||
|
|
||||||
|
clang-tidy:
|
||||||
|
needs: clang
|
||||||
|
name: Clang-Tidy
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Install
|
||||||
|
run: sudo apt-get install -y clang-tidy libc++-dev libc++abi-dev
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Configure
|
||||||
|
run: cmake -G Ninja -DCMAKE_CXX_CLANG_TIDY="clang-tidy;--warnings-as-errors=*" -DCMAKE_BUILD_TYPE=Debug .
|
||||||
|
env:
|
||||||
|
CC: clang
|
||||||
|
CXX: clang++
|
||||||
|
- name: Check
|
||||||
|
run: cmake --build . -- -k 0
|
||||||
|
|
||||||
|
amalgamate:
|
||||||
|
needs: gcc
|
||||||
|
name: Amalgamate ArduinoJson.h
|
||||||
|
runs-on: ubuntu-22.04
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Setup
|
||||||
|
run: |
|
||||||
|
if [[ $GITHUB_REF == refs/tags/* ]]; then
|
||||||
|
VERSION=${GITHUB_REF#refs/tags/}
|
||||||
|
else
|
||||||
|
VERSION=${GITHUB_SHA::7}
|
||||||
|
fi
|
||||||
|
echo "ARDUINOJSON_H=ArduinoJson-$VERSION.h" >> $GITHUB_ENV
|
||||||
|
echo "ARDUINOJSON_HPP=ArduinoJson-$VERSION.hpp" >> $GITHUB_ENV
|
||||||
|
- name: Amalgamate ArduinoJson.h
|
||||||
|
run: extras/scripts/build-single-header.sh "src/ArduinoJson.h" "$ARDUINOJSON_H"
|
||||||
|
- name: Amalgamate ArduinoJson.hpp
|
||||||
|
run: extras/scripts/build-single-header.sh "src/ArduinoJson.hpp" "$ARDUINOJSON_HPP"
|
||||||
|
- name: Upload artifact
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: Single headers
|
||||||
|
path: |
|
||||||
|
${{ env.ARDUINOJSON_H }}
|
||||||
|
${{ env.ARDUINOJSON_HPP }}
|
||||||
|
- name: Smoke test ArduinoJson.h
|
||||||
|
run: |
|
||||||
|
g++ -x c++ - <<END
|
||||||
|
#include "$ARDUINOJSON_H"
|
||||||
|
int main() {
|
||||||
|
JsonDocument doc;
|
||||||
|
deserializeJson(doc, "{}");
|
||||||
|
}
|
||||||
|
END
|
||||||
|
- name: Smoke test ArduinoJson.hpp
|
||||||
|
run: |
|
||||||
|
g++ -x c++ - <<END
|
||||||
|
#include "$ARDUINOJSON_HPP"
|
||||||
|
int main() {
|
||||||
|
ArduinoJson::JsonDocument doc;
|
||||||
|
deserializeJson(doc, "{}");
|
||||||
|
}
|
||||||
|
END
|
||||||
|
|
||||||
|
esp-idf:
|
||||||
|
needs: gcc
|
||||||
|
name: ESP-IDF
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Setup cache
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.espressif
|
||||||
|
key: ${{ runner.os }}-esp-idf
|
||||||
|
- name: Checkout ArduinoJson
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Checkout ESP-IDF
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
repository: espressif/esp-idf
|
||||||
|
path: esp-idf
|
||||||
|
submodules: true
|
||||||
|
- name: Install ESP-IDF
|
||||||
|
run: ./esp-idf/install.sh
|
||||||
|
- name: Add component
|
||||||
|
# NOTE: we cannot commit the symlink because the Arduino Library Specification forbids it.
|
||||||
|
run: |
|
||||||
|
mkdir -p extras/ci/espidf/components
|
||||||
|
ln -s $PWD extras/ci/espidf/components/ArduinoJson
|
||||||
|
- name: Build example
|
||||||
|
run: |
|
||||||
|
source esp-idf/export.sh
|
||||||
|
cd extras/ci/espidf
|
||||||
|
idf.py build
|
||||||
|
|
||||||
|
codeql:
|
||||||
|
name: CodeQL
|
||||||
|
runs-on: ubuntu-22.04
|
||||||
|
needs: gcc
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
actions: read
|
||||||
|
contents: read
|
||||||
|
security-events: write
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Initialize CodeQL
|
||||||
|
uses: github/codeql-action/init@v3
|
||||||
|
with:
|
||||||
|
languages: cpp
|
||||||
|
|
||||||
|
- name: Build
|
||||||
|
run: |
|
||||||
|
cmake -DCMAKE_BUILD_TYPE=Debug .
|
||||||
|
cmake --build .
|
||||||
|
|
||||||
|
- name: Perform CodeQL Analysis
|
||||||
|
uses: github/codeql-action/analyze@v3
|
||||||
|
with:
|
||||||
|
category: "/language:cpp"
|
14
.github/workflows/lock.yml
vendored
Normal file
14
.github/workflows/lock.yml
vendored
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
name: Lock Threads
|
||||||
|
|
||||||
|
on:
|
||||||
|
schedule:
|
||||||
|
- cron: '0 0 * * *'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
lock:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: dessant/lock-threads@v5
|
||||||
|
with:
|
||||||
|
github-token: ${{ github.token }}
|
||||||
|
issue-inactive-days: 30
|
93
.github/workflows/release.yml
vendored
Normal file
93
.github/workflows/release.yml
vendored
Normal file
@ -0,0 +1,93 @@
|
|||||||
|
name: Release
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- v*.*.*
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
release:
|
||||||
|
name: Create release
|
||||||
|
runs-on: ubuntu-22.04
|
||||||
|
steps:
|
||||||
|
- name: Set variables
|
||||||
|
id: init
|
||||||
|
run: |
|
||||||
|
echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
|
||||||
|
echo "version=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Write release body
|
||||||
|
id: body
|
||||||
|
run: |
|
||||||
|
FILENAME=RELEASE.md
|
||||||
|
tee $FILENAME <<END
|
||||||
|
## Changes
|
||||||
|
|
||||||
|
$(extras/scripts/extract_changes.awk CHANGELOG.md)
|
||||||
|
|
||||||
|
[View version history](https://github.com/bblanchon/ArduinoJson/blob/${{ steps.init.outputs.tag }}/CHANGELOG.md)
|
||||||
|
END
|
||||||
|
echo "filename=$FILENAME" >> $GITHUB_OUTPUT
|
||||||
|
- name: Amalgamate ArduinoJson.h
|
||||||
|
id: amalgamate_h
|
||||||
|
run: |
|
||||||
|
FILENAME=ArduinoJson-${{ steps.init.outputs.tag }}.h
|
||||||
|
extras/scripts/build-single-header.sh src/ArduinoJson.h "$FILENAME"
|
||||||
|
echo "filename=$FILENAME" >> $GITHUB_OUTPUT
|
||||||
|
- name: Amalgamate ArduinoJson.hpp
|
||||||
|
id: amalgamate_hpp
|
||||||
|
run: |
|
||||||
|
FILENAME=ArduinoJson-${{ steps.init.outputs.tag }}.hpp
|
||||||
|
extras/scripts/build-single-header.sh src/ArduinoJson.hpp "$FILENAME"
|
||||||
|
echo "filename=$FILENAME" >> $GITHUB_OUTPUT
|
||||||
|
- name: Create release
|
||||||
|
uses: ncipollo/release-action@v1
|
||||||
|
with:
|
||||||
|
bodyFile: ${{ steps.body.outputs.filename }}
|
||||||
|
name: ArduinoJson ${{ steps.init.outputs.version }}
|
||||||
|
artifacts: ${{ steps.amalgamate_h.outputs.filename }},${{ steps.amalgamate_hpp.outputs.filename }}
|
||||||
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
idf:
|
||||||
|
name: IDF Component Registry
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Upload component to the component registry
|
||||||
|
uses: espressif/upload-components-ci-action@v1
|
||||||
|
with:
|
||||||
|
name: ArduinoJson
|
||||||
|
namespace: bblanchon
|
||||||
|
api_token: ${{ secrets.IDF_COMPONENT_API_TOKEN }}
|
||||||
|
|
||||||
|
particle:
|
||||||
|
name: Particle
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Install
|
||||||
|
run: npm install -g particle-cli
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Login
|
||||||
|
run: particle login --token ${{ secrets.PARTICLE_TOKEN }}
|
||||||
|
- name: Publish
|
||||||
|
run: bash -eux extras/scripts/publish-particle-library.sh
|
||||||
|
|
||||||
|
platformio:
|
||||||
|
name: PlatformIO
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Set up Python 3.x
|
||||||
|
uses: actions/setup-python@v5
|
||||||
|
with:
|
||||||
|
python-version: "3.x"
|
||||||
|
- name: Install PlatformIO
|
||||||
|
run: pip install platformio
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Publish
|
||||||
|
run: pio pkg publish --no-interactive --no-notify
|
||||||
|
env:
|
||||||
|
PLATFORMIO_AUTH_TOKEN: ${{ secrets.PLATFORMIO_AUTH_TOKEN }}
|
8
.gitignore
vendored
8
.gitignore
vendored
@ -10,3 +10,11 @@
|
|||||||
/extras/fuzzing/*_fuzzer.options
|
/extras/fuzzing/*_fuzzer.options
|
||||||
/extras/fuzzing/*_fuzzer_seed_corpus.zip
|
/extras/fuzzing/*_fuzzer_seed_corpus.zip
|
||||||
.vs/
|
.vs/
|
||||||
|
/out/
|
||||||
|
|
||||||
|
# Used by CI for Particle
|
||||||
|
/src/*.ino
|
||||||
|
/project.properties
|
||||||
|
|
||||||
|
# Used by IDF
|
||||||
|
/dist/
|
||||||
|
@ -1,6 +1,4 @@
|
|||||||
|
.devcontainer/
|
||||||
.github/
|
.github/
|
||||||
examples/
|
examples/
|
||||||
fuzzing/
|
extras/
|
||||||
scripts/
|
|
||||||
test/
|
|
||||||
third-party/
|
|
||||||
|
1
.prettierignore
Normal file
1
.prettierignore
Normal file
@ -0,0 +1 @@
|
|||||||
|
*.md
|
132
.travis.yml
132
.travis.yml
@ -1,132 +0,0 @@
|
|||||||
sudo: false
|
|
||||||
language: cpp
|
|
||||||
matrix:
|
|
||||||
include:
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test']
|
|
||||||
packages: ['g++-4.4']
|
|
||||||
env: SCRIPT=test _CC=gcc-4.4 _CXX=g++-4.4
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test']
|
|
||||||
packages: ['g++-4.6']
|
|
||||||
env: SCRIPT=test _CC=gcc-4.6 _CXX=g++-4.6
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test']
|
|
||||||
packages: ['g++-4.7']
|
|
||||||
env: SCRIPT=test _CC=gcc-4.7 _CXX=g++-4.7
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test']
|
|
||||||
packages: ['g++-4.8']
|
|
||||||
env: SCRIPT=test _CC=gcc-4.8 _CXX=g++-4.8 SANITIZE=address
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test']
|
|
||||||
packages: ['g++-4.9']
|
|
||||||
env: SCRIPT=test _CC=gcc-4.9 _CXX=g++-4.9 SANITIZE=leak
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test']
|
|
||||||
packages: ['g++-5']
|
|
||||||
env: SCRIPT=test _CC=gcc-5 _CXX=g++-5 # SANITIZE=undefined
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test']
|
|
||||||
packages: ['g++-6']
|
|
||||||
env: SCRIPT=test _CC=gcc-6 _CXX=g++-6
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test']
|
|
||||||
packages: ['g++-7']
|
|
||||||
env: SCRIPT=test _CC=gcc-7 _CXX=g++-7
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test']
|
|
||||||
packages: ['g++-8']
|
|
||||||
env: SCRIPT=test _CC=gcc-8 _CXX=g++-8
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
packages: ['g++-arm-linux-gnueabihf']
|
|
||||||
env: SCRIPT=build _CC=arm-linux-gnueabihf-gcc _CXX=arm-linux-gnueabihf-g++
|
|
||||||
- env: SCRIPT=test _CC=clang _CXX=clang++
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5']
|
|
||||||
packages: ['clang-3.5']
|
|
||||||
env: SCRIPT=test _CC=clang-3.5 _CXX=clang++-3.5 SANITIZE=address
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.6']
|
|
||||||
packages: ['clang-3.6']
|
|
||||||
env: SCRIPT=test _CC=clang-3.6 _CXX=clang++-3.6 SANITIZE=leak
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.7']
|
|
||||||
packages: ['clang-3.7']
|
|
||||||
env: SCRIPT=test _CC=clang-3.7 _CXX=clang++-3.7
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.8']
|
|
||||||
packages: ['clang-3.8']
|
|
||||||
env: SCRIPT=test _CC=clang-3.8 _CXX=clang++-3.8 SANITIZE=undefined
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-3.9']
|
|
||||||
packages: ['clang-3.9']
|
|
||||||
env: SCRIPT=test _CC=clang-3.9 _CXX=clang++-3.9
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-4.0']
|
|
||||||
packages: ['clang-4.0']
|
|
||||||
env: SCRIPT=test _CC=clang-4.0 _CXX=clang++-4.0
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test']
|
|
||||||
packages: ['clang-5.0']
|
|
||||||
env: SCRIPT=test _CC=clang-5.0 _CXX=clang++-5.0
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test']
|
|
||||||
packages: ['clang-6.0']
|
|
||||||
env: SCRIPT=test _CC=clang-6.0 _CXX=clang++-6.0
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-7']
|
|
||||||
packages: ['clang-7']
|
|
||||||
env: SCRIPT=test _CC=clang-7 _CXX=clang++-7
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-8']
|
|
||||||
packages: ['clang-8']
|
|
||||||
env: SCRIPT=test _CC=clang-8 _CXX=clang++-8
|
|
||||||
- env: SCRIPT=coverage
|
|
||||||
- os: osx
|
|
||||||
osx_image: xcode7.3
|
|
||||||
env: SCRIPT=test
|
|
||||||
- os: osx
|
|
||||||
osx_image: xcode8.3
|
|
||||||
env: SCRIPT=test
|
|
||||||
- os: osx
|
|
||||||
osx_image: xcode9.4
|
|
||||||
env: SCRIPT=test
|
|
||||||
- os: osx
|
|
||||||
osx_image: xcode10
|
|
||||||
env: SCRIPT=test SANITIZE=address
|
|
||||||
- env: SCRIPT=arduino VERSION=1.6.7 BOARD=arduino:avr:uno
|
|
||||||
- env: SCRIPT=arduino VERSION=1.8.2 BOARD=arduino:samd:mkr1000
|
|
||||||
- env: SCRIPT=platformio BOARD=uno
|
|
||||||
- env: SCRIPT=platformio BOARD=esp01
|
|
||||||
- addons:
|
|
||||||
apt:
|
|
||||||
sources: ['ubuntu-toolchain-r-test']
|
|
||||||
packages: ['clang-6.0','llvm-6.0']
|
|
||||||
env: SCRIPT=fuzz CLANG=6.0
|
|
||||||
cache:
|
|
||||||
directories:
|
|
||||||
- "~/.platformio"
|
|
||||||
- "extras/fuzzing/json_corpus"
|
|
||||||
- "extras/fuzzing/msgpack_corpus"
|
|
||||||
script: extras/ci/$SCRIPT.sh
|
|
17
.vscode/settings.json
vendored
Normal file
17
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
|
||||||
|
"git.inputValidationLength": 80,
|
||||||
|
"git.inputValidationSubjectLength": 72,
|
||||||
|
"files.insertFinalNewline": true,
|
||||||
|
"files.trimFinalNewlines": true,
|
||||||
|
"search.exclude": {
|
||||||
|
"/extras/tests/catch/*": true
|
||||||
|
},
|
||||||
|
"C_Cpp.default.includePath": [
|
||||||
|
"/src"
|
||||||
|
],
|
||||||
|
"[cmake]": {
|
||||||
|
"editor.detectIndentation": false,
|
||||||
|
"editor.insertSpaces": false,
|
||||||
|
}
|
||||||
|
}
|
@ -1,5 +1,5 @@
|
|||||||
// ArduinoJson - arduinojson.org
|
// ArduinoJson - https://arduinojson.org
|
||||||
// Copyright Benoit Blanchon 2014-2020
|
// Copyright © 2014-2025, Benoit BLANCHON
|
||||||
// MIT License
|
// MIT License
|
||||||
|
|
||||||
#include "src/ArduinoJson.h"
|
#include "src/ArduinoJson.h"
|
||||||
|
1116
CHANGELOG.md
1116
CHANGELOG.md
File diff suppressed because it is too large
Load Diff
@ -1,21 +1,25 @@
|
|||||||
# ArduinoJson - arduinojson.org
|
# ArduinoJson - https://arduinojson.org
|
||||||
# Copyright Benoit Blanchon 2014-2020
|
# Copyright © 2014-2025, Benoit BLANCHON
|
||||||
# MIT License
|
# MIT License
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.0)
|
cmake_minimum_required(VERSION 3.15)
|
||||||
project(ArduinoJson)
|
|
||||||
|
|
||||||
enable_testing()
|
if(ESP_PLATFORM)
|
||||||
|
# Build ArduinoJson as an ESP-IDF component
|
||||||
add_definitions(-DARDUINOJSON_DEBUG)
|
idf_component_register(INCLUDE_DIRS src)
|
||||||
if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
|
return()
|
||||||
add_compile_options(-g -O0)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(${COVERAGE})
|
project(ArduinoJson VERSION 7.4.1)
|
||||||
set(CMAKE_CXX_FLAGS "-fprofile-arcs -ftest-coverage")
|
|
||||||
|
if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
|
||||||
|
include(CTest)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(${CMAKE_CURRENT_LIST_DIR}/src)
|
add_subdirectory(src)
|
||||||
add_subdirectory(extras/tests)
|
|
||||||
add_subdirectory(extras/fuzzing)
|
if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
|
||||||
|
include(extras/CompileOptions.cmake)
|
||||||
|
add_subdirectory(extras/tests)
|
||||||
|
add_subdirectory(extras/fuzzing)
|
||||||
|
endif()
|
||||||
|
@ -6,6 +6,5 @@ You can submit changes via GitHub Pull Requests.
|
|||||||
|
|
||||||
Please:
|
Please:
|
||||||
|
|
||||||
1. Unit test every change in behavior
|
1. Update the test suite for any change of behavior
|
||||||
2. Use clang-format in "file" mode to format the code
|
2. Use clang-format in "file" mode to format the code
|
||||||
3. Consider using the Continuous Integration (Travis and AppVeyor)
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
The MIT License (MIT)
|
The MIT License (MIT)
|
||||||
---------------------
|
---------------------
|
||||||
|
|
||||||
Copyright © 2014-2019 Benoit BLANCHON
|
Copyright © 2014-2025, Benoit BLANCHON
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||||
|
|
120
README.md
120
README.md
@ -1,43 +1,47 @@
|
|||||||

|
<p align="center">
|
||||||
|
<a href="https://arduinojson.org/"><img alt="ArduinoJson" src="https://arduinojson.org/images/logo.svg" width="200" /></a>
|
||||||
|
</p>
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
[](https://www.ardu-badge.com/ArduinoJson/6.14.1)
|
[](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A7.x)
|
||||||
[](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x)
|
[](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/7.x)
|
||||||
[](https://travis-ci.org/bblanchon/ArduinoJson)
|
|
||||||
[](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson)
|
[](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson)
|
||||||
[](https://coveralls.io/github/bblanchon/ArduinoJson?branch=6.x)
|
[](https://coveralls.io/github/bblanchon/ArduinoJson?branch=7.x)
|
||||||
[](https://github.com/bblanchon/ArduinoJson/stargazers)
|
[](https://github.com/bblanchon/ArduinoJson/stargazers)
|
||||||
|
[](https://github.com/sponsors/bblanchon)
|
||||||
|
|
||||||
ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).
|
ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
* [JSON deserialization](https://arduinojson.org/v6/api/json/deserializejson/)
|
* [JSON deserialization](https://arduinojson.org/v7/api/json/deserializejson/)
|
||||||
* [Optionally decodes UTF-16 escape sequences to UTF-8](https://arduinojson.org/v6/api/config/decode_unicode/)
|
* [Optionally decodes UTF-16 escape sequences to UTF-8](https://arduinojson.org/v7/api/config/decode_unicode/)
|
||||||
* [Optionally stores links to the input buffer (zero-copy)](https://arduinojson.org/v6/api/json/deserializejson/)
|
* [Optionally supports comments in the input](https://arduinojson.org/v7/api/config/enable_comments/)
|
||||||
* [Optionally supports comments in the input](https://arduinojson.org/v6/api/config/enable_comments/)
|
* [Optionally filters the input to keep only desired values](https://arduinojson.org/v7/api/json/deserializejson/#filtering)
|
||||||
* Supports single quotes as a string delimiter
|
* Supports single quotes as a string delimiter
|
||||||
* Compatible with NDJSON and JSON Lines
|
* Compatible with [NDJSON](http://ndjson.org/) and [JSON Lines](https://jsonlines.org/)
|
||||||
* [JSON serialization](https://arduinojson.org/v6/api/json/serializejson/)
|
* [JSON serialization](https://arduinojson.org/v7/api/json/serializejson/)
|
||||||
* [Can write to a buffer or a stream](https://arduinojson.org/v6/api/json/serializejson/)
|
* [Can write to a buffer or a stream](https://arduinojson.org/v7/api/json/serializejson/)
|
||||||
* [Optionally indents the document (prettified JSON)](https://arduinojson.org/v6/api/json/serializejsonpretty/)
|
* [Optionally indents the document (prettified JSON)](https://arduinojson.org/v7/api/json/serializejsonpretty/)
|
||||||
* [MessagePack serialization](https://arduinojson.org/v6/api/msgpack/serializemsgpack/)
|
* [MessagePack serialization](https://arduinojson.org/v7/api/msgpack/serializemsgpack/)
|
||||||
* [MessagePack deserialization](https://arduinojson.org/v6/api/msgpack/deserializemsgpack/)
|
* [MessagePack deserialization](https://arduinojson.org/v7/api/msgpack/deserializemsgpack/)
|
||||||
* Efficient
|
* Efficient
|
||||||
* [Twice smaller than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/)
|
* [Twice smaller than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/)
|
||||||
* [Almost 10% faster than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/)
|
* [Almost 10% faster than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/)
|
||||||
* [Consumes roughly 10% less RAM than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/)
|
* [Consumes roughly 10% less RAM than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/)
|
||||||
* [Fixed memory allocation, no heap fragmentation](https://arduinojson.org/v6/api/jsondocument/)
|
* [Deduplicates strings](https://arduinojson.org/news/2020/08/01/version-6-16-0/)
|
||||||
* [Optionally works without heap memory (zero malloc)](https://arduinojson.org/v6/api/staticjsondocument/)
|
|
||||||
* Versatile
|
* Versatile
|
||||||
* [Supports custom allocators (to use external RAM chip, for example)](https://arduinojson.org/v6/how-to/use-external-ram-on-esp32/)
|
* Supports [custom allocators (to use external RAM chip, for example)](https://arduinojson.org/v7/how-to/use-external-ram-on-esp32/)
|
||||||
* Supports [Arduino's `String`](https://arduinojson.org/v6/api/config/enable_arduino_string/) and [STL's `std::string`](https://arduinojson.org/v6/api/config/enable_std_string/)
|
* Supports [`String`](https://arduinojson.org/v7/api/config/enable_arduino_string/), [`std::string`](https://arduinojson.org/v7/api/config/enable_std_string/), and [`std::string_view`](https://arduinojson.org/v7/api/config/enable_string_view/)
|
||||||
* Supports Arduino's `Stream` and [STL's `std::istream`/`std::ostream`](https://arduinojson.org/v6/api/config/enable_std_stream/)
|
* Supports [`Stream`](https://arduinojson.org/v7/api/config/enable_arduino_stream/) and [`std::istream`/`std::ostream`](https://arduinojson.org/v7/api/config/enable_std_stream/)
|
||||||
* [Supports Flash strings](https://arduinojson.org/v6/api/config/enable_progmem/)
|
* Supports [Flash strings](https://arduinojson.org/v7/api/config/enable_progmem/)
|
||||||
|
* Supports [custom readers](https://arduinojson.org/v7/api/json/deserializejson/#custom-reader) and [custom writers](https://arduinojson.org/v7/api/json/serializejson/#custom-writer)
|
||||||
|
* Supports [custom converters](https://arduinojson.org/news/2021/05/04/version-6-18-0/)
|
||||||
* Portable
|
* Portable
|
||||||
* Usable on any C++ project (not limited to Arduino)
|
* Usable on any C++ project (not limited to Arduino)
|
||||||
* Compatible with C++98
|
* Compatible with C++11, C++14 and C++17
|
||||||
|
* Support for C++98/C++03 available on [ArduinoJson 6.20.x](https://github.com/bblanchon/ArduinoJson/tree/6.20.x)
|
||||||
* Zero warnings with `-Wall -Wextra -pedantic` and `/W4`
|
* Zero warnings with `-Wall -Wextra -pedantic` and `/W4`
|
||||||
* [Header-only library](https://en.wikipedia.org/wiki/Header-only)
|
* [Header-only library](https://en.wikipedia.org/wiki/Header-only)
|
||||||
* Works with virtually any board
|
* Works with virtually any board
|
||||||
@ -47,6 +51,7 @@ ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).
|
|||||||
* Teensy boards: [4.0](https://amzn.to/30ljXGq), [3.2](https://amzn.to/2FT0EuC), [2.0](https://amzn.to/2QXUMXj)
|
* Teensy boards: [4.0](https://amzn.to/30ljXGq), [3.2](https://amzn.to/2FT0EuC), [2.0](https://amzn.to/2QXUMXj)
|
||||||
* Particle boards: [Argon](https://amzn.to/2FQHa9X), [Boron](https://amzn.to/36WgLUd), [Electron](https://amzn.to/30vEc4k), [Photon](https://amzn.to/387F9Cd)...
|
* Particle boards: [Argon](https://amzn.to/2FQHa9X), [Boron](https://amzn.to/36WgLUd), [Electron](https://amzn.to/30vEc4k), [Photon](https://amzn.to/387F9Cd)...
|
||||||
* Texas Instruments boards: [MSP430](https://amzn.to/30nJWgg)...
|
* Texas Instruments boards: [MSP430](https://amzn.to/30nJWgg)...
|
||||||
|
* Soft cores: [Nios II](https://en.wikipedia.org/wiki/Nios_II)...
|
||||||
* Tested on all major development environments
|
* Tested on all major development environments
|
||||||
* [Arduino IDE](https://www.arduino.cc/en/Main/Software)
|
* [Arduino IDE](https://www.arduino.cc/en/Main/Software)
|
||||||
* [Atmel Studio](http://www.atmel.com/microsite/atmel-studio/)
|
* [Atmel Studio](http://www.atmel.com/microsite/atmel-studio/)
|
||||||
@ -55,33 +60,39 @@ ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).
|
|||||||
* [IAR Embedded Workbench](https://www.iar.com/iar-embedded-workbench/)
|
* [IAR Embedded Workbench](https://www.iar.com/iar-embedded-workbench/)
|
||||||
* [Keil uVision](http://www.keil.com/)
|
* [Keil uVision](http://www.keil.com/)
|
||||||
* [MPLAB X IDE](http://www.microchip.com/mplab/mplab-x-ide)
|
* [MPLAB X IDE](http://www.microchip.com/mplab/mplab-x-ide)
|
||||||
|
* [Particle](https://www.particle.io/)
|
||||||
* [PlatformIO](http://platformio.org/)
|
* [PlatformIO](http://platformio.org/)
|
||||||
* [Sloeber plugin for Eclipse](https://eclipse.baeyens.it/)
|
* [Sloeber plugin for Eclipse](https://eclipse.baeyens.it/)
|
||||||
* [Visual Micro](http://www.visualmicro.com/)
|
* [Visual Micro](http://www.visualmicro.com/)
|
||||||
* [Visual Studio](https://www.visualstudio.com/)
|
* [Visual Studio](https://www.visualstudio.com/)
|
||||||
* [Even works with online compilers like wandbox.org](https://wandbox.org/permlink/t7KP7I6dVuLhqzDl)
|
* [Even works with online compilers like wandbox.org](https://wandbox.org/permlink/RlZSKy17DjJ6HcdN)
|
||||||
|
* [CMake friendly](https://arduinojson.org/v7/how-to/use-arduinojson-with-cmake/)
|
||||||
* Well designed
|
* Well designed
|
||||||
* [Elegant API](http://127.0.0.1:4000/v6/example/)
|
* [Elegant API](http://arduinojson.org/v7/example/)
|
||||||
* [Thread-safe](https://en.wikipedia.org/wiki/Thread_safety)
|
* [Thread-safe](https://en.wikipedia.org/wiki/Thread_safety)
|
||||||
* Self-contained (no external dependency)
|
* Self-contained (no external dependency)
|
||||||
* `const` friendly
|
* `const` friendly
|
||||||
* `for` friendly
|
* [`for` friendly](https://arduinojson.org/v7/api/jsonobject/begin_end/)
|
||||||
* [TMP friendly](https://en.wikipedia.org/wiki/Template_metaprogramming)
|
* [TMP friendly](https://en.wikipedia.org/wiki/Template_metaprogramming)
|
||||||
|
* Handles [integer overflows](https://arduinojson.org/v7/api/jsonvariant/as/#integer-overflows)
|
||||||
* Well tested
|
* Well tested
|
||||||
* [Unit test coverage close to 100%](https://coveralls.io/github/bblanchon/ArduinoJson?branch=6.x)
|
* [Unit test coverage close to 100%](https://coveralls.io/github/bblanchon/ArduinoJson?branch=7.x)
|
||||||
* Continuously tested on
|
* Continuously tested on
|
||||||
* [Visual Studio 2010, 2012, 2013, 2015, 2017, 2019](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x)
|
* [Visual Studio 2017, 2019, 2022](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/7.x)
|
||||||
* [GCC 4.4, 4.6, 4.7, 4.8, 4.9, 5, 6, 7, 8](https://travis-ci.org/bblanchon/ArduinoJson)
|
* [GCC 4.8, 5, 6, 7, 8, 9, 10, 11, 12](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
|
||||||
* [Clang 3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 5.0, 6.0, 7, 8](https://travis-ci.org/bblanchon/ArduinoJson)
|
* [Clang 7 to 19](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
|
||||||
* [Continuously fuzzed with Google OSS Fuzz](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson)
|
* [Continuously fuzzed with Google OSS Fuzz](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson)
|
||||||
|
* Passes all default checks of [clang-tidy](https://releases.llvm.org/10.0.0/tools/clang/tools/extra/docs/clang-tidy/)
|
||||||
* Well documented
|
* Well documented
|
||||||
* [Tutorials](https://arduinojson.org/v6/doc/deserialization/)
|
* [Tutorials](https://arduinojson.org/v7/doc/deserialization/)
|
||||||
* [Examples](https://arduinojson.org/v6/example/)
|
* [Examples](https://arduinojson.org/v7/example/)
|
||||||
* [How-tos](https://arduinojson.org/v6/example/)
|
* [How-tos](https://arduinojson.org/v7/example/)
|
||||||
* [FAQ](https://arduinojson.org/v6/faq/)
|
* [FAQ](https://arduinojson.org/v7/faq/)
|
||||||
|
* [Troubleshooter](https://arduinojson.org/v7/troubleshooter/)
|
||||||
* [Book](https://arduinojson.org/book/)
|
* [Book](https://arduinojson.org/book/)
|
||||||
|
* [Changelog](CHANGELOG.md)
|
||||||
* Vibrant user community
|
* Vibrant user community
|
||||||
* Most popular of all Arduino libraries on [GitHub](https://github.com/search?o=desc&q=arduino+library&s=stars&type=Repositories) and [PlatformIO](https://platformio.org/lib/search)
|
* Most popular of all Arduino libraries on [GitHub](https://github.com/search?o=desc&q=arduino+library&s=stars&type=Repositories)
|
||||||
* [Used in hundreds of projects](https://www.hackster.io/search?i=projects&q=arduinojson)
|
* [Used in hundreds of projects](https://www.hackster.io/search?i=projects&q=arduinojson)
|
||||||
* [Responsive support](https://github.com/bblanchon/ArduinoJson/issues?q=is%3Aissue+is%3Aclosed)
|
* [Responsive support](https://github.com/bblanchon/ArduinoJson/issues?q=is%3Aissue+is%3Aclosed)
|
||||||
|
|
||||||
@ -92,9 +103,9 @@ ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).
|
|||||||
Here is a program that parses a JSON document with ArduinoJson.
|
Here is a program that parses a JSON document with ArduinoJson.
|
||||||
|
|
||||||
```c++
|
```c++
|
||||||
char json[] = "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
|
const char* json = "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
|
||||||
|
|
||||||
DynamicJsonDocument doc(1024);
|
JsonDocument doc;
|
||||||
deserializeJson(doc, json);
|
deserializeJson(doc, json);
|
||||||
|
|
||||||
const char* sensor = doc["sensor"];
|
const char* sensor = doc["sensor"];
|
||||||
@ -103,32 +114,45 @@ double latitude = doc["data"][0];
|
|||||||
double longitude = doc["data"][1];
|
double longitude = doc["data"][1];
|
||||||
```
|
```
|
||||||
|
|
||||||
See the [tutorial on arduinojson.org](https://arduinojson.org/doc/decoding/?utm_source=github&utm_medium=readme)
|
See the [tutorial on arduinojson.org](https://arduinojson.org/v7/doc/deserialization/)
|
||||||
|
|
||||||
### Serialization
|
### Serialization
|
||||||
|
|
||||||
Here is a program that generates a JSON document with ArduinoJson:
|
Here is a program that generates a JSON document with ArduinoJson:
|
||||||
|
|
||||||
```c++
|
```c++
|
||||||
DynamicJsonDocument doc(1024);
|
JsonDocument doc;
|
||||||
|
|
||||||
doc["sensor"] = "gps";
|
doc["sensor"] = "gps";
|
||||||
doc["time"] = 1351824120;
|
doc["time"] = 1351824120;
|
||||||
|
doc["data"][0] = 48.756080;
|
||||||
JsonArray data = doc.createNestedArray("data");
|
doc["data"][1] = 2.302038;
|
||||||
data.add(48.756080);
|
|
||||||
data.add(2.302038);
|
|
||||||
|
|
||||||
serializeJson(doc, Serial);
|
serializeJson(doc, Serial);
|
||||||
// This prints:
|
// This prints:
|
||||||
// {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]}
|
// {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]}
|
||||||
```
|
```
|
||||||
|
|
||||||
See the [tutorial on arduinojson.org](https://arduinojson.org/doc/encoding/?utm_source=github&utm_medium=readme)
|
See the [tutorial on arduinojson.org](https://arduinojson.org/v7/doc/serialization/)
|
||||||
|
|
||||||
## Support the project
|
## Sponsors
|
||||||
|
|
||||||
Do you like this library? Please [star this project on GitHub](https://github.com/bblanchon/ArduinoJson/stargazers)!
|
ArduinoJson is thankful to its sponsors. Please give them a visit; they deserve it!
|
||||||
|
|
||||||
What? You don't like it but you *love* it?
|
<p>
|
||||||
We don't take donations anymore, but [we sell a book](https://arduinojson.org/book/?utm_source=github&utm_medium=readme), so you can help and learn at the same time!
|
<a href="https://www.programmingelectronics.com/" rel="sponsored">
|
||||||
|
<img src="https://arduinojson.org/images/2021/10/programmingeleactronicsacademy.png" alt="Programming Electronics Academy" width="200">
|
||||||
|
</a>
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<a href="https://github.com/1technophile" rel="sponsored">
|
||||||
|
<img alt="1technophile" src="https://avatars.githubusercontent.com/u/12672732?s=40&v=4">
|
||||||
|
</a>
|
||||||
|
<a href="https://github.com/LArkema" rel="sponsored">
|
||||||
|
<img alt="LArkema" src="https://avatars.githubusercontent.com/u/38381313?s=40&v=4">
|
||||||
|
</a>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
If you run a commercial project that embeds ArduinoJson, think about [sponsoring the library's development](https://github.com/sponsors/bblanchon): it ensures the code that your products rely on stays actively maintained. It can also give your project some exposure to the makers' community.
|
||||||
|
|
||||||
|
If you are an individual user and want to support the development (or give a sign of appreciation), consider purchasing the book [Mastering ArduinoJson](https://arduinojson.org/book/) ❤, or simply [cast a star](https://github.com/bblanchon/ArduinoJson/stargazers) ⭐.
|
||||||
|
30
appveyor.yml
30
appveyor.yml
@ -1,22 +1,28 @@
|
|||||||
version: 6.14.1.{build}
|
version: 7.4.1.{build}
|
||||||
environment:
|
environment:
|
||||||
matrix:
|
matrix:
|
||||||
|
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
|
||||||
|
CMAKE_GENERATOR: Visual Studio 17 2022
|
||||||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
|
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
|
||||||
CMAKE_GENERATOR: Visual Studio 16 2019
|
CMAKE_GENERATOR: Visual Studio 16 2019
|
||||||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
|
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
|
||||||
CMAKE_GENERATOR: Visual Studio 15 2017
|
CMAKE_GENERATOR: Visual Studio 15 2017
|
||||||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
|
- CMAKE_GENERATOR: Ninja
|
||||||
CMAKE_GENERATOR: Visual Studio 14 2015
|
MINGW32: i686-6.3.0-posix-dwarf-rt_v5-rev1 # MinGW-w64 6.3.0 i686
|
||||||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
|
- CMAKE_GENERATOR: Ninja
|
||||||
CMAKE_GENERATOR: Visual Studio 12 2013
|
MINGW64: x86_64-6.3.0-posix-seh-rt_v5-rev1 # MinGW-w64 6.3.0 x86_64
|
||||||
- CMAKE_GENERATOR: Visual Studio 11 2012
|
- CMAKE_GENERATOR: Ninja
|
||||||
- CMAKE_GENERATOR: Visual Studio 10 2010
|
MINGW64: x86_64-7.3.0-posix-seh-rt_v5-rev0 # MinGW-w64 7.3.0 x86_64
|
||||||
- CMAKE_GENERATOR: MinGW Makefiles
|
- CMAKE_GENERATOR: Ninja
|
||||||
|
MINGW64: x86_64-8.1.0-posix-seh-rt_v6-rev0 # MinGW-w64 8.1.0 x86_64
|
||||||
configuration: Debug
|
configuration: Debug
|
||||||
before_build:
|
before_build:
|
||||||
- set PATH=C:\MinGW\bin;%PATH:C:\Program Files\Git\usr\bin;=% # Workaround for CMake not wanting sh.exe on PATH for MinGW
|
- set PATH=%PATH:C:\Program Files\Git\usr\bin;=% # Workaround for CMake not wanting sh.exe on PATH for MinGW
|
||||||
- cmake -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "%CMAKE_GENERATOR%" .
|
- if defined MINGW set PATH=C:\%MINGW%\bin;%PATH%
|
||||||
|
- if defined MINGW32 set PATH=C:\mingw-w64\%MINGW32%\mingw32\bin;%PATH%
|
||||||
|
- if defined MINGW64 set PATH=C:\mingw-w64\%MINGW64%\mingw64\bin;%PATH%
|
||||||
|
- cmake -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "%CMAKE_GENERATOR%" .
|
||||||
build_script:
|
build_script:
|
||||||
- cmake --build . --config %CONFIGURATION%
|
- cmake --build . --config %CONFIGURATION%
|
||||||
test_script:
|
test_script:
|
||||||
- ctest -C %CONFIGURATION% --output-on-failure .
|
- ctest -C %CONFIGURATION% --output-on-failure .
|
||||||
|
367
banner.svg
367
banner.svg
File diff suppressed because one or more lines are too long
Before Width: | Height: | Size: 32 KiB |
@ -1,5 +1,5 @@
|
|||||||
// ArduinoJson - arduinojson.org
|
// ArduinoJson - https://arduinojson.org
|
||||||
// Copyright Benoit Blanchon 2014-2020
|
// Copyright © 2014-2025, Benoit BLANCHON
|
||||||
// MIT License
|
// MIT License
|
||||||
//
|
//
|
||||||
// This example shows how to store your project configuration in a file.
|
// This example shows how to store your project configuration in a file.
|
||||||
@ -17,35 +17,28 @@
|
|||||||
// * CLK <-> pin 13
|
// * CLK <-> pin 13
|
||||||
// * CS <-> pin 4
|
// * CS <-> pin 4
|
||||||
//
|
//
|
||||||
// https://arduinojson.org/v6/example/config/
|
// https://arduinojson.org/v7/example/config/
|
||||||
|
|
||||||
#include <ArduinoJson.h>
|
#include <ArduinoJson.h>
|
||||||
#include <SD.h>
|
#include <SD.h>
|
||||||
#include <SPI.h>
|
#include <SPI.h>
|
||||||
|
|
||||||
// Our configuration structure.
|
// Our configuration structure.
|
||||||
//
|
|
||||||
// Never use a JsonDocument to store the configuration!
|
|
||||||
// A JsonDocument is *not* a permanent storage; it's only a temporary storage
|
|
||||||
// used during the serialization phase. See:
|
|
||||||
// https://arduinojson.org/v6/faq/why-must-i-create-a-separate-config-object/
|
|
||||||
struct Config {
|
struct Config {
|
||||||
char hostname[64];
|
char hostname[64];
|
||||||
int port;
|
int port;
|
||||||
};
|
};
|
||||||
|
|
||||||
const char *filename = "/config.txt"; // <- SD library uses 8.3 filenames
|
const char* filename = "/config.txt"; // <- SD library uses 8.3 filenames
|
||||||
Config config; // <- global configuration object
|
Config config; // <- global configuration object
|
||||||
|
|
||||||
// Loads the configuration from a file
|
// Loads the configuration from a file
|
||||||
void loadConfiguration(const char *filename, Config &config) {
|
void loadConfiguration(const char* filename, Config& config) {
|
||||||
// Open file for reading
|
// Open file for reading
|
||||||
File file = SD.open(filename);
|
File file = SD.open(filename);
|
||||||
|
|
||||||
// Allocate a temporary JsonDocument
|
// Allocate a temporary JsonDocument
|
||||||
// Don't forget to change the capacity to match your requirements.
|
JsonDocument doc;
|
||||||
// Use arduinojson.org/v6/assistant to compute the capacity.
|
|
||||||
StaticJsonDocument<512> doc;
|
|
||||||
|
|
||||||
// Deserialize the JSON document
|
// Deserialize the JSON document
|
||||||
DeserializationError error = deserializeJson(doc, file);
|
DeserializationError error = deserializeJson(doc, file);
|
||||||
@ -63,7 +56,7 @@ void loadConfiguration(const char *filename, Config &config) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Saves the configuration to a file
|
// Saves the configuration to a file
|
||||||
void saveConfiguration(const char *filename, const Config &config) {
|
void saveConfiguration(const char* filename, const Config& config) {
|
||||||
// Delete existing file, otherwise the configuration is appended to the file
|
// Delete existing file, otherwise the configuration is appended to the file
|
||||||
SD.remove(filename);
|
SD.remove(filename);
|
||||||
|
|
||||||
@ -75,9 +68,7 @@ void saveConfiguration(const char *filename, const Config &config) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Allocate a temporary JsonDocument
|
// Allocate a temporary JsonDocument
|
||||||
// Don't forget to change the capacity to match your requirements.
|
JsonDocument doc;
|
||||||
// Use arduinojson.org/assistant to compute the capacity.
|
|
||||||
StaticJsonDocument<256> doc;
|
|
||||||
|
|
||||||
// Set the values in the document
|
// Set the values in the document
|
||||||
doc["hostname"] = config.hostname;
|
doc["hostname"] = config.hostname;
|
||||||
@ -93,7 +84,7 @@ void saveConfiguration(const char *filename, const Config &config) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Prints the content of a file to the Serial
|
// Prints the content of a file to the Serial
|
||||||
void printFile(const char *filename) {
|
void printFile(const char* filename) {
|
||||||
// Open file for reading
|
// Open file for reading
|
||||||
File file = SD.open(filename);
|
File file = SD.open(filename);
|
||||||
if (!file) {
|
if (!file) {
|
||||||
@ -114,7 +105,8 @@ void printFile(const char *filename) {
|
|||||||
void setup() {
|
void setup() {
|
||||||
// Initialize serial port
|
// Initialize serial port
|
||||||
Serial.begin(9600);
|
Serial.begin(9600);
|
||||||
while (!Serial) continue;
|
while (!Serial)
|
||||||
|
continue;
|
||||||
|
|
||||||
// Initialize SD library
|
// Initialize SD library
|
||||||
const int chipSelect = 4;
|
const int chipSelect = 4;
|
||||||
@ -140,6 +132,12 @@ void loop() {
|
|||||||
// not used in this example
|
// not used in this example
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Performance issue?
|
||||||
|
// ------------------
|
||||||
|
//
|
||||||
|
// File is an unbuffered stream, which is not optimal for ArduinoJson.
|
||||||
|
// See: https://arduinojson.org/v7/how-to/improve-speed/
|
||||||
|
|
||||||
// See also
|
// See also
|
||||||
// --------
|
// --------
|
||||||
//
|
//
|
||||||
|
64
examples/JsonFilterExample/JsonFilterExample.ino
Normal file
64
examples/JsonFilterExample/JsonFilterExample.ino
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
// ArduinoJson - https://arduinojson.org
|
||||||
|
// Copyright © 2014-2025, Benoit BLANCHON
|
||||||
|
// MIT License
|
||||||
|
//
|
||||||
|
// This example shows how to use DeserializationOption::Filter
|
||||||
|
//
|
||||||
|
// https://arduinojson.org/v7/example/filter/
|
||||||
|
|
||||||
|
#include <ArduinoJson.h>
|
||||||
|
|
||||||
|
void setup() {
|
||||||
|
// Initialize serial port
|
||||||
|
Serial.begin(9600);
|
||||||
|
while (!Serial)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
// The huge input: an extract from OpenWeatherMap response
|
||||||
|
auto input_json = F(
|
||||||
|
"{\"cod\":\"200\",\"message\":0,\"list\":[{\"dt\":1581498000,\"main\":{"
|
||||||
|
"\"temp\":3.23,\"feels_like\":-3.63,\"temp_min\":3.23,\"temp_max\":4.62,"
|
||||||
|
"\"pressure\":1014,\"sea_level\":1014,\"grnd_level\":1010,\"humidity\":"
|
||||||
|
"58,\"temp_kf\":-1.39},\"weather\":[{\"id\":800,\"main\":\"Clear\","
|
||||||
|
"\"description\":\"clear "
|
||||||
|
"sky\",\"icon\":\"01d\"}],\"clouds\":{\"all\":0},\"wind\":{\"speed\":6."
|
||||||
|
"19,\"deg\":266},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-12 "
|
||||||
|
"09:00:00\"},{\"dt\":1581508800,\"main\":{\"temp\":6.09,\"feels_like\":-"
|
||||||
|
"1.07,\"temp_min\":6.09,\"temp_max\":7.13,\"pressure\":1015,\"sea_"
|
||||||
|
"level\":1015,\"grnd_level\":1011,\"humidity\":48,\"temp_kf\":-1.04},"
|
||||||
|
"\"weather\":[{\"id\":800,\"main\":\"Clear\",\"description\":\"clear "
|
||||||
|
"sky\",\"icon\":\"01d\"}],\"clouds\":{\"all\":9},\"wind\":{\"speed\":6."
|
||||||
|
"64,\"deg\":268},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-12 "
|
||||||
|
"12:00:00\"}],\"city\":{\"id\":2643743,\"name\":\"London\",\"coord\":{"
|
||||||
|
"\"lat\":51.5085,\"lon\":-0.1257},\"country\":\"GB\",\"population\":"
|
||||||
|
"1000000,\"timezone\":0,\"sunrise\":1581492085,\"sunset\":1581527294}}");
|
||||||
|
|
||||||
|
// The filter: it contains "true" for each value we want to keep
|
||||||
|
JsonDocument filter;
|
||||||
|
filter["list"][0]["dt"] = true;
|
||||||
|
filter["list"][0]["main"]["temp"] = true;
|
||||||
|
|
||||||
|
// Deserialize the document
|
||||||
|
JsonDocument doc;
|
||||||
|
deserializeJson(doc, input_json, DeserializationOption::Filter(filter));
|
||||||
|
|
||||||
|
// Print the result
|
||||||
|
serializeJsonPretty(doc, Serial);
|
||||||
|
}
|
||||||
|
|
||||||
|
void loop() {
|
||||||
|
// not used in this example
|
||||||
|
}
|
||||||
|
|
||||||
|
// See also
|
||||||
|
// --------
|
||||||
|
//
|
||||||
|
// https://arduinojson.org/ contains the documentation for all the functions
|
||||||
|
// used above. It also includes an FAQ that will help you solve any
|
||||||
|
// deserialization problem.
|
||||||
|
//
|
||||||
|
// The book "Mastering ArduinoJson" contains a tutorial on deserialization.
|
||||||
|
// It begins with a simple example, like the one above, and then adds more
|
||||||
|
// features like deserializing directly from a file or an HTTP request.
|
||||||
|
// Learn more at https://arduinojson.org/book/
|
||||||
|
// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤
|
@ -1,43 +1,32 @@
|
|||||||
// ArduinoJson - arduinojson.org
|
// ArduinoJson - https://arduinojson.org
|
||||||
// Copyright Benoit Blanchon 2014-2020
|
// Copyright © 2014-2025, Benoit BLANCHON
|
||||||
// MIT License
|
// MIT License
|
||||||
//
|
//
|
||||||
// This example shows how to generate a JSON document with ArduinoJson.
|
// This example shows how to generate a JSON document with ArduinoJson.
|
||||||
//
|
//
|
||||||
// https://arduinojson.org/v6/example/generator/
|
// https://arduinojson.org/v7/example/generator/
|
||||||
|
|
||||||
#include <ArduinoJson.h>
|
#include <ArduinoJson.h>
|
||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
// Initialize Serial port
|
// Initialize Serial port
|
||||||
Serial.begin(9600);
|
Serial.begin(9600);
|
||||||
while (!Serial) continue;
|
while (!Serial)
|
||||||
|
continue;
|
||||||
|
|
||||||
// Allocate the JSON document
|
// Allocate the JSON document
|
||||||
//
|
JsonDocument doc;
|
||||||
// Inside the brackets, 200 is the RAM allocated to this document.
|
|
||||||
// Don't forget to change this value to match your requirement.
|
|
||||||
// Use arduinojson.org/v6/assistant to compute the capacity.
|
|
||||||
StaticJsonDocument<200> doc;
|
|
||||||
|
|
||||||
// StaticJsonObject allocates memory on the stack, it can be
|
|
||||||
// replaced by DynamicJsonDocument which allocates in the heap.
|
|
||||||
//
|
|
||||||
// DynamicJsonDocument doc(200);
|
|
||||||
|
|
||||||
// Add values in the document
|
// Add values in the document
|
||||||
//
|
|
||||||
doc["sensor"] = "gps";
|
doc["sensor"] = "gps";
|
||||||
doc["time"] = 1351824120;
|
doc["time"] = 1351824120;
|
||||||
|
|
||||||
// Add an array.
|
// Add an array
|
||||||
//
|
JsonArray data = doc["data"].to<JsonArray>();
|
||||||
JsonArray data = doc.createNestedArray("data");
|
|
||||||
data.add(48.756080);
|
data.add(48.756080);
|
||||||
data.add(2.302038);
|
data.add(2.302038);
|
||||||
|
|
||||||
// Generate the minified JSON and send it to the Serial port.
|
// Generate the minified JSON and send it to the Serial port
|
||||||
//
|
|
||||||
serializeJson(doc, Serial);
|
serializeJson(doc, Serial);
|
||||||
// The above line prints:
|
// The above line prints:
|
||||||
// {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]}
|
// {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]}
|
||||||
@ -45,8 +34,7 @@ void setup() {
|
|||||||
// Start a new line
|
// Start a new line
|
||||||
Serial.println();
|
Serial.println();
|
||||||
|
|
||||||
// Generate the prettified JSON and send it to the Serial port.
|
// Generate the prettified JSON and send it to the Serial port
|
||||||
//
|
|
||||||
serializeJsonPretty(doc, Serial);
|
serializeJsonPretty(doc, Serial);
|
||||||
// The above line prints:
|
// The above line prints:
|
||||||
// {
|
// {
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
// ArduinoJson - arduinojson.org
|
// ArduinoJson - https://arduinojson.org
|
||||||
// Copyright Benoit Blanchon 2014-2020
|
// Copyright © 2014-2025, Benoit BLANCHON
|
||||||
// MIT License
|
// MIT License
|
||||||
//
|
//
|
||||||
// This example shows how to parse a JSON document in an HTTP response.
|
// This example shows how to parse a JSON document in an HTTP response.
|
||||||
// It uses the Ethernet library, but can be easily adapted for Wifi.
|
// It uses the Ethernet library, but can be easily adapted for Wifi.
|
||||||
//
|
//
|
||||||
// It performs a GET resquest on arduinojson.org/example.json
|
// It performs a GET resquest on https://arduinojson.org/example.json
|
||||||
// Here is the expected response:
|
// Here is the expected response:
|
||||||
// {
|
// {
|
||||||
// "sensor": "gps",
|
// "sensor": "gps",
|
||||||
@ -16,7 +16,7 @@
|
|||||||
// ]
|
// ]
|
||||||
// }
|
// }
|
||||||
//
|
//
|
||||||
// https://arduinojson.org/v6/example/http-client/
|
// https://arduinojson.org/v7/example/http-client/
|
||||||
|
|
||||||
#include <ArduinoJson.h>
|
#include <ArduinoJson.h>
|
||||||
#include <Ethernet.h>
|
#include <Ethernet.h>
|
||||||
@ -25,7 +25,8 @@
|
|||||||
void setup() {
|
void setup() {
|
||||||
// Initialize Serial port
|
// Initialize Serial port
|
||||||
Serial.begin(9600);
|
Serial.begin(9600);
|
||||||
while (!Serial) continue;
|
while (!Serial)
|
||||||
|
continue;
|
||||||
|
|
||||||
// Initialize Ethernet library
|
// Initialize Ethernet library
|
||||||
byte mac[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
|
byte mac[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
|
||||||
@ -53,6 +54,7 @@ void setup() {
|
|||||||
client.println(F("Connection: close"));
|
client.println(F("Connection: close"));
|
||||||
if (client.println() == 0) {
|
if (client.println() == 0) {
|
||||||
Serial.println(F("Failed to send request"));
|
Serial.println(F("Failed to send request"));
|
||||||
|
client.stop();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -63,6 +65,7 @@ void setup() {
|
|||||||
if (strcmp(status + 9, "200 OK") != 0) {
|
if (strcmp(status + 9, "200 OK") != 0) {
|
||||||
Serial.print(F("Unexpected response: "));
|
Serial.print(F("Unexpected response: "));
|
||||||
Serial.println(status);
|
Serial.println(status);
|
||||||
|
client.stop();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -70,25 +73,25 @@ void setup() {
|
|||||||
char endOfHeaders[] = "\r\n\r\n";
|
char endOfHeaders[] = "\r\n\r\n";
|
||||||
if (!client.find(endOfHeaders)) {
|
if (!client.find(endOfHeaders)) {
|
||||||
Serial.println(F("Invalid response"));
|
Serial.println(F("Invalid response"));
|
||||||
|
client.stop();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Allocate the JSON document
|
// Allocate the JSON document
|
||||||
// Use arduinojson.org/v6/assistant to compute the capacity.
|
JsonDocument doc;
|
||||||
const size_t capacity = JSON_OBJECT_SIZE(3) + JSON_ARRAY_SIZE(2) + 60;
|
|
||||||
DynamicJsonDocument doc(capacity);
|
|
||||||
|
|
||||||
// Parse JSON object
|
// Parse JSON object
|
||||||
DeserializationError error = deserializeJson(doc, client);
|
DeserializationError error = deserializeJson(doc, client);
|
||||||
if (error) {
|
if (error) {
|
||||||
Serial.print(F("deserializeJson() failed: "));
|
Serial.print(F("deserializeJson() failed: "));
|
||||||
Serial.println(error.c_str());
|
Serial.println(error.f_str());
|
||||||
|
client.stop();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Extract values
|
// Extract values
|
||||||
Serial.println(F("Response:"));
|
Serial.println(F("Response:"));
|
||||||
Serial.println(doc["sensor"].as<char*>());
|
Serial.println(doc["sensor"].as<const char*>());
|
||||||
Serial.println(doc["time"].as<long>());
|
Serial.println(doc["time"].as<long>());
|
||||||
Serial.println(doc["data"][0].as<float>(), 6);
|
Serial.println(doc["data"][0].as<float>(), 6);
|
||||||
Serial.println(doc["data"][1].as<float>(), 6);
|
Serial.println(doc["data"][1].as<float>(), 6);
|
||||||
@ -101,6 +104,12 @@ void loop() {
|
|||||||
// not used in this example
|
// not used in this example
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Performance issue?
|
||||||
|
// ------------------
|
||||||
|
//
|
||||||
|
// EthernetClient is an unbuffered stream, which is not optimal for ArduinoJson.
|
||||||
|
// See: https://arduinojson.org/v7/how-to/improve-speed/
|
||||||
|
|
||||||
// See also
|
// See also
|
||||||
// --------
|
// --------
|
||||||
//
|
//
|
||||||
|
@ -1,52 +1,37 @@
|
|||||||
// ArduinoJson - arduinojson.org
|
// ArduinoJson - https://arduinojson.org
|
||||||
// Copyright Benoit Blanchon 2014-2020
|
// Copyright © 2014-2025, Benoit BLANCHON
|
||||||
// MIT License
|
// MIT License
|
||||||
//
|
//
|
||||||
// This example shows how to deserialize a JSON document with ArduinoJson.
|
// This example shows how to deserialize a JSON document with ArduinoJson.
|
||||||
//
|
//
|
||||||
// https://arduinojson.org/v6/example/parser/
|
// https://arduinojson.org/v7/example/parser/
|
||||||
|
|
||||||
#include <ArduinoJson.h>
|
#include <ArduinoJson.h>
|
||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
// Initialize serial port
|
// Initialize serial port
|
||||||
Serial.begin(9600);
|
Serial.begin(9600);
|
||||||
while (!Serial) continue;
|
while (!Serial)
|
||||||
|
continue;
|
||||||
|
|
||||||
// Allocate the JSON document
|
// Allocate the JSON document
|
||||||
//
|
JsonDocument doc;
|
||||||
// Inside the brackets, 200 is the capacity of the memory pool in bytes.
|
|
||||||
// Don't forget to change this value to match your JSON document.
|
|
||||||
// Use arduinojson.org/v6/assistant to compute the capacity.
|
|
||||||
StaticJsonDocument<200> doc;
|
|
||||||
|
|
||||||
// StaticJsonDocument<N> allocates memory on the stack, it can be
|
|
||||||
// replaced by DynamicJsonDocument which allocates in the heap.
|
|
||||||
//
|
|
||||||
// DynamicJsonDocument doc(200);
|
|
||||||
|
|
||||||
// JSON input string.
|
// JSON input string.
|
||||||
//
|
const char* json =
|
||||||
// Using a char[], as shown here, enables the "zero-copy" mode. This mode uses
|
|
||||||
// the minimal amount of memory because the JsonDocument stores pointers to
|
|
||||||
// the input buffer.
|
|
||||||
// If you use another type of input, ArduinoJson must copy the strings from
|
|
||||||
// the input to the JsonDocument, so you need to increase the capacity of the
|
|
||||||
// JsonDocument.
|
|
||||||
char json[] =
|
|
||||||
"{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
|
"{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
|
||||||
|
|
||||||
// Deserialize the JSON document
|
// Deserialize the JSON document
|
||||||
DeserializationError error = deserializeJson(doc, json);
|
DeserializationError error = deserializeJson(doc, json);
|
||||||
|
|
||||||
// Test if parsing succeeds.
|
// Test if parsing succeeds
|
||||||
if (error) {
|
if (error) {
|
||||||
Serial.print(F("deserializeJson() failed: "));
|
Serial.print(F("deserializeJson() failed: "));
|
||||||
Serial.println(error.c_str());
|
Serial.println(error.f_str());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fetch values.
|
// Fetch the values
|
||||||
//
|
//
|
||||||
// Most of the time, you can rely on the implicit casts.
|
// Most of the time, you can rely on the implicit casts.
|
||||||
// In other case, you can do doc["time"].as<long>();
|
// In other case, you can do doc["time"].as<long>();
|
||||||
@ -55,7 +40,7 @@ void setup() {
|
|||||||
double latitude = doc["data"][0];
|
double latitude = doc["data"][0];
|
||||||
double longitude = doc["data"][1];
|
double longitude = doc["data"][1];
|
||||||
|
|
||||||
// Print values.
|
// Print the values
|
||||||
Serial.println(sensor);
|
Serial.println(sensor);
|
||||||
Serial.println(time);
|
Serial.println(time);
|
||||||
Serial.println(latitude, 6);
|
Serial.println(latitude, 6);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
// ArduinoJson - arduinojson.org
|
// ArduinoJson - https://arduinojson.org
|
||||||
// Copyright Benoit Blanchon 2014-2020
|
// Copyright © 2014-2025, Benoit BLANCHON
|
||||||
// MIT License
|
// MIT License
|
||||||
//
|
//
|
||||||
// This example shows how to implement an HTTP server that sends a JSON document
|
// This example shows how to implement an HTTP server that sends a JSON document
|
||||||
@ -13,7 +13,7 @@
|
|||||||
// "digital": [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0]
|
// "digital": [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0]
|
||||||
// }
|
// }
|
||||||
//
|
//
|
||||||
// https://arduinojson.org/v6/example/http-server/
|
// https://arduinojson.org/v7/example/http-server/
|
||||||
|
|
||||||
#include <ArduinoJson.h>
|
#include <ArduinoJson.h>
|
||||||
#include <Ethernet.h>
|
#include <Ethernet.h>
|
||||||
@ -25,7 +25,8 @@ EthernetServer server(80);
|
|||||||
void setup() {
|
void setup() {
|
||||||
// Initialize serial port
|
// Initialize serial port
|
||||||
Serial.begin(9600);
|
Serial.begin(9600);
|
||||||
while (!Serial) continue;
|
while (!Serial)
|
||||||
|
continue;
|
||||||
|
|
||||||
// Initialize Ethernet libary
|
// Initialize Ethernet libary
|
||||||
if (!Ethernet.begin(mac)) {
|
if (!Ethernet.begin(mac)) {
|
||||||
@ -46,19 +47,20 @@ void loop() {
|
|||||||
EthernetClient client = server.available();
|
EthernetClient client = server.available();
|
||||||
|
|
||||||
// Do we have a client?
|
// Do we have a client?
|
||||||
if (!client) return;
|
if (!client)
|
||||||
|
return;
|
||||||
|
|
||||||
Serial.println(F("New client"));
|
Serial.println(F("New client"));
|
||||||
|
|
||||||
// Read the request (we ignore the content in this example)
|
// Read the request (we ignore the content in this example)
|
||||||
while (client.available()) client.read();
|
while (client.available())
|
||||||
|
client.read();
|
||||||
|
|
||||||
// Allocate a temporary JsonDocument
|
// Allocate a temporary JsonDocument
|
||||||
// Use arduinojson.org/v6/assistant to compute the capacity.
|
JsonDocument doc;
|
||||||
StaticJsonDocument<500> doc;
|
|
||||||
|
|
||||||
// Create the "analog" array
|
// Create the "analog" array
|
||||||
JsonArray analogValues = doc.createNestedArray("analog");
|
JsonArray analogValues = doc["analog"].to<JsonArray>();
|
||||||
for (int pin = 0; pin < 6; pin++) {
|
for (int pin = 0; pin < 6; pin++) {
|
||||||
// Read the analog input
|
// Read the analog input
|
||||||
int value = analogRead(pin);
|
int value = analogRead(pin);
|
||||||
@ -68,7 +70,7 @@ void loop() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Create the "digital" array
|
// Create the "digital" array
|
||||||
JsonArray digitalValues = doc.createNestedArray("digital");
|
JsonArray digitalValues = doc["digital"].to<JsonArray>();
|
||||||
for (int pin = 0; pin < 14; pin++) {
|
for (int pin = 0; pin < 14; pin++) {
|
||||||
// Read the digital input
|
// Read the digital input
|
||||||
int value = digitalRead(pin);
|
int value = digitalRead(pin);
|
||||||
@ -96,6 +98,12 @@ void loop() {
|
|||||||
client.stop();
|
client.stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Performance issue?
|
||||||
|
// ------------------
|
||||||
|
//
|
||||||
|
// EthernetClient is an unbuffered stream, which is not optimal for ArduinoJson.
|
||||||
|
// See: https://arduinojson.org/v7/how-to/improve-speed/
|
||||||
|
|
||||||
// See also
|
// See also
|
||||||
// --------
|
// --------
|
||||||
//
|
//
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
// ArduinoJson - arduinojson.org
|
// ArduinoJson - https://arduinojson.org
|
||||||
// Copyright Benoit Blanchon 2014-2020
|
// Copyright © 2014-2025, Benoit BLANCHON
|
||||||
// MIT License
|
// MIT License
|
||||||
//
|
//
|
||||||
// This example shows how to send a JSON document to a UDP socket.
|
// This example shows how to send a JSON document to a UDP socket.
|
||||||
@ -17,7 +17,7 @@
|
|||||||
// $ ncat -ulp 8888
|
// $ ncat -ulp 8888
|
||||||
// See https://nmap.org/ncat/
|
// See https://nmap.org/ncat/
|
||||||
//
|
//
|
||||||
// https://arduinojson.org/v6/example/udp-beacon/
|
// https://arduinojson.org/v7/example/udp-beacon/
|
||||||
|
|
||||||
#include <ArduinoJson.h>
|
#include <ArduinoJson.h>
|
||||||
#include <Ethernet.h>
|
#include <Ethernet.h>
|
||||||
@ -32,7 +32,8 @@ EthernetUDP udp;
|
|||||||
void setup() {
|
void setup() {
|
||||||
// Initialize serial port
|
// Initialize serial port
|
||||||
Serial.begin(9600);
|
Serial.begin(9600);
|
||||||
while (!Serial) continue;
|
while (!Serial)
|
||||||
|
continue;
|
||||||
|
|
||||||
// Initialize Ethernet libary
|
// Initialize Ethernet libary
|
||||||
if (!Ethernet.begin(mac)) {
|
if (!Ethernet.begin(mac)) {
|
||||||
@ -46,11 +47,10 @@ void setup() {
|
|||||||
|
|
||||||
void loop() {
|
void loop() {
|
||||||
// Allocate a temporary JsonDocument
|
// Allocate a temporary JsonDocument
|
||||||
// Use arduinojson.org/v6/assistant to compute the capacity.
|
JsonDocument doc;
|
||||||
StaticJsonDocument<500> doc;
|
|
||||||
|
|
||||||
// Create the "analog" array
|
// Create the "analog" array
|
||||||
JsonArray analogValues = doc.createNestedArray("analog");
|
JsonArray analogValues = doc["analog"].to<JsonArray>();
|
||||||
for (int pin = 0; pin < 6; pin++) {
|
for (int pin = 0; pin < 6; pin++) {
|
||||||
// Read the analog input
|
// Read the analog input
|
||||||
int value = analogRead(pin);
|
int value = analogRead(pin);
|
||||||
@ -60,7 +60,7 @@ void loop() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Create the "digital" array
|
// Create the "digital" array
|
||||||
JsonArray digitalValues = doc.createNestedArray("digital");
|
JsonArray digitalValues = doc["digital"].to<JsonArray>();
|
||||||
for (int pin = 0; pin < 14; pin++) {
|
for (int pin = 0; pin < 14; pin++) {
|
||||||
// Read the digital input
|
// Read the digital input
|
||||||
int value = digitalRead(pin);
|
int value = digitalRead(pin);
|
||||||
@ -86,6 +86,12 @@ void loop() {
|
|||||||
delay(10000);
|
delay(10000);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Performance issue?
|
||||||
|
// ------------------
|
||||||
|
//
|
||||||
|
// EthernetUDP is an unbuffered stream, which is not optimal for ArduinoJson.
|
||||||
|
// See: https://arduinojson.org/v7/how-to/improve-speed/
|
||||||
|
|
||||||
// See also
|
// See also
|
||||||
// --------
|
// --------
|
||||||
//
|
//
|
||||||
|
@ -1,39 +1,24 @@
|
|||||||
// ArduinoJson - arduinojson.org
|
// ArduinoJson - https://arduinojson.org
|
||||||
// Copyright Benoit Blanchon 2014-2020
|
// Copyright © 2014-2025, Benoit BLANCHON
|
||||||
// MIT License
|
// MIT License
|
||||||
//
|
//
|
||||||
// This example shows how to deserialize a MessagePack document with
|
// This example shows how to deserialize a MessagePack document with
|
||||||
// ArduinoJson.
|
// ArduinoJson.
|
||||||
//
|
//
|
||||||
// https://arduinojson.org/v6/example/msgpack-parser/
|
// https://arduinojson.org/v7/example/msgpack-parser/
|
||||||
|
|
||||||
#include <ArduinoJson.h>
|
#include <ArduinoJson.h>
|
||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
// Initialize serial port
|
// Initialize serial port
|
||||||
Serial.begin(9600);
|
Serial.begin(9600);
|
||||||
while (!Serial) continue;
|
while (!Serial)
|
||||||
|
continue;
|
||||||
|
|
||||||
// Allocate the JSON document
|
// Allocate the JSON document
|
||||||
//
|
JsonDocument doc;
|
||||||
// Inside the brackets, 200 is the capacity of the memory pool in bytes.
|
|
||||||
// Don't forget to change this value to match your JSON document.
|
|
||||||
// Use arduinojson.org/v6/assistant to compute the capacity.
|
|
||||||
StaticJsonDocument<200> doc;
|
|
||||||
|
|
||||||
// StaticJsonObject allocates memory on the stack, it can be
|
// The MessagePack input string
|
||||||
// replaced by DynamicJsonObject which allocates in the heap.
|
|
||||||
//
|
|
||||||
// DynamicJsonObject doc(200);
|
|
||||||
|
|
||||||
// MessagePack input string.
|
|
||||||
//
|
|
||||||
// Using a char[], as shown here, enables the "zero-copy" mode. This mode uses
|
|
||||||
// the minimal amount of memory because the JsonDocument stores pointers to
|
|
||||||
// the input buffer.
|
|
||||||
// If you use another type of input, ArduinoJson must copy the strings from
|
|
||||||
// the input to the JsonDocument, so you need to increase the capacity of the
|
|
||||||
// JsonDocument.
|
|
||||||
uint8_t input[] = {131, 166, 115, 101, 110, 115, 111, 114, 163, 103, 112, 115,
|
uint8_t input[] = {131, 166, 115, 101, 110, 115, 111, 114, 163, 103, 112, 115,
|
||||||
164, 116, 105, 109, 101, 206, 80, 147, 50, 248, 164, 100,
|
164, 116, 105, 109, 101, 206, 80, 147, 50, 248, 164, 100,
|
||||||
97, 116, 97, 146, 203, 64, 72, 96, 199, 58, 188, 148,
|
97, 116, 97, 146, 203, 64, 72, 96, 199, 58, 188, 148,
|
||||||
@ -45,16 +30,17 @@ void setup() {
|
|||||||
// "data": [48.75608, 2.302038]
|
// "data": [48.75608, 2.302038]
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
// Parse the input
|
||||||
DeserializationError error = deserializeMsgPack(doc, input);
|
DeserializationError error = deserializeMsgPack(doc, input);
|
||||||
|
|
||||||
// Test if parsing succeeded.
|
// Test if parsing succeeded
|
||||||
if (error) {
|
if (error) {
|
||||||
Serial.print("deserializeMsgPack() failed: ");
|
Serial.print("deserializeMsgPack() failed: ");
|
||||||
Serial.println(error.c_str());
|
Serial.println(error.f_str());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fetch values.
|
// Fetch the values
|
||||||
//
|
//
|
||||||
// Most of the time, you can rely on the implicit casts.
|
// Most of the time, you can rely on the implicit casts.
|
||||||
// In other case, you can do doc["time"].as<long>();
|
// In other case, you can do doc["time"].as<long>();
|
||||||
@ -63,7 +49,7 @@ void setup() {
|
|||||||
double latitude = doc["data"][0];
|
double latitude = doc["data"][0];
|
||||||
double longitude = doc["data"][1];
|
double longitude = doc["data"][1];
|
||||||
|
|
||||||
// Print values.
|
// Print the values
|
||||||
Serial.println(sensor);
|
Serial.println(sensor);
|
||||||
Serial.println(time);
|
Serial.println(time);
|
||||||
Serial.println(latitude, 6);
|
Serial.println(latitude, 6);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
// ArduinoJson - arduinojson.org
|
// ArduinoJson - https://arduinojson.org
|
||||||
// Copyright Benoit Blanchon 2014-2020
|
// Copyright © 2014-2025, Benoit BLANCHON
|
||||||
// MIT License
|
// MIT License
|
||||||
//
|
//
|
||||||
// This example shows the different ways you can use Flash strings with
|
// This example shows the different ways you can use Flash strings with
|
||||||
@ -9,49 +9,40 @@
|
|||||||
// JsonDocument. Prefer plain old char*, as they are more efficient in term of
|
// JsonDocument. Prefer plain old char*, as they are more efficient in term of
|
||||||
// code size, speed, and memory usage.
|
// code size, speed, and memory usage.
|
||||||
//
|
//
|
||||||
// https://arduinojson.org/v6/example/progmem/
|
// https://arduinojson.org/v7/example/progmem/
|
||||||
|
|
||||||
#include <ArduinoJson.h>
|
#include <ArduinoJson.h>
|
||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
#ifdef PROGMEM // <- check that Flash strings are supported
|
JsonDocument doc;
|
||||||
|
|
||||||
DynamicJsonDocument doc(1024);
|
|
||||||
|
|
||||||
// You can use a Flash String as your JSON input.
|
// You can use a Flash String as your JSON input.
|
||||||
// WARNING: the strings in the input will be duplicated in the JsonDocument.
|
// WARNING: the strings in the input will be duplicated in the JsonDocument.
|
||||||
deserializeJson(doc, F("{\"sensor\":\"gps\",\"time\":1351824120,"
|
deserializeJson(doc, F("{\"sensor\":\"gps\",\"time\":1351824120,"
|
||||||
"\"data\":[48.756080,2.302038]}"));
|
"\"data\":[48.756080,2.302038]}"));
|
||||||
JsonObject obj = doc.as<JsonObject>();
|
|
||||||
|
|
||||||
// You can use a Flash String to get an element of a JsonObject
|
// You can use a Flash String as a key to get a member from JsonDocument
|
||||||
// No duplication is done.
|
// No duplication is done.
|
||||||
long time = obj[F("time")];
|
long time = doc[F("time")];
|
||||||
|
|
||||||
// You can use a Flash String to set an element of a JsonObject
|
// You can use a Flash String as a key to set a member of a JsonDocument
|
||||||
// WARNING: the content of the Flash String will be duplicated in the
|
// WARNING: the content of the Flash String will be duplicated in the
|
||||||
// JsonDocument.
|
// JsonDocument.
|
||||||
obj[F("time")] = time;
|
doc[F("time")] = time;
|
||||||
|
|
||||||
// You can set a Flash String to a JsonObject or JsonArray:
|
// You can set a Flash String as the content of a JsonVariant
|
||||||
// WARNING: the content of the Flash String will be duplicated in the
|
// WARNING: the content of the Flash String will be duplicated in the
|
||||||
// JsonDocument.
|
// JsonDocument.
|
||||||
obj["sensor"] = F("gps");
|
doc["sensor"] = F("gps");
|
||||||
|
|
||||||
// It works with serialized() too:
|
// It works with serialized() too:
|
||||||
obj["sensor"] = serialized(F("\"gps\""));
|
doc["sensor"] = serialized(F("\"gps\""));
|
||||||
obj["sensor"] = serialized(F("\xA3gps"), 3);
|
doc["sensor"] = serialized(F("\xA3gps"), 3);
|
||||||
|
|
||||||
// You can compare the content of a JsonVariant to a Flash String
|
// You can compare the content of a JsonVariant to a Flash String
|
||||||
if (obj["sensor"] == F("gps")) {
|
if (doc["sensor"] == F("gps")) {
|
||||||
// ...
|
// ...
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
#warning PROGMEM is not supported on this platform
|
|
||||||
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void loop() {
|
void loop() {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
// ArduinoJson - arduinojson.org
|
// ArduinoJson - https://arduinojson.org
|
||||||
// Copyright Benoit Blanchon 2014-2020
|
// Copyright © 2014-2025, Benoit BLANCHON
|
||||||
// MIT License
|
// MIT License
|
||||||
//
|
//
|
||||||
// This example shows the different ways you can use String with ArduinoJson.
|
// This example shows the different ways you can use String with ArduinoJson.
|
||||||
@ -8,50 +8,49 @@
|
|||||||
// JsonDocument. Prefer plain old char[], as they are more efficient in term of
|
// JsonDocument. Prefer plain old char[], as they are more efficient in term of
|
||||||
// code size, speed, and memory usage.
|
// code size, speed, and memory usage.
|
||||||
//
|
//
|
||||||
// https://arduinojson.org/v6/example/string/
|
// https://arduinojson.org/v7/example/string/
|
||||||
|
|
||||||
#include <ArduinoJson.h>
|
#include <ArduinoJson.h>
|
||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
DynamicJsonDocument doc(1024);
|
JsonDocument doc;
|
||||||
|
|
||||||
// You can use a String as your JSON input.
|
// You can use a String as your JSON input.
|
||||||
// WARNING: the string in the input will be duplicated in the JsonDocument.
|
// WARNING: the string in the input will be duplicated in the JsonDocument.
|
||||||
String input =
|
String input =
|
||||||
"{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
|
"{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
|
||||||
deserializeJson(doc, input);
|
deserializeJson(doc, input);
|
||||||
JsonObject obj = doc.as<JsonObject>();
|
|
||||||
|
|
||||||
// You can use a String to get an element of a JsonObject
|
// You can use a String as a key to get a member from JsonDocument
|
||||||
// No duplication is done.
|
// No duplication is done.
|
||||||
long time = obj[String("time")];
|
long time = doc[String("time")];
|
||||||
|
|
||||||
// You can use a String to set an element of a JsonObject
|
// You can use a String as a key to set a member of a JsonDocument
|
||||||
// WARNING: the content of the String will be duplicated in the JsonDocument.
|
// WARNING: the content of the String will be duplicated in the JsonDocument.
|
||||||
obj[String("time")] = time;
|
doc[String("time")] = time;
|
||||||
|
|
||||||
// You can get a String from a JsonObject or JsonArray:
|
// You can get the content of a JsonVariant as a String
|
||||||
// No duplication is done, at least not in the JsonDocument.
|
// No duplication is done, at least not in the JsonDocument.
|
||||||
String sensor = obj["sensor"];
|
String sensor = doc["sensor"];
|
||||||
|
|
||||||
// Unfortunately, the following doesn't work (issue #118):
|
// Unfortunately, the following doesn't work (issue #118):
|
||||||
// sensor = obj["sensor"]; // <- error "ambiguous overload for 'operator='"
|
// sensor = doc["sensor"]; // <- error "ambiguous overload for 'operator='"
|
||||||
// As a workaround, you need to replace by:
|
// As a workaround, you need to replace by:
|
||||||
sensor = obj["sensor"].as<String>();
|
sensor = doc["sensor"].as<String>();
|
||||||
|
|
||||||
// You can set a String to a JsonObject or JsonArray:
|
// You can set a String as the content of a JsonVariant
|
||||||
// WARNING: the content of the String will be duplicated in the JsonDocument.
|
// WARNING: the content of the String will be duplicated in the JsonDocument.
|
||||||
obj["sensor"] = sensor;
|
doc["sensor"] = sensor;
|
||||||
|
|
||||||
// It works with serialized() too:
|
// It works with serialized() too:
|
||||||
obj["sensor"] = serialized(sensor);
|
doc["sensor"] = serialized(sensor);
|
||||||
|
|
||||||
// You can also concatenate strings
|
// You can also concatenate strings
|
||||||
// WARNING: the content of the String will be duplicated in the JsonDocument.
|
// WARNING: the content of the String will be duplicated in the JsonDocument.
|
||||||
obj[String("sen") + "sor"] = String("gp") + "s";
|
doc[String("sen") + "sor"] = String("gp") + "s";
|
||||||
|
|
||||||
// You can compare the content of a JsonObject with a String
|
// You can compare the content of a JsonObject with a String
|
||||||
if (obj["sensor"] == sensor) {
|
if (doc["sensor"] == sensor) {
|
||||||
// ...
|
// ...
|
||||||
}
|
}
|
||||||
|
|
||||||
|
4
extras/ArduinoJsonConfig.cmake.in
Normal file
4
extras/ArduinoJsonConfig.cmake.in
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
@PACKAGE_INIT@
|
||||||
|
|
||||||
|
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
|
||||||
|
check_required_components("@PROJECT_NAME@")
|
112
extras/CompileOptions.cmake
Normal file
112
extras/CompileOptions.cmake
Normal file
@ -0,0 +1,112 @@
|
|||||||
|
if(NOT DEFINED COVERAGE)
|
||||||
|
set(COVERAGE OFF)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
|
||||||
|
add_compile_options(
|
||||||
|
-pedantic
|
||||||
|
-Wall
|
||||||
|
-Wcast-align
|
||||||
|
-Wcast-qual
|
||||||
|
-Wconversion
|
||||||
|
-Wctor-dtor-privacy
|
||||||
|
-Wdisabled-optimization
|
||||||
|
-Werror
|
||||||
|
-Wextra
|
||||||
|
-Wformat=2
|
||||||
|
-Winit-self
|
||||||
|
-Wmissing-include-dirs
|
||||||
|
-Wnon-virtual-dtor
|
||||||
|
-Wold-style-cast
|
||||||
|
-Woverloaded-virtual
|
||||||
|
-Wparentheses
|
||||||
|
-Wredundant-decls
|
||||||
|
-Wshadow
|
||||||
|
-Wsign-conversion
|
||||||
|
-Wsign-promo
|
||||||
|
-Wstrict-aliasing
|
||||||
|
-Wundef
|
||||||
|
)
|
||||||
|
|
||||||
|
if(${COVERAGE})
|
||||||
|
set(CMAKE_CXX_FLAGS "-fprofile-arcs -ftest-coverage")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||||
|
if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9) AND(NOT ${COVERAGE}))
|
||||||
|
add_compile_options(-g -Og)
|
||||||
|
else() # GCC 4.8
|
||||||
|
add_compile_options(
|
||||||
|
-g
|
||||||
|
-O0 # GCC 4.8 doesn't support -Og
|
||||||
|
-Wno-shadow # allow the same name for a function parameter and a member functions
|
||||||
|
-Wp,-w # Disable preprocessing warnings (see below)
|
||||||
|
)
|
||||||
|
# GCC 4.8 doesn't support __has_include, so we need to help him
|
||||||
|
add_definitions(
|
||||||
|
-DARDUINOJSON_ENABLE_STD_STRING=1
|
||||||
|
-DARDUINOJSON_ENABLE_STD_STREAM=1
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
add_compile_options(
|
||||||
|
-Wstrict-null-sentinel
|
||||||
|
-Wno-vla # Allow VLA in tests
|
||||||
|
)
|
||||||
|
add_definitions(-DHAS_VARIABLE_LENGTH_ARRAY)
|
||||||
|
|
||||||
|
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.5)
|
||||||
|
add_compile_options(-Wlogical-op) # the flag exists in 4.4 but is buggy
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.6)
|
||||||
|
add_compile_options(-Wnoexcept)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||||
|
add_compile_options(
|
||||||
|
-Wc++11-compat
|
||||||
|
-Wdeprecated-register
|
||||||
|
-Wno-vla-extension # Allow VLA in tests
|
||||||
|
)
|
||||||
|
add_definitions(
|
||||||
|
-DHAS_VARIABLE_LENGTH_ARRAY
|
||||||
|
-DSUBSCRIPT_CONFLICTS_WITH_BUILTIN_OPERATOR
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||||
|
add_compile_options(-stdlib=libc++)
|
||||||
|
link_libraries(c++ m)
|
||||||
|
|
||||||
|
if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.0) AND(NOT ${COVERAGE}))
|
||||||
|
add_compile_options(-g -Og)
|
||||||
|
else()
|
||||||
|
add_compile_options(-g -O0)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
|
||||||
|
if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0) AND(NOT ${COVERAGE}))
|
||||||
|
add_compile_options(-g -Og)
|
||||||
|
else()
|
||||||
|
add_compile_options(-g -O0)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(MSVC)
|
||||||
|
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
||||||
|
add_compile_options(
|
||||||
|
/W4 # Set warning level
|
||||||
|
/WX # Treats all compiler warnings as errors.
|
||||||
|
/Zc:__cplusplus # Enable updated __cplusplus macro
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(MINGW)
|
||||||
|
# Static link on MinGW to avoid linking with the wrong DLLs when multiple
|
||||||
|
# versions are installed.
|
||||||
|
add_link_options(-static)
|
||||||
|
endif()
|
@ -1,20 +0,0 @@
|
|||||||
#!/bin/bash -eux
|
|
||||||
|
|
||||||
/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16
|
|
||||||
sleep 3
|
|
||||||
export DISPLAY=:1.0
|
|
||||||
|
|
||||||
mkdir -p /tmp/arduino
|
|
||||||
curl -sS http://downloads.arduino.cc/arduino-$VERSION-linux64.tar.xz | tar xJ -C /tmp/arduino --strip 1 ||
|
|
||||||
curl -sS http://downloads.arduino.cc/arduino-$VERSION-linux64.tgz | tar xz -C /tmp/arduino --strip 1
|
|
||||||
export PATH=$PATH:/tmp/arduino/
|
|
||||||
|
|
||||||
if [[ "$BOARD" =~ "arduino:samd:" ]]; then
|
|
||||||
arduino --install-boards arduino:samd
|
|
||||||
fi
|
|
||||||
|
|
||||||
ln -s $PWD /tmp/arduino/libraries/ArduinoJson
|
|
||||||
|
|
||||||
for EXAMPLE in $PWD/examples/*/*.ino; do
|
|
||||||
arduino --verify --board $BOARD $EXAMPLE
|
|
||||||
done
|
|
@ -1,14 +0,0 @@
|
|||||||
#!/bin/sh -ex
|
|
||||||
|
|
||||||
export CC="$_CC"
|
|
||||||
export CXX="$_CXX"
|
|
||||||
|
|
||||||
if [ -n "$SANITIZE" ]; then
|
|
||||||
export CXXFLAGS="-fsanitize=$SANITIZE"
|
|
||||||
BUILD_TYPE="Debug"
|
|
||||||
else
|
|
||||||
BUILD_TYPE="Release"
|
|
||||||
fi
|
|
||||||
|
|
||||||
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .
|
|
||||||
cmake --build .
|
|
@ -1,9 +0,0 @@
|
|||||||
#!/bin/sh -eux
|
|
||||||
|
|
||||||
cmake -DCOVERAGE=true .
|
|
||||||
make
|
|
||||||
make test
|
|
||||||
|
|
||||||
pip install --user cpp-coveralls 'requests[security]'
|
|
||||||
pwd
|
|
||||||
coveralls --include 'src' --gcov-options '\-lp'
|
|
8
extras/ci/espidf/CMakeLists.txt
Normal file
8
extras/ci/espidf/CMakeLists.txt
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
# ArduinoJson - https://arduinojson.org
|
||||||
|
# Copyright © 2014-2025, Benoit BLANCHON
|
||||||
|
# MIT License
|
||||||
|
|
||||||
|
cmake_minimum_required(VERSION 3.5)
|
||||||
|
|
||||||
|
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
|
||||||
|
project(example)
|
8
extras/ci/espidf/main/CMakeLists.txt
Normal file
8
extras/ci/espidf/main/CMakeLists.txt
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
# ArduinoJson - https://arduinojson.org
|
||||||
|
# Copyright © 2014-2025, Benoit BLANCHON
|
||||||
|
# MIT License
|
||||||
|
|
||||||
|
idf_component_register(
|
||||||
|
SRCS "main.cpp"
|
||||||
|
INCLUDE_DIRS ""
|
||||||
|
)
|
4
extras/ci/espidf/main/component.mk
Normal file
4
extras/ci/espidf/main/component.mk
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
#
|
||||||
|
# "main" pseudo-component makefile.
|
||||||
|
#
|
||||||
|
# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
|
16
extras/ci/espidf/main/main.cpp
Normal file
16
extras/ci/espidf/main/main.cpp
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
// ArduinoJson - https://arduinojson.org
|
||||||
|
// Copyright © 2014-2025, Benoit BLANCHON
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#include <ArduinoJson.h>
|
||||||
|
|
||||||
|
extern "C" void app_main() {
|
||||||
|
char buffer[256];
|
||||||
|
JsonDocument doc;
|
||||||
|
|
||||||
|
doc["hello"] = "world";
|
||||||
|
serializeJson(doc, buffer);
|
||||||
|
deserializeJson(doc, buffer);
|
||||||
|
serializeMsgPack(doc, buffer);
|
||||||
|
deserializeMsgPack(doc, buffer);
|
||||||
|
}
|
@ -1,26 +0,0 @@
|
|||||||
#!/bin/bash -eux
|
|
||||||
|
|
||||||
ROOT_DIR=$(dirname $0)/../../
|
|
||||||
INCLUDE_DIR=${ROOT_DIR}/src/
|
|
||||||
FUZZING_DIR=${ROOT_DIR}/extras/fuzzing/
|
|
||||||
CXXFLAGS="-g -fprofile-instr-generate -fcoverage-mapping -fsanitize=address,undefined,fuzzer -fno-sanitize-recover=all"
|
|
||||||
|
|
||||||
fuzz() {
|
|
||||||
NAME="$1"
|
|
||||||
FUZZER="${NAME}_fuzzer"
|
|
||||||
FUZZER_CPP="${FUZZING_DIR}/${NAME}_fuzzer.cpp"
|
|
||||||
CORPUS_DIR="${FUZZING_DIR}/${NAME}_corpus"
|
|
||||||
SEED_CORPUS_DIR="${FUZZING_DIR}/${NAME}_seed_corpus"
|
|
||||||
|
|
||||||
clang++-${CLANG} ${CXXFLAGS} -o ${FUZZER} -I$INCLUDE_DIR ${FUZZER_CPP}
|
|
||||||
|
|
||||||
export ASAN_OPTIONS="detect_leaks=0"
|
|
||||||
export LLVM_PROFILE_FILE="${FUZZER}.profraw"
|
|
||||||
./${FUZZER} "$CORPUS_DIR" "$SEED_CORPUS_DIR" -max_total_time=30 -timeout=1
|
|
||||||
|
|
||||||
llvm-profdata-${CLANG} merge -sparse ${LLVM_PROFILE_FILE} -o ${FUZZER}.profdata
|
|
||||||
llvm-cov-${CLANG} report ./${FUZZER} -instr-profile=${FUZZER}.profdata
|
|
||||||
}
|
|
||||||
|
|
||||||
fuzz json
|
|
||||||
fuzz msgpack
|
|
10
extras/ci/particle.sh
Executable file
10
extras/ci/particle.sh
Executable file
@ -0,0 +1,10 @@
|
|||||||
|
#!/bin/sh -ex
|
||||||
|
|
||||||
|
BOARD=$1
|
||||||
|
|
||||||
|
cd "$(dirname "$0")/../../"
|
||||||
|
|
||||||
|
cp extras/particle/src/smocktest.ino src/
|
||||||
|
cp extras/particle/project.properties ./
|
||||||
|
|
||||||
|
particle compile "$BOARD"
|
@ -1,20 +0,0 @@
|
|||||||
#!/bin/sh -eux
|
|
||||||
|
|
||||||
pip install --user platformio
|
|
||||||
|
|
||||||
case $BOARD in
|
|
||||||
uno)
|
|
||||||
platformio lib install 868 # SD library
|
|
||||||
platformio lib install 872 # Ethernet library
|
|
||||||
;;
|
|
||||||
esp01)
|
|
||||||
platformio lib uninstall 161 || true
|
|
||||||
platformio lib uninstall 868 || true
|
|
||||||
platformio lib uninstall 872 || true
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
for EXAMPLE in $PWD/examples/*/*.ino;
|
|
||||||
do
|
|
||||||
platformio ci $EXAMPLE -l '.' -b $BOARD
|
|
||||||
done
|
|
@ -1,4 +0,0 @@
|
|||||||
#!/bin/sh -ex
|
|
||||||
|
|
||||||
"$(dirname "$0")/build.sh"
|
|
||||||
ctest --output-on-failure .
|
|
18
extras/conf_test/avr.cpp
Normal file
18
extras/conf_test/avr.cpp
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
#include <ArduinoJson.h>
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_ENABLE_PROGMEM == 1, "ARDUINOJSON_ENABLE_PROGMEM");
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_USE_LONG_LONG == 0, "ARDUINOJSON_USE_LONG_LONG");
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_SLOT_ID_SIZE == 1, "ARDUINOJSON_SLOT_ID_SIZE");
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_POOL_CAPACITY == 16, "ARDUINOJSON_POOL_CAPACITY");
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_USE_DOUBLE == 0, "ARDUINOJSON_USE_DOUBLE");
|
||||||
|
|
||||||
|
static_assert(sizeof(ArduinoJson::detail::VariantData) == 6, "slot size");
|
||||||
|
|
||||||
|
void setup() {}
|
||||||
|
void loop() {}
|
16
extras/conf_test/esp8266.cpp
Normal file
16
extras/conf_test/esp8266.cpp
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
#include <ArduinoJson.h>
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG");
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_SLOT_ID_SIZE == 2, "ARDUINOJSON_SLOT_ID_SIZE");
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_POOL_CAPACITY == 128, "ARDUINOJSON_POOL_CAPACITY");
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE");
|
||||||
|
|
||||||
|
static_assert(sizeof(VariantData) == 8, "slot size");
|
||||||
|
|
||||||
|
void setup() {}
|
||||||
|
void loop() {}
|
15
extras/conf_test/x64.cpp
Normal file
15
extras/conf_test/x64.cpp
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
#include <ArduinoJson.h>
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG");
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_SLOT_ID_SIZE == 4, "ARDUINOJSON_SLOT_ID_SIZE");
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_POOL_CAPACITY == 256, "ARDUINOJSON_POOL_CAPACITY");
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE");
|
||||||
|
|
||||||
|
static_assert(sizeof(ArduinoJson::detail::VariantData) == 16, "slot size");
|
||||||
|
|
||||||
|
int main() {}
|
15
extras/conf_test/x86.cpp
Normal file
15
extras/conf_test/x86.cpp
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
#include <ArduinoJson.h>
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG");
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_SLOT_ID_SIZE == 2, "ARDUINOJSON_SLOT_ID_SIZE");
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_POOL_CAPACITY == 128, "ARDUINOJSON_POOL_CAPACITY");
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");
|
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE");
|
||||||
|
|
||||||
|
static_assert(sizeof(ArduinoJson::detail::VariantData) == 8, "slot size");
|
||||||
|
|
||||||
|
int main() {}
|
@ -1,17 +1,67 @@
|
|||||||
# ArduinoJson - arduinojson.org
|
# ArduinoJson - https://arduinojson.org
|
||||||
# Copyright Benoit Blanchon 2014-2020
|
# Copyright © 2014-2025, Benoit BLANCHON
|
||||||
# MIT License
|
# MIT License
|
||||||
|
|
||||||
|
set(CMAKE_CXX_STANDARD 11)
|
||||||
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
add_compile_options(-D_CRT_SECURE_NO_WARNINGS)
|
add_compile_options(-D_CRT_SECURE_NO_WARNINGS)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_executable(msgpack_fuzzer
|
add_executable(msgpack_reproducer
|
||||||
msgpack_fuzzer.cpp
|
msgpack_fuzzer.cpp
|
||||||
fuzzer_main.cpp
|
reproducer.cpp
|
||||||
|
)
|
||||||
|
target_link_libraries(msgpack_reproducer
|
||||||
|
ArduinoJson
|
||||||
)
|
)
|
||||||
|
|
||||||
add_executable(json_fuzzer
|
add_executable(json_reproducer
|
||||||
json_fuzzer.cpp
|
json_fuzzer.cpp
|
||||||
fuzzer_main.cpp
|
reproducer.cpp
|
||||||
)
|
)
|
||||||
|
target_link_libraries(json_reproducer
|
||||||
|
ArduinoJson
|
||||||
|
)
|
||||||
|
|
||||||
|
macro(add_fuzzer name)
|
||||||
|
set(FUZZER "${name}_fuzzer")
|
||||||
|
set(CORPUS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${name}_corpus")
|
||||||
|
set(SEED_CORPUS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${name}_seed_corpus")
|
||||||
|
add_executable("${FUZZER}"
|
||||||
|
"${name}_fuzzer.cpp"
|
||||||
|
)
|
||||||
|
target_link_libraries("${FUZZER}"
|
||||||
|
ArduinoJson
|
||||||
|
)
|
||||||
|
set_target_properties("${FUZZER}"
|
||||||
|
PROPERTIES
|
||||||
|
COMPILE_FLAGS "-fprofile-instr-generate -fcoverage-mapping -fsanitize=fuzzer -fno-sanitize-recover=all"
|
||||||
|
LINK_FLAGS "-fprofile-instr-generate -fcoverage-mapping -fsanitize=fuzzer -fno-sanitize-recover=all"
|
||||||
|
)
|
||||||
|
|
||||||
|
add_test(
|
||||||
|
NAME "${FUZZER}"
|
||||||
|
COMMAND "${FUZZER}" "${CORPUS_DIR}" "${SEED_CORPUS_DIR}" -max_total_time=5 -timeout=1
|
||||||
|
)
|
||||||
|
|
||||||
|
set_tests_properties("${FUZZER}"
|
||||||
|
PROPERTIES
|
||||||
|
LABELS "Fuzzing"
|
||||||
|
)
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
# Needs Clang 6+ to compile
|
||||||
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 6)
|
||||||
|
if(DEFINED ENV{GITHUB_ACTIONS} AND CMAKE_CXX_COMPILER_VERSION MATCHES "^11\\.")
|
||||||
|
# Clang 11 fails on GitHub Actions with the following error:
|
||||||
|
# > ERROR: UndefinedBehaviorSanitizer failed to allocate 0x0 (0) bytes of SetAlternateSignalStack (error code: 22)
|
||||||
|
# > Sanitizer CHECK failed: /build/llvm-toolchain-11-mnvtwk/llvm-toolchain-11-11.1.0/compiler-rt/lib/sanitizer_common/sanitizer_common.cpp:54 ((0 && "unable to mmap")) != (0) (0, 0)
|
||||||
|
message(WARNING "Fuzzing is disabled on GitHub Actions to workaround a bug in Clang 11")
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
add_fuzzer(json)
|
||||||
|
add_fuzzer(msgpack)
|
||||||
|
endif()
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# CAUTION: this file is invoked by https://github.com/google/oss-fuzz
|
# CAUTION: this file is invoked by https://github.com/google/oss-fuzz
|
||||||
|
|
||||||
CXXFLAGS += -I../../src -DARDUINOJSON_DEBUG
|
CXXFLAGS += -I../../src -DARDUINOJSON_DEBUG=1 -std=c++11
|
||||||
|
|
||||||
all: \
|
all: \
|
||||||
$(OUT)/json_fuzzer \
|
$(OUT)/json_fuzzer \
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include <ArduinoJson.h>
|
#include <ArduinoJson.h>
|
||||||
|
|
||||||
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
|
||||||
DynamicJsonDocument doc(4096);
|
JsonDocument doc;
|
||||||
DeserializationError error = deserializeJson(doc, data, size);
|
DeserializationError error = deserializeJson(doc, data, size);
|
||||||
if (!error) {
|
if (!error) {
|
||||||
std::string json;
|
std::string json;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include <ArduinoJson.h>
|
#include <ArduinoJson.h>
|
||||||
|
|
||||||
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
|
||||||
DynamicJsonDocument doc(4096);
|
JsonDocument doc;
|
||||||
DeserializationError error = deserializeMsgPack(doc, data, size);
|
DeserializationError error = deserializeMsgPack(doc, data, size);
|
||||||
if (!error) {
|
if (!error) {
|
||||||
std::string json;
|
std::string json;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
// ArduinoJson - arduinojson.org
|
// ArduinoJson - https://arduinojson.org
|
||||||
// Copyright Benoit Blanchon 2014-2020
|
// Copyright © 2014-2025, Benoit BLANCHON
|
||||||
// MIT License
|
// MIT License
|
||||||
|
|
||||||
// This file is NOT use by Google's OSS fuzz
|
// This file is NOT use by Google's OSS fuzz
|
||||||
@ -21,7 +21,7 @@ std::vector<uint8_t> read(const char* path) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fseek(f, 0, SEEK_END);
|
fseek(f, 0, SEEK_END);
|
||||||
size_t size = ftell(f);
|
size_t size = static_cast<size_t>(ftell(f));
|
||||||
fseek(f, 0, SEEK_SET);
|
fseek(f, 0, SEEK_SET);
|
||||||
|
|
||||||
std::vector<uint8_t> buffer(size);
|
std::vector<uint8_t> buffer(size);
|
1
extras/particle/project.properties
Normal file
1
extras/particle/project.properties
Normal file
@ -0,0 +1 @@
|
|||||||
|
name=ArduinoJsonCI
|
5
extras/particle/src/smocktest.ino
Normal file
5
extras/particle/src/smocktest.ino
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
#include "ArduinoJson.h"
|
||||||
|
|
||||||
|
void setup() {}
|
||||||
|
|
||||||
|
void loop() {}
|
@ -1,20 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
TAG=$(git describe)
|
|
||||||
OUTPUT="ArduinoJson-$TAG.zip"
|
|
||||||
|
|
||||||
cd $(dirname $0)/../../..
|
|
||||||
|
|
||||||
# remove existing file
|
|
||||||
rm -f $OUTPUT
|
|
||||||
|
|
||||||
# create zip
|
|
||||||
7z a $OUTPUT \
|
|
||||||
ArduinoJson/CHANGELOG.md \
|
|
||||||
ArduinoJson/examples \
|
|
||||||
ArduinoJson/src \
|
|
||||||
ArduinoJson/keywords.txt \
|
|
||||||
ArduinoJson/library.properties \
|
|
||||||
ArduinoJson/LICENSE.md \
|
|
||||||
ArduinoJson/README.md \
|
|
||||||
ArduinoJson/ArduinoJson.h
|
|
@ -2,11 +2,10 @@
|
|||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
TAG=$(git describe)
|
RE_RELATIVE_INCLUDE='^#[[:space:]]*include[[:space:]]*"(.*)"'
|
||||||
RE_RELATIVE_INCLUDE='^#include[[:space:]]*"(.*)"'
|
RE_ABSOLUTE_INCLUDE='^#[[:space:]]*include[[:space:]]*<(ArduinoJson/.*)>'
|
||||||
RE_ABSOLUTE_INCLUDE='^#include[[:space:]]*<(ArduinoJson/.*)>'
|
RE_SYSTEM_INCLUDE='^#[[:space:]]*include[[:space:]]*<(.*)>'
|
||||||
RE_SYSTEM_INCLUDE='^#include[[:space:]]*<(.*)>'
|
RE_EMPTY='^(#[[:space:]]*pragma[[:space:]]+once)?[[:space:]]*(//.*)?$'
|
||||||
RE_EMPTY='^(#pragma[[:space:]]+once)?[[:space:]]*(//.*)?$'
|
|
||||||
SRC_DIRECTORY="$(realpath "$(dirname $0)/../../src")"
|
SRC_DIRECTORY="$(realpath "$(dirname $0)/../../src")"
|
||||||
|
|
||||||
|
|
||||||
@ -54,29 +53,13 @@ process()
|
|||||||
}
|
}
|
||||||
|
|
||||||
simplify_namespaces() {
|
simplify_namespaces() {
|
||||||
perl -p0i -e 's|\} // namespace ARDUINOJSON_NAMESPACE\r?\nnamespace ARDUINOJSON_NAMESPACE \{\r?\n||igs' "$1"
|
perl -p0i -e 's|ARDUINOJSON_END_PUBLIC_NAMESPACE\r?\nARDUINOJSON_BEGIN_PUBLIC_NAMESPACE\r?\n||igs' "$1"
|
||||||
|
perl -p0i -e 's|ARDUINOJSON_END_PRIVATE_NAMESPACE\r?\nARDUINOJSON_BEGIN_PRIVATE_NAMESPACE\r?\n||igs' "$1"
|
||||||
rm -f "$1.bak"
|
rm -f "$1.bak"
|
||||||
}
|
}
|
||||||
|
|
||||||
cd $(dirname $0)/../..
|
|
||||||
INCLUDED=()
|
INCLUDED=()
|
||||||
process src/ArduinoJson.h true > ../ArduinoJson-$TAG.h
|
INPUT=$1
|
||||||
simplify_namespaces ../ArduinoJson-$TAG.h
|
OUTPUT=$2
|
||||||
g++ -x c++ -c -o ../smoketest.o - <<END
|
process "$INPUT" true > "$OUTPUT"
|
||||||
#include "../ArduinoJson-$TAG.h"
|
simplify_namespaces "$OUTPUT"
|
||||||
int main() {
|
|
||||||
StaticJsonDocument<300> doc;
|
|
||||||
deserializeJson(doc, "{}");
|
|
||||||
}
|
|
||||||
END
|
|
||||||
|
|
||||||
INCLUDED=()
|
|
||||||
process src/ArduinoJson.hpp true > ../ArduinoJson-$TAG.hpp
|
|
||||||
simplify_namespaces ../ArduinoJson-$TAG.hpp
|
|
||||||
g++ -x c++ -c -o ../smoketest.o - <<END
|
|
||||||
#include "../ArduinoJson-$TAG.hpp"
|
|
||||||
int main() {
|
|
||||||
ArduinoJson::StaticJsonDocument<300> doc;
|
|
||||||
ArduinoJson::deserializeJson(doc, "{}");
|
|
||||||
}
|
|
||||||
END
|
|
||||||
|
@ -1,29 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
export PATH="$PATH:/Applications/CMake.app/Contents/bin/"
|
|
||||||
|
|
||||||
cd $(dirname $0)/../..
|
|
||||||
ROOT=$(pwd)
|
|
||||||
|
|
||||||
mkdir "build"
|
|
||||||
cd build
|
|
||||||
BUILD=$(pwd)
|
|
||||||
|
|
||||||
build-env()
|
|
||||||
{
|
|
||||||
cd $BUILD
|
|
||||||
mkdir "$1"
|
|
||||||
cd "$1"
|
|
||||||
cmake "$ROOT" -G "$2"
|
|
||||||
}
|
|
||||||
|
|
||||||
if [[ $(uname) == MINGW* ]]
|
|
||||||
then
|
|
||||||
build-env "Make" "MinGW Makefiles"
|
|
||||||
build-env "SublimeText" "Sublime Text 2 - Ninja"
|
|
||||||
build-env "VisualStudio" "Visual Studio 14 2015"
|
|
||||||
else
|
|
||||||
build-env "SublimeText" "Sublime Text 2 - Ninja"
|
|
||||||
build-env "Make" "Unix Makefiles"
|
|
||||||
build-env "Xcode" "Xcode"
|
|
||||||
fi
|
|
29
extras/scripts/extract_changes.awk
Executable file
29
extras/scripts/extract_changes.awk
Executable file
@ -0,0 +1,29 @@
|
|||||||
|
#!/usr/bin/awk -f
|
||||||
|
|
||||||
|
# Start echoing after the first list item
|
||||||
|
/\* / {
|
||||||
|
STARTED=1
|
||||||
|
EMPTY_LINE=0
|
||||||
|
}
|
||||||
|
|
||||||
|
# Remember if we have seen an empty line
|
||||||
|
/^[[:space:]]*$/ {
|
||||||
|
EMPTY_LINE=1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Exit when seeing a new version number
|
||||||
|
/^v[[:digit:]]/ {
|
||||||
|
if (STARTED) exit
|
||||||
|
}
|
||||||
|
|
||||||
|
# Print if the line is not empty
|
||||||
|
# and restore the empty line we have skipped
|
||||||
|
!/^[[:space:]]*$/ {
|
||||||
|
if (STARTED) {
|
||||||
|
if (EMPTY_LINE) {
|
||||||
|
print ""
|
||||||
|
EMPTY_LINE=0
|
||||||
|
}
|
||||||
|
print
|
||||||
|
}
|
||||||
|
}
|
18
extras/scripts/get-release-page.sh
Executable file
18
extras/scripts/get-release-page.sh
Executable file
@ -0,0 +1,18 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
VERSION="$1"
|
||||||
|
CHANGELOG="$2"
|
||||||
|
ARDUINOJSON_H="$3"
|
||||||
|
|
||||||
|
cat << END
|
||||||
|
---
|
||||||
|
branch: v7
|
||||||
|
version: $VERSION
|
||||||
|
date: '$(date +'%Y-%m-%d')'
|
||||||
|
$(extras/scripts/wandbox/publish.sh "$ARDUINOJSON_H")
|
||||||
|
---
|
||||||
|
|
||||||
|
$(extras/scripts/extract_changes.awk "$CHANGELOG")
|
||||||
|
END
|
@ -9,7 +9,7 @@ trap 'rm -rf "$WORK_DIR"' EXIT
|
|||||||
cp "$SOURCE_DIR/README.md" "$WORK_DIR/README.md"
|
cp "$SOURCE_DIR/README.md" "$WORK_DIR/README.md"
|
||||||
cp "$SOURCE_DIR/CHANGELOG.md" "$WORK_DIR/CHANGELOG.md"
|
cp "$SOURCE_DIR/CHANGELOG.md" "$WORK_DIR/CHANGELOG.md"
|
||||||
cp "$SOURCE_DIR/library.properties" "$WORK_DIR/library.properties"
|
cp "$SOURCE_DIR/library.properties" "$WORK_DIR/library.properties"
|
||||||
cp "$SOURCE_DIR/LICENSE.md" "$WORK_DIR/LICENSE.txt"
|
cp "$SOURCE_DIR/LICENSE.txt" "$WORK_DIR/LICENSE.txt"
|
||||||
cp -r "$SOURCE_DIR/src" "$WORK_DIR/"
|
cp -r "$SOURCE_DIR/src" "$WORK_DIR/"
|
||||||
cp -r "$SOURCE_DIR/examples" "$WORK_DIR/"
|
cp -r "$SOURCE_DIR/examples" "$WORK_DIR/"
|
||||||
|
|
||||||
|
@ -2,43 +2,67 @@
|
|||||||
|
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
|
which awk sed jq curl perl >/dev/null
|
||||||
|
|
||||||
cd "$(dirname "$0")/../.."
|
cd "$(dirname "$0")/../.."
|
||||||
|
|
||||||
|
if ! git diff --quiet --exit-code; then
|
||||||
|
echo "Repository contains uncommitted changes"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
VERSION="$1"
|
VERSION="$1"
|
||||||
DATE=$(date +%F)
|
DATE=$(date +%F)
|
||||||
TAG="v$VERSION"
|
TAG="v$VERSION"
|
||||||
VERSION_REGEX="[0-9a-z\\.\\-]+"
|
VERSION_REGEX='[0-9]+\.[0-9]+\.[0-9]+(-[a-z0-9]+)?'
|
||||||
|
STARS=$(curl -s https://api.github.com/repos/bblanchon/ArduinoJson | jq '.stargazers_count')
|
||||||
|
|
||||||
update_version_in_source () {
|
update_version_in_source () {
|
||||||
IFS=".-" read MAJOR MINOR REVISION EXTRA < <(echo "$VERSION")
|
IFS=".-" read MAJOR MINOR REVISION EXTRA < <(echo "$VERSION")
|
||||||
UNDERLINE=$(printf -- '-%.0s' $(seq 1 ${#TAG}))
|
UNDERLINE=$(printf -- '-%.0s' $(seq 1 ${#TAG}))
|
||||||
|
|
||||||
sed -i~ -bE "s/version=$VERSION_REGEX/version=$VERSION/; s|ardu-badge.com/ArduinoJson/$VERSION_REGEX|ardu-badge.com/ArduinoJson/$VERSION|; " README.md
|
sed -i~ -bE "1,20{s/$VERSION_REGEX/$VERSION/g}" README.md
|
||||||
rm README.md*~
|
rm README.md~
|
||||||
|
|
||||||
sed -i~ -bE "4s/HEAD/$TAG ($DATE)/; 5s/-+/$UNDERLINE/" CHANGELOG.md
|
sed -i~ -bE "4s/HEAD/$TAG ($DATE)/; 5s/-+/$UNDERLINE/" CHANGELOG.md
|
||||||
rm CHANGELOG.md*~
|
rm CHANGELOG.md~
|
||||||
|
|
||||||
sed -i~ -bE "s/\"version\":.*$/\"version\": \"$VERSION\",/" library.json
|
sed -i~ -bE "s/(project\\s*\\(ArduinoJson\\s+VERSION\\s+).*?\\)/\\1$MAJOR.$MINOR.$REVISION)/" CMakeLists.txt
|
||||||
rm library.json*~
|
rm CMakeLists.txt~
|
||||||
|
|
||||||
sed -i~ -bE "s/version=.*$/version=$VERSION/" library.properties
|
sed -i~ -bE \
|
||||||
rm library.properties*~
|
-e "s/\"version\":.*$/\"version\": \"$VERSION\",/" \
|
||||||
|
-e "s/[0-9]+ stars/$STARS stars/" \
|
||||||
|
library.json
|
||||||
|
rm library.json~
|
||||||
|
|
||||||
|
sed -i~ -bE \
|
||||||
|
-e "s/version=.*$/version=$VERSION/" \
|
||||||
|
-e "s/[0-9]+ stars/$STARS stars/" \
|
||||||
|
library.properties
|
||||||
|
rm library.properties~
|
||||||
|
|
||||||
sed -i~ -bE "s/version: .*$/version: $VERSION.{build}/" appveyor.yml
|
sed -i~ -bE "s/version: .*$/version: $VERSION.{build}/" appveyor.yml
|
||||||
rm appveyor.yml*~
|
rm appveyor.yml~
|
||||||
|
|
||||||
|
sed -i~ -bE \
|
||||||
|
-e "s/^version: .*$/version: \"$VERSION\"/" \
|
||||||
|
-e "s/[0-9]+ stars/$STARS stars/" \
|
||||||
|
idf_component.yml
|
||||||
|
rm idf_component.yml~
|
||||||
|
|
||||||
sed -i~ -bE \
|
sed -i~ -bE \
|
||||||
-e "s/ARDUINOJSON_VERSION .*$/ARDUINOJSON_VERSION \"$VERSION\"/" \
|
-e "s/ARDUINOJSON_VERSION .*$/ARDUINOJSON_VERSION \"$VERSION\"/" \
|
||||||
-e "s/ARDUINOJSON_VERSION_MAJOR .*$/ARDUINOJSON_VERSION_MAJOR $MAJOR/" \
|
-e "s/ARDUINOJSON_VERSION_MAJOR .*$/ARDUINOJSON_VERSION_MAJOR $MAJOR/" \
|
||||||
-e "s/ARDUINOJSON_VERSION_MINOR .*$/ARDUINOJSON_VERSION_MINOR $MINOR/" \
|
-e "s/ARDUINOJSON_VERSION_MINOR .*$/ARDUINOJSON_VERSION_MINOR $MINOR/" \
|
||||||
-e "s/ARDUINOJSON_VERSION_REVISION .*$/ARDUINOJSON_VERSION_REVISION $REVISION/" \
|
-e "s/ARDUINOJSON_VERSION_REVISION .*$/ARDUINOJSON_VERSION_REVISION $REVISION/" \
|
||||||
|
-e "s/ARDUINOJSON_VERSION_MACRO .*$/ARDUINOJSON_VERSION_MACRO V$MAJOR$MINOR$REVISION/" \
|
||||||
src/ArduinoJson/version.hpp
|
src/ArduinoJson/version.hpp
|
||||||
rm src/ArduinoJson/version.hpp*~
|
rm src/ArduinoJson/version.hpp*~
|
||||||
}
|
}
|
||||||
|
|
||||||
commit_new_version () {
|
commit_new_version () {
|
||||||
git add src/ArduinoJson/version.hpp README.md CHANGELOG.md library.json library.properties appveyor.yml
|
git add src/ArduinoJson/version.hpp README.md CHANGELOG.md library.json library.properties appveyor.yml CMakeLists.txt idf_component.yml
|
||||||
git commit -m "Set version to $VERSION"
|
git commit -m "Set version to $VERSION"
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -56,6 +80,8 @@ commit_new_version
|
|||||||
add_tag
|
add_tag
|
||||||
push
|
push
|
||||||
|
|
||||||
extras/scripts/build-arduino-package.sh
|
extras/scripts/build-single-header.sh "src/ArduinoJson.h" "../ArduinoJson-$TAG.h"
|
||||||
extras/scripts/build-single-header.sh
|
extras/scripts/build-single-header.sh "src/ArduinoJson.hpp" "../ArduinoJson-$TAG.hpp"
|
||||||
extras/scripts/wandbox/publish.sh "../ArduinoJson-$TAG.h"
|
extras/scripts/get-release-page.sh "$VERSION" "CHANGELOG.md" "../ArduinoJson-$TAG.h" > "../ArduinoJson-$TAG.md"
|
||||||
|
|
||||||
|
echo "You can now copy ../ArduinoJson-$TAG.md into arduinojson.org/collections/_versions/$VERSION.md"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
// ArduinoJson - arduinojson.org
|
// ArduinoJson - https://arduinojson.org
|
||||||
// Copyright Benoit Blanchon 2014-2020
|
// Copyright © 2014-2025, Benoit BLANCHON
|
||||||
// MIT License
|
// MIT License
|
||||||
//
|
//
|
||||||
// This example shows how to generate a JSON document with ArduinoJson.
|
// This example shows how to generate a JSON document with ArduinoJson.
|
||||||
@ -9,35 +9,18 @@
|
|||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
// Allocate the JSON document
|
// Allocate the JSON document
|
||||||
//
|
JsonDocument doc;
|
||||||
// Inside the brackets, 200 is the RAM allocated to this document.
|
|
||||||
// Don't forget to change this value to match your requirement.
|
|
||||||
// Use arduinojson.org/v6/assistant to compute the capacity.
|
|
||||||
StaticJsonDocument<200> doc;
|
|
||||||
|
|
||||||
// StaticJsonObject allocates memory on the stack, it can be
|
// Add values in the document.
|
||||||
// replaced by DynamicJsonDocument which allocates in the heap.
|
|
||||||
//
|
|
||||||
// DynamicJsonDocument doc(200);
|
|
||||||
|
|
||||||
// StaticJsonObject allocates memory on the stack, it can be
|
|
||||||
// replaced by DynamicJsonDocument which allocates in the heap.
|
|
||||||
//
|
|
||||||
// DynamicJsonDocument doc(200);
|
|
||||||
|
|
||||||
// Add values in the document
|
|
||||||
//
|
|
||||||
doc["sensor"] = "gps";
|
doc["sensor"] = "gps";
|
||||||
doc["time"] = 1351824120;
|
doc["time"] = 1351824120;
|
||||||
|
|
||||||
// Add an array.
|
// Add an array
|
||||||
//
|
JsonArray data = doc["data"].to<JsonArray>();
|
||||||
JsonArray data = doc.createNestedArray("data");
|
|
||||||
data.add(48.756080);
|
data.add(48.756080);
|
||||||
data.add(2.302038);
|
data.add(2.302038);
|
||||||
|
|
||||||
// Generate the minified JSON and send it to STDOUT
|
// Generate the minified JSON and send it to STDOUT
|
||||||
//
|
|
||||||
serializeJson(doc, std::cout);
|
serializeJson(doc, std::cout);
|
||||||
// The above line prints:
|
// The above line prints:
|
||||||
// {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]}
|
// {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]}
|
||||||
@ -46,7 +29,6 @@ int main() {
|
|||||||
std::cout << std::endl;
|
std::cout << std::endl;
|
||||||
|
|
||||||
// Generate the prettified JSON and send it to STDOUT
|
// Generate the prettified JSON and send it to STDOUT
|
||||||
//
|
|
||||||
serializeJsonPretty(doc, std::cout);
|
serializeJsonPretty(doc, std::cout);
|
||||||
// The above line prints:
|
// The above line prints:
|
||||||
// {
|
// {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
// ArduinoJson - arduinojson.org
|
// ArduinoJson - https://arduinojson.org
|
||||||
// Copyright Benoit Blanchon 2014-2020
|
// Copyright © 2014-2025, Benoit BLANCHON
|
||||||
// MIT License
|
// MIT License
|
||||||
//
|
//
|
||||||
// This example shows how to deserialize a JSON document with ArduinoJson.
|
// This example shows how to deserialize a JSON document with ArduinoJson.
|
||||||
@ -9,38 +9,22 @@
|
|||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
// Allocate the JSON document
|
// Allocate the JSON document
|
||||||
//
|
JsonDocument doc;
|
||||||
// Inside the brackets, 200 is the capacity of the memory pool in bytes.
|
|
||||||
// Don't forget to change this value to match your JSON document.
|
|
||||||
// Use arduinojson.org/v6/assistant to compute the capacity.
|
|
||||||
StaticJsonDocument<300> doc;
|
|
||||||
|
|
||||||
// StaticJsonDocument<N> allocates memory on the stack, it can be
|
// JSON input string
|
||||||
// replaced by DynamicJsonDocument which allocates in the heap.
|
const char* json =
|
||||||
//
|
|
||||||
// DynamicJsonDocument doc(200);
|
|
||||||
|
|
||||||
// JSON input string.
|
|
||||||
//
|
|
||||||
// Using a char[], as shown here, enables the "zero-copy" mode. This mode uses
|
|
||||||
// the minimal amount of memory because the JsonDocument stores pointers to
|
|
||||||
// the input buffer.
|
|
||||||
// If you use another type of input, ArduinoJson must copy the strings from
|
|
||||||
// the input to the JsonDocument, so you need to increase the capacity of the
|
|
||||||
// JsonDocument.
|
|
||||||
char json[] =
|
|
||||||
"{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
|
"{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
|
||||||
|
|
||||||
// Deserialize the JSON document
|
// Deserialize the JSON document
|
||||||
DeserializationError error = deserializeJson(doc, json);
|
DeserializationError error = deserializeJson(doc, json);
|
||||||
|
|
||||||
// Test if parsing succeeds.
|
// Test if parsing succeeds
|
||||||
if (error) {
|
if (error) {
|
||||||
std::cerr << "deserializeJson() failed: " << error.c_str() << std::endl;
|
std::cerr << "deserializeJson() failed: " << error.c_str() << std::endl;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fetch values.
|
// Fetch the values
|
||||||
//
|
//
|
||||||
// Most of the time, you can rely on the implicit casts.
|
// Most of the time, you can rely on the implicit casts.
|
||||||
// In other case, you can do doc["time"].as<long>();
|
// In other case, you can do doc["time"].as<long>();
|
||||||
@ -49,7 +33,7 @@ int main() {
|
|||||||
double latitude = doc["data"][0];
|
double latitude = doc["data"][0];
|
||||||
double longitude = doc["data"][1];
|
double longitude = doc["data"][1];
|
||||||
|
|
||||||
// Print values.
|
// Print the values
|
||||||
std::cout << sensor << std::endl;
|
std::cout << sensor << std::endl;
|
||||||
std::cout << time << std::endl;
|
std::cout << time << std::endl;
|
||||||
std::cout << latitude << std::endl;
|
std::cout << latitude << std::endl;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
// ArduinoJson - arduinojson.org
|
// ArduinoJson - https://arduinojson.org
|
||||||
// Copyright Benoit Blanchon 2014-2020
|
// Copyright © 2014-2025, Benoit BLANCHON
|
||||||
// MIT License
|
// MIT License
|
||||||
//
|
//
|
||||||
// This example shows how to generate a JSON document with ArduinoJson.
|
// This example shows how to generate a JSON document with ArduinoJson.
|
||||||
@ -9,22 +9,9 @@
|
|||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
// Allocate the JSON document
|
// Allocate the JSON document
|
||||||
//
|
JsonDocument doc;
|
||||||
// Inside the brackets, 300 is the size of the memory pool in bytes.
|
|
||||||
// Don't forget to change this value to match your JSON document.
|
|
||||||
// Use arduinojson.org/assistant to compute the capacity.
|
|
||||||
StaticJsonDocument<300> doc;
|
|
||||||
|
|
||||||
// StaticJsonObject allocates memory on the stack, it can be
|
// The MessagePack input string
|
||||||
// replaced by DynamicJsonObject which allocates in the heap.
|
|
||||||
//
|
|
||||||
// DynamicJsonObject doc(200);
|
|
||||||
|
|
||||||
// MessagePack input string.
|
|
||||||
//
|
|
||||||
// It's better to use a char[] as shown here.
|
|
||||||
// If you use a const char* or a String, ArduinoJson will
|
|
||||||
// have to make a copy of the input in the JsonBuffer.
|
|
||||||
uint8_t input[] = {131, 166, 115, 101, 110, 115, 111, 114, 163, 103, 112, 115,
|
uint8_t input[] = {131, 166, 115, 101, 110, 115, 111, 114, 163, 103, 112, 115,
|
||||||
164, 116, 105, 109, 101, 206, 80, 147, 50, 248, 164, 100,
|
164, 116, 105, 109, 101, 206, 80, 147, 50, 248, 164, 100,
|
||||||
97, 116, 97, 146, 203, 64, 72, 96, 199, 58, 188, 148,
|
97, 116, 97, 146, 203, 64, 72, 96, 199, 58, 188, 148,
|
||||||
@ -36,20 +23,16 @@ int main() {
|
|||||||
// "data": [48.75608, 2.302038]
|
// "data": [48.75608, 2.302038]
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// doc of the object tree.
|
// Parse the input
|
||||||
//
|
|
||||||
// It's a reference to the JsonObject, the actual bytes are inside the
|
|
||||||
// JsonBuffer with all the other nodes of the object tree.
|
|
||||||
// Memory is freed when jsonBuffer goes out of scope.
|
|
||||||
DeserializationError error = deserializeMsgPack(doc, input);
|
DeserializationError error = deserializeMsgPack(doc, input);
|
||||||
|
|
||||||
// Test if parsing succeeds.
|
// Test if parsing succeeds
|
||||||
if (error) {
|
if (error) {
|
||||||
std::cerr << "deserializeMsgPack() failed: " << error.c_str() << std::endl;
|
std::cerr << "deserializeMsgPack() failed: " << error.c_str() << std::endl;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fetch values.
|
// Fetch the values
|
||||||
//
|
//
|
||||||
// Most of the time, you can rely on the implicit casts.
|
// Most of the time, you can rely on the implicit casts.
|
||||||
// In other case, you can do doc["time"].as<long>();
|
// In other case, you can do doc["time"].as<long>();
|
||||||
@ -58,7 +41,7 @@ int main() {
|
|||||||
double latitude = doc["data"][0];
|
double latitude = doc["data"][0];
|
||||||
double longitude = doc["data"][1];
|
double longitude = doc["data"][1];
|
||||||
|
|
||||||
// Print values.
|
// Print the values
|
||||||
std::cout << sensor << std::endl;
|
std::cout << sensor << std::endl;
|
||||||
std::cout << time << std::endl;
|
std::cout << time << std::endl;
|
||||||
std::cout << latitude << std::endl;
|
std::cout << latitude << std::endl;
|
||||||
|
@ -14,14 +14,14 @@ compile() {
|
|||||||
{
|
{
|
||||||
"code":$(read_string "$FILE_PATH"),
|
"code":$(read_string "$FILE_PATH"),
|
||||||
"codes": [{"file":"ArduinoJson.h","code":$(read_string "$ARDUINOJSON_H")}],
|
"codes": [{"file":"ArduinoJson.h","code":$(read_string "$ARDUINOJSON_H")}],
|
||||||
"options": "warning",
|
"options": "warning,c++11",
|
||||||
"compiler": "gcc-4.9.3",
|
"compiler": "gcc-head",
|
||||||
"save": true
|
"save": true
|
||||||
}
|
}
|
||||||
END
|
END
|
||||||
URL=$(curl -sS -H "Content-type: application/json" -d @parameters.json https://wandbox.org/api/compile.json | jq --raw-output .url)
|
URL=$(curl -sS -H "Content-type: application/json" -d @parameters.json https://wandbox.org/api/compile.json | jq --raw-output .url)
|
||||||
rm parameters.json
|
rm parameters.json
|
||||||
echo " $1: $URL"
|
[ -n "$URL" ] && echo "$1: $URL"
|
||||||
}
|
}
|
||||||
|
|
||||||
compile "JsonGeneratorExample"
|
compile "JsonGeneratorExample"
|
||||||
|
1
extras/tests/.clang-tidy
Normal file
1
extras/tests/.clang-tidy
Normal file
@ -0,0 +1 @@
|
|||||||
|
Checks: '-clang-analyzer-security.insecureAPI.*'
|
@ -1,88 +1,33 @@
|
|||||||
# ArduinoJson - arduinojson.org
|
# ArduinoJson - https://arduinojson.org
|
||||||
# Copyright Benoit Blanchon 2014-2020
|
# Copyright © 2014-2025, Benoit BLANCHON
|
||||||
# MIT License
|
# MIT License
|
||||||
|
|
||||||
|
set(CMAKE_CXX_STANDARD 11)
|
||||||
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
|
||||||
|
link_libraries(ArduinoJson)
|
||||||
|
|
||||||
|
# Failing builds should only link with ArduinoJson, not catch
|
||||||
|
add_subdirectory(FailingBuilds)
|
||||||
|
|
||||||
add_subdirectory(catch)
|
add_subdirectory(catch)
|
||||||
|
link_libraries(catch)
|
||||||
if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
|
|
||||||
add_compile_options(
|
|
||||||
-pedantic
|
|
||||||
-Wall
|
|
||||||
-Wcast-align
|
|
||||||
-Wcast-qual
|
|
||||||
-Wconversion
|
|
||||||
-Wctor-dtor-privacy
|
|
||||||
-Wdisabled-optimization
|
|
||||||
-Werror
|
|
||||||
-Wextra
|
|
||||||
-Wformat=2
|
|
||||||
-Winit-self
|
|
||||||
-Wmissing-include-dirs
|
|
||||||
-Wnon-virtual-dtor
|
|
||||||
-Wold-style-cast
|
|
||||||
-Woverloaded-virtual
|
|
||||||
-Wparentheses
|
|
||||||
-Wredundant-decls
|
|
||||||
-Wshadow
|
|
||||||
-Wsign-promo
|
|
||||||
-Wstrict-aliasing
|
|
||||||
-Wundef
|
|
||||||
)
|
|
||||||
|
|
||||||
if(NOT MINGW)
|
|
||||||
add_compile_options(
|
|
||||||
-std=c++98
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
|
|
||||||
add_compile_options(
|
|
||||||
-Wstrict-null-sentinel
|
|
||||||
-Wno-vla # Allow VLA in tests
|
|
||||||
)
|
|
||||||
add_definitions(-DHAS_VARIABLE_LENGTH_ARRAY)
|
|
||||||
|
|
||||||
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.5)
|
|
||||||
add_compile_options(-Wlogical-op) # the flag exists in 4.4 but is buggy
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.6)
|
|
||||||
add_compile_options(-Wnoexcept)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
|
||||||
add_compile_options(
|
|
||||||
-Wc++11-compat
|
|
||||||
-Wdeprecated-register
|
|
||||||
-Wno-vla-extension # Allow VLA in tests
|
|
||||||
)
|
|
||||||
add_definitions(
|
|
||||||
-DHAS_VARIABLE_LENGTH_ARRAY
|
|
||||||
-DSUBSCRIPT_CONFLICTS_WITH_BUILTIN_OPERATOR
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(MSVC)
|
|
||||||
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
|
||||||
add_compile_options(
|
|
||||||
/W4 # Set warning level
|
|
||||||
/WX # Treats all compiler warnings as errors.
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
include_directories(Helpers)
|
include_directories(Helpers)
|
||||||
add_subdirectory(ElementProxy)
|
add_subdirectory(Cpp17)
|
||||||
|
add_subdirectory(Cpp20)
|
||||||
|
add_subdirectory(Deprecated)
|
||||||
add_subdirectory(IntegrationTests)
|
add_subdirectory(IntegrationTests)
|
||||||
add_subdirectory(JsonArray)
|
add_subdirectory(JsonArray)
|
||||||
|
add_subdirectory(JsonArrayConst)
|
||||||
add_subdirectory(JsonDeserializer)
|
add_subdirectory(JsonDeserializer)
|
||||||
add_subdirectory(JsonDocument)
|
add_subdirectory(JsonDocument)
|
||||||
add_subdirectory(JsonObject)
|
add_subdirectory(JsonObject)
|
||||||
|
add_subdirectory(JsonObjectConst)
|
||||||
add_subdirectory(JsonSerializer)
|
add_subdirectory(JsonSerializer)
|
||||||
add_subdirectory(JsonVariant)
|
add_subdirectory(JsonVariant)
|
||||||
add_subdirectory(MemberProxy)
|
add_subdirectory(JsonVariantConst)
|
||||||
add_subdirectory(MemoryPool)
|
add_subdirectory(ResourceManager)
|
||||||
add_subdirectory(Misc)
|
add_subdirectory(Misc)
|
||||||
add_subdirectory(MixedConfiguration)
|
add_subdirectory(MixedConfiguration)
|
||||||
add_subdirectory(MsgPackDeserializer)
|
add_subdirectory(MsgPackDeserializer)
|
||||||
|
29
extras/tests/Cpp17/CMakeLists.txt
Normal file
29
extras/tests/Cpp17/CMakeLists.txt
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
# ArduinoJson - https://arduinojson.org
|
||||||
|
# Copyright © 2014-2025, Benoit BLANCHON
|
||||||
|
# MIT License
|
||||||
|
|
||||||
|
if(MSVC_VERSION LESS 1910)
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5)
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7)
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
|
||||||
|
add_executable(Cpp17Tests
|
||||||
|
string_view.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
add_test(Cpp17 Cpp17Tests)
|
||||||
|
|
||||||
|
set_tests_properties(Cpp17
|
||||||
|
PROPERTIES
|
||||||
|
LABELS "Catch"
|
||||||
|
)
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user