Compare commits
No commits in common. "v5.1.6" and "master" have entirely different histories.
17
.gitattributes
vendored
17
.gitattributes
vendored
@ -1,17 +0,0 @@
|
|||||||
# Auto detect text files and perform LF normalization
|
|
||||||
* text=auto
|
|
||||||
|
|
||||||
# Custom for Visual Studio
|
|
||||||
*.cs diff=csharp
|
|
||||||
|
|
||||||
# Standard to msysgit
|
|
||||||
*.doc diff=astextplain
|
|
||||||
*.DOC diff=astextplain
|
|
||||||
*.docx diff=astextplain
|
|
||||||
*.DOCX diff=astextplain
|
|
||||||
*.dot diff=astextplain
|
|
||||||
*.DOT diff=astextplain
|
|
||||||
*.pdf diff=astextplain
|
|
||||||
*.PDF diff=astextplain
|
|
||||||
*.rtf diff=astextplain
|
|
||||||
*.RTF diff=astextplain
|
|
||||||
365
.gitignore
vendored
365
.gitignore
vendored
@ -1,4 +1,361 @@
|
|||||||
.pioenvs
|
# ---> C++
|
||||||
.piolibdeps
|
# Prerequisites
|
||||||
.clang_complete
|
*.d
|
||||||
.gcc-flags.json
|
|
||||||
|
# Compiled Object files
|
||||||
|
*.slo
|
||||||
|
*.lo
|
||||||
|
*.o
|
||||||
|
*.obj
|
||||||
|
|
||||||
|
# Precompiled Headers
|
||||||
|
*.gch
|
||||||
|
*.pch
|
||||||
|
|
||||||
|
# Compiled Dynamic libraries
|
||||||
|
*.so
|
||||||
|
*.dylib
|
||||||
|
*.dll
|
||||||
|
|
||||||
|
# Fortran module files
|
||||||
|
*.mod
|
||||||
|
*.smod
|
||||||
|
|
||||||
|
# Compiled Static libraries
|
||||||
|
*.lai
|
||||||
|
*.la
|
||||||
|
*.a
|
||||||
|
*.lib
|
||||||
|
|
||||||
|
# Executables
|
||||||
|
*.exe
|
||||||
|
*.out
|
||||||
|
*.app
|
||||||
|
|
||||||
|
# ---> C
|
||||||
|
# Prerequisites
|
||||||
|
*.d
|
||||||
|
|
||||||
|
# Object files
|
||||||
|
*.o
|
||||||
|
*.ko
|
||||||
|
*.obj
|
||||||
|
*.elf
|
||||||
|
|
||||||
|
# Linker output
|
||||||
|
*.ilk
|
||||||
|
*.map
|
||||||
|
*.exp
|
||||||
|
|
||||||
|
# Precompiled Headers
|
||||||
|
*.gch
|
||||||
|
*.pch
|
||||||
|
|
||||||
|
# Libraries
|
||||||
|
*.lib
|
||||||
|
*.a
|
||||||
|
*.la
|
||||||
|
*.lo
|
||||||
|
|
||||||
|
# Shared objects (inc. Windows DLLs)
|
||||||
|
*.dll
|
||||||
|
*.so
|
||||||
|
*.so.*
|
||||||
|
*.dylib
|
||||||
|
|
||||||
|
# Executables
|
||||||
|
*.exe
|
||||||
|
*.out
|
||||||
|
*.app
|
||||||
|
*.i*86
|
||||||
|
*.x86_64
|
||||||
|
*.hex
|
||||||
|
|
||||||
|
# Debug files
|
||||||
|
*.dSYM/
|
||||||
|
*.su
|
||||||
|
*.idb
|
||||||
|
*.pdb
|
||||||
|
|
||||||
|
# Kernel Module Compile Results
|
||||||
|
*.mod*
|
||||||
|
*.cmd
|
||||||
|
.tmp_versions/
|
||||||
|
modules.order
|
||||||
|
Module.symvers
|
||||||
|
Mkfile.old
|
||||||
|
dkms.conf
|
||||||
|
|
||||||
|
# ---> CMake
|
||||||
|
CMakeLists.txt.user
|
||||||
|
CMakeCache.txt
|
||||||
|
CMakeFiles
|
||||||
|
CMakeScripts
|
||||||
|
Testing
|
||||||
|
Makefile
|
||||||
|
cmake_install.cmake
|
||||||
|
install_manifest.txt
|
||||||
|
compile_commands.json
|
||||||
|
CTestTestfile.cmake
|
||||||
|
_deps
|
||||||
|
|
||||||
|
# ---> JetBrains
|
||||||
|
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
|
||||||
|
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
|
||||||
|
|
||||||
|
# User-specific stuff
|
||||||
|
.idea/**/workspace.xml
|
||||||
|
.idea/**/tasks.xml
|
||||||
|
.idea/**/usage.statistics.xml
|
||||||
|
.idea/**/dictionaries
|
||||||
|
.idea/**/shelf
|
||||||
|
|
||||||
|
# AWS User-specific
|
||||||
|
.idea/**/aws.xml
|
||||||
|
|
||||||
|
# Generated files
|
||||||
|
.idea/**/contentModel.xml
|
||||||
|
|
||||||
|
# Sensitive or high-churn files
|
||||||
|
.idea/**/dataSources/
|
||||||
|
.idea/**/dataSources.ids
|
||||||
|
.idea/**/dataSources.local.xml
|
||||||
|
.idea/**/sqlDataSources.xml
|
||||||
|
.idea/**/dynamic.xml
|
||||||
|
.idea/**/uiDesigner.xml
|
||||||
|
.idea/**/dbnavigator.xml
|
||||||
|
|
||||||
|
# Gradle
|
||||||
|
.idea/**/gradle.xml
|
||||||
|
.idea/**/libraries
|
||||||
|
|
||||||
|
# Gradle and Maven with auto-import
|
||||||
|
# When using Gradle or Maven with auto-import, you should exclude module files,
|
||||||
|
# since they will be recreated, and may cause churn. Uncomment if using
|
||||||
|
# auto-import.
|
||||||
|
# .idea/artifacts
|
||||||
|
# .idea/compiler.xml
|
||||||
|
# .idea/jarRepositories.xml
|
||||||
|
# .idea/modules.xml
|
||||||
|
# .idea/*.iml
|
||||||
|
# .idea/modules
|
||||||
|
# *.iml
|
||||||
|
# *.ipr
|
||||||
|
|
||||||
|
# CMake
|
||||||
|
cmake-build-*/
|
||||||
|
|
||||||
|
# Mongo Explorer plugin
|
||||||
|
.idea/**/mongoSettings.xml
|
||||||
|
|
||||||
|
# File-based project format
|
||||||
|
*.iws
|
||||||
|
|
||||||
|
# IntelliJ
|
||||||
|
out/
|
||||||
|
|
||||||
|
# mpeltonen/sbt-idea plugin
|
||||||
|
.idea_modules/
|
||||||
|
|
||||||
|
# JIRA plugin
|
||||||
|
atlassian-ide-plugin.xml
|
||||||
|
|
||||||
|
# Cursive Clojure plugin
|
||||||
|
.idea/replstate.xml
|
||||||
|
|
||||||
|
# SonarLint plugin
|
||||||
|
.idea/sonarlint/
|
||||||
|
|
||||||
|
# Crashlytics plugin (for Android Studio and IntelliJ)
|
||||||
|
com_crashlytics_export_strings.xml
|
||||||
|
crashlytics.properties
|
||||||
|
crashlytics-build.properties
|
||||||
|
fabric.properties
|
||||||
|
|
||||||
|
# Editor-based Rest Client
|
||||||
|
.idea/httpRequests
|
||||||
|
|
||||||
|
# Android studio 3.1+ serialized cache file
|
||||||
|
.idea/caches/build_file_checksums.ser
|
||||||
|
|
||||||
|
# ---> Linux
|
||||||
|
*~
|
||||||
|
|
||||||
|
# temporary files which can be created if a process still has a handle open of a deleted file
|
||||||
|
.fuse_hidden*
|
||||||
|
|
||||||
|
# KDE directory preferences
|
||||||
|
.directory
|
||||||
|
|
||||||
|
# Linux trash folder which might appear on any partition or disk
|
||||||
|
.Trash-*
|
||||||
|
|
||||||
|
# .nfs files are created when an open file is removed but is still being accessed
|
||||||
|
.nfs*
|
||||||
|
|
||||||
|
# ---> Ninja
|
||||||
|
.ninja_deps
|
||||||
|
.ninja_log
|
||||||
|
|
||||||
|
# ---> Python
|
||||||
|
# Byte-compiled / optimized / DLL files
|
||||||
|
__pycache__/
|
||||||
|
*.py[cod]
|
||||||
|
*$py.class
|
||||||
|
|
||||||
|
# C extensions
|
||||||
|
*.so
|
||||||
|
|
||||||
|
# Distribution / packaging
|
||||||
|
.Python
|
||||||
|
build/
|
||||||
|
develop-eggs/
|
||||||
|
dist/
|
||||||
|
downloads/
|
||||||
|
eggs/
|
||||||
|
.eggs/
|
||||||
|
lib/
|
||||||
|
lib64/
|
||||||
|
parts/
|
||||||
|
sdist/
|
||||||
|
var/
|
||||||
|
wheels/
|
||||||
|
share/python-wheels/
|
||||||
|
*.egg-info/
|
||||||
|
.installed.cfg
|
||||||
|
*.egg
|
||||||
|
MANIFEST
|
||||||
|
|
||||||
|
# PyInstaller
|
||||||
|
# Usually these files are written by a python script from a template
|
||||||
|
# before PyInstaller builds the exe, so as to inject date/other infos into it.
|
||||||
|
*.manifest
|
||||||
|
*.spec
|
||||||
|
|
||||||
|
# Installer logs
|
||||||
|
pip-log.txt
|
||||||
|
pip-delete-this-directory.txt
|
||||||
|
|
||||||
|
# Unit test / coverage reports
|
||||||
|
htmlcov/
|
||||||
|
.tox/
|
||||||
|
.nox/
|
||||||
|
.coverage
|
||||||
|
.coverage.*
|
||||||
|
.cache
|
||||||
|
nosetests.xml
|
||||||
|
coverage.xml
|
||||||
|
*.cover
|
||||||
|
*.py,cover
|
||||||
|
.hypothesis/
|
||||||
|
.pytest_cache/
|
||||||
|
cover/
|
||||||
|
|
||||||
|
# Translations
|
||||||
|
*.mo
|
||||||
|
*.pot
|
||||||
|
|
||||||
|
# Django stuff:
|
||||||
|
*.log
|
||||||
|
local_settings.py
|
||||||
|
db.sqlite3
|
||||||
|
db.sqlite3-journal
|
||||||
|
|
||||||
|
# Flask stuff:
|
||||||
|
instance/
|
||||||
|
.webassets-cache
|
||||||
|
|
||||||
|
# Scrapy stuff:
|
||||||
|
.scrapy
|
||||||
|
|
||||||
|
# Sphinx documentation
|
||||||
|
docs/_build/
|
||||||
|
|
||||||
|
# PyBuilder
|
||||||
|
.pybuilder/
|
||||||
|
target/
|
||||||
|
|
||||||
|
# Jupyter Notebook
|
||||||
|
.ipynb_checkpoints
|
||||||
|
|
||||||
|
# IPython
|
||||||
|
profile_default/
|
||||||
|
ipython_config.py
|
||||||
|
|
||||||
|
# pyenv
|
||||||
|
# For a library or package, you might want to ignore these files since the code is
|
||||||
|
# intended to run in multiple environments; otherwise, check them in:
|
||||||
|
# .python-version
|
||||||
|
|
||||||
|
# pipenv
|
||||||
|
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
|
||||||
|
# However, in case of collaboration, if having platform-specific dependencies or dependencies
|
||||||
|
# having no cross-platform support, pipenv may install dependencies that don't work, or not
|
||||||
|
# install all needed dependencies.
|
||||||
|
#Pipfile.lock
|
||||||
|
|
||||||
|
# poetry
|
||||||
|
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
|
||||||
|
# This is especially recommended for binary packages to ensure reproducibility, and is more
|
||||||
|
# commonly ignored for libraries.
|
||||||
|
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
|
||||||
|
#poetry.lock
|
||||||
|
|
||||||
|
# pdm
|
||||||
|
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
|
||||||
|
#pdm.lock
|
||||||
|
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
|
||||||
|
# in version control.
|
||||||
|
# https://pdm.fming.dev/#use-with-ide
|
||||||
|
.pdm.toml
|
||||||
|
|
||||||
|
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
|
||||||
|
__pypackages__/
|
||||||
|
|
||||||
|
# Celery stuff
|
||||||
|
celerybeat-schedule
|
||||||
|
celerybeat.pid
|
||||||
|
|
||||||
|
# SageMath parsed files
|
||||||
|
*.sage.py
|
||||||
|
|
||||||
|
# Environments
|
||||||
|
.env
|
||||||
|
.venv
|
||||||
|
env/
|
||||||
|
venv/
|
||||||
|
ENV/
|
||||||
|
env.bak/
|
||||||
|
venv.bak/
|
||||||
|
|
||||||
|
# Spyder project settings
|
||||||
|
.spyderproject
|
||||||
|
.spyproject
|
||||||
|
|
||||||
|
# Rope project settings
|
||||||
|
.ropeproject
|
||||||
|
|
||||||
|
# mkdocs documentation
|
||||||
|
/site
|
||||||
|
|
||||||
|
# mypy
|
||||||
|
.mypy_cache/
|
||||||
|
.dmypy.json
|
||||||
|
dmypy.json
|
||||||
|
|
||||||
|
# Pyre type checker
|
||||||
|
.pyre/
|
||||||
|
|
||||||
|
# pytype static type analyzer
|
||||||
|
.pytype/
|
||||||
|
|
||||||
|
# Cython debug symbols
|
||||||
|
cython_debug/
|
||||||
|
|
||||||
|
# PyCharm
|
||||||
|
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
|
||||||
|
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
|
||||||
|
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
||||||
|
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
||||||
|
#.idea/
|
||||||
|
|
||||||
|
|||||||
23
.travis.yml
23
.travis.yml
@ -1,23 +0,0 @@
|
|||||||
language: python
|
|
||||||
python:
|
|
||||||
- '2.7'
|
|
||||||
sudo: false
|
|
||||||
cache:
|
|
||||||
directories:
|
|
||||||
- "~/.platformio"
|
|
||||||
install:
|
|
||||||
- pip install -U platformio
|
|
||||||
|
|
||||||
script:
|
|
||||||
- platformio run
|
|
||||||
before_deploy:
|
|
||||||
- for file in .pioenvs/*/firmware.bin; do cp $file ${file%/*}.bin; done
|
|
||||||
deploy:
|
|
||||||
provider: releases
|
|
||||||
api_key:
|
|
||||||
secure: I5x8qJ5+229qJv5jSnNPGERQHl0NSKvrVHdpVzr/HOo2zeZ/Q5sMhHWo3IBD3AKjGdSlpyNApDwYTaGvenMe+xtUWSSxYIy2ptWAWfkpOtUMx3lI3brZJRt8s98xS5m972SC9mlNT2ZU+i6hZ6srYv2w4nDuyX+j7Q6IGqvYtabxUWzza/Zg0yNpPScvvzscW1CVhdEd5qYH6OKfBfuVOj3ZG4pCycvbejhkUJwbCQ5m8+DEXUol8BKeh92+TPC3jDHXWIStdgLIrmkZ3YWxMQBgQ41QIkaf6X1/0WYEcY0DFW6hlDzg2GbJ8tPRRPC9dfgMs3ZMKJkc7e4x7wMvG2QXQ0aO6e7xTMw41JZ/OrIit0JDHB1M8bWDPUhHwjiCht4W77n7KWFk9sIUDzOdMdd69BIMt5IohtkjnIT2dXekB4xiNvfPLYUa70aOuSHWi3HXVSE1R7RX0brmNf/mH1Pm91uun3UqtIwhrpD0gteQnc0EAlHoOJOazdn3cohrtmECZJo+f+EiqFfEHT2hBrHPEvWknNfxAyPS7jYWKQ7pTMk+y/BUkLyIQkimvNz41azA6sA75nnQrZ+ZJQa+KP2cEObMBs/ekzA45nds1UXpolI1W8QIOxJ/Y10C1yxr6V5a3WWg1H8EbF0HaqiyIeQx/UCz7gl62CbLEDui9PA=
|
|
||||||
file_glob: true
|
|
||||||
file: ".pioenvs/*.bin"
|
|
||||||
skip_cleanup: true
|
|
||||||
on:
|
|
||||||
tags: true
|
|
||||||
9
LICENSE
Normal file
9
LICENSE
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
MIT License
|
||||||
|
|
||||||
|
Copyright (c) 2026 mgeppert
|
||||||
|
|
||||||
|
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:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
674
LICENSE.txt
674
LICENSE.txt
@ -1,674 +0,0 @@
|
|||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 29 June 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The GNU General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
the GNU General Public License is intended to guarantee your freedom to
|
|
||||||
share and change all versions of a program--to make sure it remains free
|
|
||||||
software for all its users. We, the Free Software Foundation, use the
|
|
||||||
GNU General Public License for most of our software; it applies also to
|
|
||||||
any other work released this way by its authors. You can apply it to
|
|
||||||
your programs, too.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
To protect your rights, we need to prevent others from denying you
|
|
||||||
these rights or asking you to surrender the rights. Therefore, you have
|
|
||||||
certain responsibilities if you distribute copies of the software, or if
|
|
||||||
you modify it: responsibilities to respect the freedom of others.
|
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
|
||||||
gratis or for a fee, you must pass on to the recipients the same
|
|
||||||
freedoms that you received. You must make sure that they, too, receive
|
|
||||||
or can get the source code. And you must show them these terms so they
|
|
||||||
know their rights.
|
|
||||||
|
|
||||||
Developers that use the GNU GPL protect your rights with two steps:
|
|
||||||
(1) assert copyright on the software, and (2) offer you this License
|
|
||||||
giving you legal permission to copy, distribute and/or modify it.
|
|
||||||
|
|
||||||
For the developers' and authors' protection, the GPL clearly explains
|
|
||||||
that there is no warranty for this free software. For both users' and
|
|
||||||
authors' sake, the GPL requires that modified versions be marked as
|
|
||||||
changed, so that their problems will not be attributed erroneously to
|
|
||||||
authors of previous versions.
|
|
||||||
|
|
||||||
Some devices are designed to deny users access to install or run
|
|
||||||
modified versions of the software inside them, although the manufacturer
|
|
||||||
can do so. This is fundamentally incompatible with the aim of
|
|
||||||
protecting users' freedom to change the software. The systematic
|
|
||||||
pattern of such abuse occurs in the area of products for individuals to
|
|
||||||
use, which is precisely where it is most unacceptable. Therefore, we
|
|
||||||
have designed this version of the GPL to prohibit the practice for those
|
|
||||||
products. If such problems arise substantially in other domains, we
|
|
||||||
stand ready to extend this provision to those domains in future versions
|
|
||||||
of the GPL, as needed to protect the freedom of users.
|
|
||||||
|
|
||||||
Finally, every program is threatened constantly by software patents.
|
|
||||||
States should not allow patents to restrict development and use of
|
|
||||||
software on general-purpose computers, but in those that do, we wish to
|
|
||||||
avoid the special danger that patents applied to a free program could
|
|
||||||
make it effectively proprietary. To prevent this, the GPL assures that
|
|
||||||
patents cannot be used to render the program non-free.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU General Public License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
|
||||||
works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of an
|
|
||||||
exact copy. The resulting work is called a "modified version" of the
|
|
||||||
earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user through
|
|
||||||
a computer network, with no transfer of a copy, is not conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices"
|
|
||||||
to the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work
|
|
||||||
for making modifications to it. "Object code" means any non-source
|
|
||||||
form of a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users
|
|
||||||
can regenerate automatically from other parts of the Corresponding
|
|
||||||
Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that
|
|
||||||
same work.
|
|
||||||
|
|
||||||
2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not
|
|
||||||
convey, without conditions so long as your license otherwise remains
|
|
||||||
in force. You may convey covered works to others for the sole purpose
|
|
||||||
of having them make modifications exclusively for you, or provide you
|
|
||||||
with facilities for running those works, provided that you comply with
|
|
||||||
the terms of this License in conveying all material for which you do
|
|
||||||
not control copyright. Those thus making or running the covered works
|
|
||||||
for you must do so exclusively on your behalf, under your direction
|
|
||||||
and control, on terms that prohibit them from making any copies of
|
|
||||||
your copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under
|
|
||||||
the conditions stated below. Sublicensing is not allowed; section 10
|
|
||||||
makes it unnecessary.
|
|
||||||
|
|
||||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such circumvention
|
|
||||||
is effected by exercising rights under this License with respect to
|
|
||||||
the covered work, and you disclaim any intention to limit operation or
|
|
||||||
modification of the work as a means of enforcing, against the work's
|
|
||||||
users, your or third parties' legal rights to forbid circumvention of
|
|
||||||
technological measures.
|
|
||||||
|
|
||||||
4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
|
|
||||||
b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under section
|
|
||||||
7. This requirement modifies the requirement in section 4 to
|
|
||||||
"keep intact all notices".
|
|
||||||
|
|
||||||
c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
|
|
||||||
d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms
|
|
||||||
of sections 4 and 5, provided that you also convey the
|
|
||||||
machine-readable Corresponding Source under the terms of this License,
|
|
||||||
in one of these ways:
|
|
||||||
|
|
||||||
a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
|
|
||||||
b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the
|
|
||||||
Corresponding Source from a network server at no charge.
|
|
||||||
|
|
||||||
c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
|
|
||||||
d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
|
|
||||||
e) Convey the object code using peer-to-peer transmission, provided
|
|
||||||
you inform other peers where the object code and Corresponding
|
|
||||||
Source of the work are being offered to the general public at no
|
|
||||||
charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal, family,
|
|
||||||
or household purposes, or (2) anything designed or sold for incorporation
|
|
||||||
into a dwelling. In determining whether a product is a consumer product,
|
|
||||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
|
||||||
product received by a particular user, "normally used" refers to a
|
|
||||||
typical or common use of that class of product, regardless of the status
|
|
||||||
of the particular user or of the way in which the particular user
|
|
||||||
actually uses, or expects or is expected to use, the product. A product
|
|
||||||
is a consumer product regardless of whether the product has substantial
|
|
||||||
commercial, industrial or non-consumer uses, unless such uses represent
|
|
||||||
the only significant mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to install
|
|
||||||
and execute modified versions of a covered work in that User Product from
|
|
||||||
a modified version of its Corresponding Source. The information must
|
|
||||||
suffice to ensure that the continued functioning of the modified object
|
|
||||||
code is in no case prevented or interfered with solely because
|
|
||||||
modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or updates
|
|
||||||
for a work that has been modified or installed by the recipient, or for
|
|
||||||
the User Product in which it has been modified or installed. Access to a
|
|
||||||
network may be denied when the modification itself materially and
|
|
||||||
adversely affects the operation of the network or violates the rules and
|
|
||||||
protocols for communication across the network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders of
|
|
||||||
that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
|
|
||||||
b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
|
|
||||||
c) Prohibiting misrepresentation of the origin of that material, or
|
|
||||||
requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
|
|
||||||
d) Limiting the use for publicity purposes of names of licensors or
|
|
||||||
authors of the material; or
|
|
||||||
|
|
||||||
e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
|
|
||||||
f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions of
|
|
||||||
it) with contractual assumptions of liability to the recipient, for
|
|
||||||
any liability that these contractual assumptions directly impose on
|
|
||||||
those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions;
|
|
||||||
the above requirements apply either way.
|
|
||||||
|
|
||||||
8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your
|
|
||||||
license from a particular copyright holder is reinstated (a)
|
|
||||||
provisionally, unless and until the copyright holder explicitly and
|
|
||||||
finally terminates your license, and (b) permanently, if the copyright
|
|
||||||
holder fails to notify you of the violation by some reasonable means
|
|
||||||
prior to 60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or
|
|
||||||
run a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims
|
|
||||||
owned or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within
|
|
||||||
the scope of its coverage, prohibits the exercise of, or is
|
|
||||||
conditioned on the non-exercise of one or more of the rights that are
|
|
||||||
specifically granted under this License. You may not convey a covered
|
|
||||||
work if you are a party to an arrangement with a third party that is
|
|
||||||
in the business of distributing software, under which you make payment
|
|
||||||
to the third party based on the extent of your activity of conveying
|
|
||||||
the work, and under which the third party grants, to any of the
|
|
||||||
parties who would receive the covered work from you, a discriminatory
|
|
||||||
patent license (a) in connection with copies of the covered work
|
|
||||||
conveyed by you (or copies made from those copies), or (b) primarily
|
|
||||||
for and in connection with specific products or compilations that
|
|
||||||
contain the covered work, unless you entered into that arrangement,
|
|
||||||
or that patent license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you may
|
|
||||||
not convey it at all. For example, if you agree to terms that obligate you
|
|
||||||
to collect a royalty for further conveying from those to whom you convey
|
|
||||||
the Program, the only way you could satisfy both those terms and this
|
|
||||||
License would be to refrain entirely from conveying the Program.
|
|
||||||
|
|
||||||
13. Use with the GNU Affero General Public License.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, you have
|
|
||||||
permission to link or combine any covered work with a work licensed
|
|
||||||
under version 3 of the GNU Affero General Public License into a single
|
|
||||||
combined work, and to convey the resulting work. The terms of this
|
|
||||||
License will continue to apply to the part which is the covered work,
|
|
||||||
but the special requirements of the GNU Affero General Public License,
|
|
||||||
section 13, concerning interaction through a network will apply to the
|
|
||||||
combination as such.
|
|
||||||
|
|
||||||
14. Revised Versions of this License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions of
|
|
||||||
the GNU General Public License from time to time. Such new versions will
|
|
||||||
be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the
|
|
||||||
Program specifies that a certain numbered version of the GNU General
|
|
||||||
Public License "or any later version" applies to it, you have the
|
|
||||||
option of following the terms and conditions either of that numbered
|
|
||||||
version or of any later version published by the Free Software
|
|
||||||
Foundation. If the Program does not specify a version number of the
|
|
||||||
GNU General Public License, you may choose any version ever published
|
|
||||||
by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Program specifies that a proxy can decide which future
|
|
||||||
versions of the GNU General Public License can be used, that proxy's
|
|
||||||
public statement of acceptance of a version permanently authorizes you
|
|
||||||
to choose that version for the Program.
|
|
||||||
|
|
||||||
Later license versions may give you additional or different
|
|
||||||
permissions. However, no additional obligations are imposed on any
|
|
||||||
author or copyright holder as a result of your choosing to follow a
|
|
||||||
later version.
|
|
||||||
|
|
||||||
15. Disclaimer of Warranty.
|
|
||||||
|
|
||||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
|
||||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
|
||||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
|
||||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
|
||||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
|
||||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
16. Limitation of Liability.
|
|
||||||
|
|
||||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
|
||||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
|
||||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
|
||||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
|
||||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
|
||||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
|
||||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
|
||||||
SUCH DAMAGES.
|
|
||||||
|
|
||||||
17. Interpretation of Sections 15 and 16.
|
|
||||||
|
|
||||||
If the disclaimer of warranty and limitation of liability provided
|
|
||||||
above cannot be given local legal effect according to their terms,
|
|
||||||
reviewing courts shall apply local law that most closely approximates
|
|
||||||
an absolute waiver of all civil liability in connection with the
|
|
||||||
Program, unless a warranty or assumption of liability accompanies a
|
|
||||||
copy of the Program in return for a fee.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
state the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
{one line to give the program's name and a brief idea of what it does.}
|
|
||||||
Copyright (C) {year} {name of author}
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If the program does terminal interaction, make it output a short
|
|
||||||
notice like this when it starts in an interactive mode:
|
|
||||||
|
|
||||||
{project} Copyright (C) {year} {fullname}
|
|
||||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
||||||
This is free software, and you are welcome to redistribute it
|
|
||||||
under certain conditions; type `show c' for details.
|
|
||||||
|
|
||||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
|
||||||
parts of the General Public License. Of course, your program's commands
|
|
||||||
might be different; for a GUI interface, you would use an "about box".
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or school,
|
|
||||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
|
||||||
For more information on this, and how to apply and follow the GNU GPL, see
|
|
||||||
<http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
The GNU General Public License does not permit incorporating your program
|
|
||||||
into proprietary programs. If your program is a subroutine library, you
|
|
||||||
may consider it more useful to permit linking proprietary applications with
|
|
||||||
the library. If this is what you want to do, use the GNU Lesser General
|
|
||||||
Public License instead of this License. But first, please read
|
|
||||||
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
|
||||||
53
README.md
53
README.md
@ -1,52 +1,3 @@
|
|||||||
## Sonoff-Tasmota
|
# Tasmota
|
||||||
Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE.
|
|
||||||
|
|
||||||
Current version is **5.1.6** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/master/sonoff/_releasenotes.ino) for change information.
|
Local copy of the https://github.com/arendst/Tasmota#
|
||||||
|
|
||||||
### **** ATTENTION Version 5.x.x specific information ****
|
|
||||||
|
|
||||||
This version uses a new linker script to free flash memory for future code additions. It moves the settings from Spiffs to Eeprom. If you compile your own firmware download the new linker to your IDE or Platformio base folder. See [Wiki > Prerequisite](https://github.com/arendst/Sonoff-Tasmota/wiki/Prerequisite).
|
|
||||||
|
|
||||||
Best practice to implement is:
|
|
||||||
- Open the webpage to your device
|
|
||||||
- Perform option ``Backup Configuration``
|
|
||||||
- Upgrade new firmware using ``Firmware upgrade``
|
|
||||||
- If configuration conversion fails keep the webpage open and perform ``Restore Configuration``
|
|
||||||
|
|
||||||
You should now have a device with 32k more code memory to play with.
|
|
||||||
|
|
||||||
### *********************************************************
|
|
||||||
|
|
||||||
- This version provides all (Sonoff) modules in one file and starts up with Sonoff Basic.
|
|
||||||
- Once uploaded select module using the configuration webpage or the commands ```Modules``` and ```Module```.
|
|
||||||
- After reboot select config menu again or use commands ```GPIOs``` and ```GPIO``` to change GPIO with desired sensor.
|
|
||||||
|
|
||||||
<img src="https://github.com/arendst/arendst.github.io/blob/master/media/sonoffbasic.jpg" width="250" align="right" />
|
|
||||||
|
|
||||||
See [Wiki](https://github.com/arendst/Sonoff-Tasmota/wiki) for more information.<br />
|
|
||||||
See [Community](https://groups.google.com/d/forum/sonoffusers) for forum and more user experience.
|
|
||||||
|
|
||||||
The following devices are supported:
|
|
||||||
- [iTead Sonoff Basic](http://sonoff.itead.cc/en/products/sonoff/sonoff-basic)
|
|
||||||
- [iTead Sonoff RF](http://sonoff.itead.cc/en/products/sonoff/sonoff-rf)
|
|
||||||
- [iTead Sonoff SV](https://www.itead.cc/sonoff-sv.html)<img src="https://github.com/arendst/arendst.github.io/blob/master/media/sonoff_th.jpg" width="250" align="right" />
|
|
||||||
- [iTead Sonoff TH10/TH16 with temperature sensor](http://sonoff.itead.cc/en/products/sonoff/sonoff-th)
|
|
||||||
- [iTead Sonoff Dual](http://sonoff.itead.cc/en/products/sonoff/sonoff-dual)
|
|
||||||
- [iTead Sonoff Pow](http://sonoff.itead.cc/en/products/sonoff/sonoff-pow)
|
|
||||||
- [iTead Sonoff 4CH](http://sonoff.itead.cc/en/products/sonoff/sonoff-4ch)
|
|
||||||
- [iTead S20 Smart Socket](http://sonoff.itead.cc/en/products/residential/s20-socket)
|
|
||||||
- [iTead Slampher](http://sonoff.itead.cc/en/products/residential/slampher-rf)
|
|
||||||
- [iTead Sonoff Touch](http://sonoff.itead.cc/en/products/residential/sonoff-touch)
|
|
||||||
- [iTead Sonoff SC](http://sonoff.itead.cc/en/products/residential/sonoff-sc)
|
|
||||||
- [iTead Sonoff Led](http://sonoff.itead.cc/en/products/appliances/sonoff-led)
|
|
||||||
- [iTead Sonoff Dev](https://www.itead.cc/sonoff-dev.html)
|
|
||||||
- [iTead 1 Channel Switch 5V / 12V](https://www.itead.cc/smart-home/inching-self-locking-wifi-wireless-switch.html)
|
|
||||||
- [iTead Motor Clockwise/Anticlockwise](https://www.itead.cc/smart-home/motor-reversing-wifi-wireless-switch.html)
|
|
||||||
- [Electrodragon IoT Relay Board](http://www.electrodragon.com/product/wifi-iot-relay-board-based-esp8266/)
|
|
||||||
|
|
||||||
Future support
|
|
||||||
- [iTead Sonoff 4CH Pro](https://www.itead.cc/sonoff-4ch-pro.html)
|
|
||||||
|
|
||||||
|
|
||||||
<img src="https://github.com/arendst/arendst.github.io/blob/master/media/sonofftoucheu.jpg" height="280" align="left" />
|
|
||||||
<img src="https://github.com/arendst/arendst.github.io/blob/master/media/sonoff4ch.jpg" height="250" align="right" />
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
<?php
|
|
||||||
// mkdir and chmod arduino folder to 777
|
|
||||||
//
|
|
||||||
//var_dump($_FILES);
|
|
||||||
|
|
||||||
$image = basename($_FILES["file"]["name"]);
|
|
||||||
$target_file = "arduino/".$image;
|
|
||||||
$hostname = $_SERVER['SERVER_NAME'];
|
|
||||||
|
|
||||||
if (move_uploaded_file($_FILES["file"]["tmp_name"], $target_file)) {
|
|
||||||
echo "The file $image has been uploaded to OTA server $hostname. \n";
|
|
||||||
} else {
|
|
||||||
echo "Sorry, there was an error uploading your file $image to OTA server $hostname. \n";
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
@ -1,112 +0,0 @@
|
|||||||
#!/usr/bin/python
|
|
||||||
#
|
|
||||||
# espupload by Theo Arends - 20170103
|
|
||||||
#
|
|
||||||
# Uploads binary file to OTA server
|
|
||||||
#
|
|
||||||
# Execute: espupload -i <Host_IP_address> -p <Host_port> -f <sketch.bin>
|
|
||||||
#
|
|
||||||
# Needs pycurl
|
|
||||||
# - pip install pycurl
|
|
||||||
|
|
||||||
import sys
|
|
||||||
import os
|
|
||||||
import optparse
|
|
||||||
import logging
|
|
||||||
import pycurl
|
|
||||||
|
|
||||||
HOST_ADDR = "domus1"
|
|
||||||
HOST_PORT = 80
|
|
||||||
HOST_URL = "/api/upload-arduino.php"
|
|
||||||
|
|
||||||
def upload(hostAddr, hostPort, filename):
|
|
||||||
url = 'http://%s:%d%s' % (hostAddr, hostPort, HOST_URL)
|
|
||||||
c = pycurl.Curl()
|
|
||||||
c.setopt(c.URL, url)
|
|
||||||
# The "Expect:" is there to suppress "Expect: 100-continue" behaviour that is
|
|
||||||
# the default in libcurl when posting large bodies (and fails on lighttpd).
|
|
||||||
c.setopt(c.HTTPHEADER, ["Expect:"])
|
|
||||||
c.setopt(c.HTTPPOST, [('file', (c.FORM_FILE, filename, )), ])
|
|
||||||
c.perform()
|
|
||||||
c.close()
|
|
||||||
|
|
||||||
def parser():
|
|
||||||
parser = optparse.OptionParser(
|
|
||||||
usage = "%prog [options]",
|
|
||||||
description = "Upload image to over the air Host server for the esp8266 module with OTA support."
|
|
||||||
)
|
|
||||||
|
|
||||||
# destination ip and port
|
|
||||||
group = optparse.OptionGroup(parser, "Destination")
|
|
||||||
group.add_option("-i", "--host_ip",
|
|
||||||
dest = "host_ip",
|
|
||||||
action = "store",
|
|
||||||
help = "Host IP Address.",
|
|
||||||
default = HOST_ADDR
|
|
||||||
)
|
|
||||||
group.add_option("-p", "--host_port",
|
|
||||||
dest = "host_port",
|
|
||||||
type = "int",
|
|
||||||
help = "Host server ota Port. Default 80",
|
|
||||||
default = HOST_PORT
|
|
||||||
)
|
|
||||||
parser.add_option_group(group)
|
|
||||||
|
|
||||||
# image
|
|
||||||
group = optparse.OptionGroup(parser, "Image")
|
|
||||||
group.add_option("-f", "--file",
|
|
||||||
dest = "image",
|
|
||||||
help = "Image file.",
|
|
||||||
metavar="FILE",
|
|
||||||
default = None
|
|
||||||
)
|
|
||||||
parser.add_option_group(group)
|
|
||||||
|
|
||||||
# output group
|
|
||||||
group = optparse.OptionGroup(parser, "Output")
|
|
||||||
group.add_option("-d", "--debug",
|
|
||||||
dest = "debug",
|
|
||||||
help = "Show debug output. And override loglevel with debug.",
|
|
||||||
action = "store_true",
|
|
||||||
default = False
|
|
||||||
)
|
|
||||||
parser.add_option_group(group)
|
|
||||||
|
|
||||||
(options, args) = parser.parse_args()
|
|
||||||
|
|
||||||
return options
|
|
||||||
# end parser
|
|
||||||
|
|
||||||
def main(args):
|
|
||||||
# get options
|
|
||||||
options = parser()
|
|
||||||
|
|
||||||
# adapt log level
|
|
||||||
loglevel = logging.WARNING
|
|
||||||
if (options.debug):
|
|
||||||
loglevel = logging.DEBUG
|
|
||||||
# end if
|
|
||||||
|
|
||||||
# logging
|
|
||||||
logging.basicConfig(level = loglevel, format = '%(asctime)-8s [%(levelname)s]: %(message)s', datefmt = '%H:%M:%S')
|
|
||||||
|
|
||||||
logging.debug("Options: %s", str(options))
|
|
||||||
|
|
||||||
if (not options.host_ip or not options.image):
|
|
||||||
logging.critical("Not enough arguments.")
|
|
||||||
|
|
||||||
return 1
|
|
||||||
# end if
|
|
||||||
|
|
||||||
if not os.path.exists(options.image):
|
|
||||||
logging.critical('Sorry: the file %s does not exist', options.image)
|
|
||||||
|
|
||||||
return 1
|
|
||||||
# end if
|
|
||||||
|
|
||||||
upload(options.host_ip, options.host_port, options.image)
|
|
||||||
# end main
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
sys.exit(main(sys.argv))
|
|
||||||
# end if
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,130 +0,0 @@
|
|||||||
|
|
||||||
# ESP8266 platform
|
|
||||||
# ------------------------------
|
|
||||||
|
|
||||||
# For more info:
|
|
||||||
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
|
|
||||||
|
|
||||||
name=ESP8266 Modules
|
|
||||||
version=2.2.0
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
compiler.warning_flags=-w
|
|
||||||
compiler.warning_flags.none=-w
|
|
||||||
compiler.warning_flags.default=
|
|
||||||
compiler.warning_flags.more=-Wall
|
|
||||||
compiler.warning_flags.all=-Wall -Wextra
|
|
||||||
|
|
||||||
build.lwip_lib=-llwip_gcc
|
|
||||||
build.lwip_flags=-DLWIP_OPEN_SRC
|
|
||||||
|
|
||||||
compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
|
|
||||||
compiler.sdk.path={runtime.platform.path}/tools/sdk
|
|
||||||
compiler.cpreprocessor.flags=-D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I{compiler.sdk.path}/include" "-I{compiler.sdk.path}/lwip/include" "-I{build.path}/core"
|
|
||||||
|
|
||||||
compiler.c.cmd=xtensa-lx106-elf-gcc
|
|
||||||
compiler.c.flags=-c {compiler.warning_flags} -Os -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -falign-functions=4 -MMD -std=gnu99 -ffunction-sections -fdata-sections
|
|
||||||
|
|
||||||
compiler.S.cmd=xtensa-lx106-elf-gcc
|
|
||||||
compiler.S.flags=-c -g -x assembler-with-cpp -MMD -mlongcalls
|
|
||||||
|
|
||||||
compiler.c.elf.flags=-g {compiler.warning_flags} -Os -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" "-T{build.flash_ld}" -Wl,--gc-sections -Wl,-wrap,system_restart_local -Wl,-wrap,register_chipv6_phy
|
|
||||||
|
|
||||||
compiler.c.elf.cmd=xtensa-lx106-elf-gcc
|
|
||||||
compiler.c.elf.libs=-lm -lgcc -lhal -lphy -lpp -lnet80211 -lwpa -lcrypto -lmain -lwps -laxtls -lsmartconfig -lmesh -lwpa2 {build.lwip_lib} -lstdc++
|
|
||||||
|
|
||||||
compiler.cpp.cmd=xtensa-lx106-elf-g++
|
|
||||||
compiler.cpp.flags=-c {compiler.warning_flags} -Os -g -mlongcalls -mtext-section-literals -fno-exceptions -fno-rtti -falign-functions=4 -std=c++11 -MMD -ffunction-sections -fdata-sections
|
|
||||||
|
|
||||||
compiler.as.cmd=xtensa-lx106-elf-as
|
|
||||||
|
|
||||||
compiler.ar.cmd=xtensa-lx106-elf-ar
|
|
||||||
compiler.ar.flags=cru
|
|
||||||
|
|
||||||
compiler.elf2hex.cmd=esptool
|
|
||||||
compiler.elf2hex.flags=
|
|
||||||
|
|
||||||
compiler.size.cmd=xtensa-lx106-elf-size
|
|
||||||
|
|
||||||
compiler.esptool.cmd=esptool
|
|
||||||
compiler.esptool.cmd.windows=esptool.exe
|
|
||||||
|
|
||||||
# This can be overriden in boards.txt
|
|
||||||
build.extra_flags=-DESP8266
|
|
||||||
|
|
||||||
# These can be overridden in platform.local.txt
|
|
||||||
compiler.c.extra_flags=
|
|
||||||
compiler.c.elf.extra_flags=
|
|
||||||
compiler.S.extra_flags=
|
|
||||||
compiler.cpp.extra_flags=
|
|
||||||
compiler.ar.extra_flags=
|
|
||||||
compiler.objcopy.eep.extra_flags=
|
|
||||||
compiler.elf2hex.extra_flags=
|
|
||||||
|
|
||||||
## generate file with git version number
|
|
||||||
## needs bash, git, and echo
|
|
||||||
|
|
||||||
## windows-compatible version may be added later
|
|
||||||
|
|
||||||
|
|
||||||
## Compile c files
|
|
||||||
recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
|
|
||||||
|
|
||||||
## Compile c++ files
|
|
||||||
recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
|
|
||||||
|
|
||||||
## Compile S files
|
|
||||||
recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
|
|
||||||
|
|
||||||
## Create archives
|
|
||||||
recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/arduino.ar" "{object_file}"
|
|
||||||
|
|
||||||
## Combine gc-sections, archives, and objects
|
|
||||||
recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" -Wl,--start-group {object_files} "{build.path}/arduino.ar" {compiler.c.elf.libs} -Wl,--end-group "-L{build.path}"
|
|
||||||
|
|
||||||
## Create eeprom
|
|
||||||
recipe.objcopy.eep.pattern=
|
|
||||||
|
|
||||||
## Create hex
|
|
||||||
#recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.hex"
|
|
||||||
|
|
||||||
recipe.objcopy.hex.pattern="{runtime.tools.esptool.path}/{compiler.esptool.cmd}" -eo "{runtime.platform.path}/bootloaders/eboot/eboot.elf" -bo "{build.path}/{build.project_name}.bin" -bm {build.flash_mode} -bf {build.flash_freq} -bz {build.flash_size} -bs .text -bp 4096 -ec -eo "{build.path}/{build.project_name}.elf" -bs .irom0.text -bs .text -bs .data -bs .rodata -bc -ec
|
|
||||||
|
|
||||||
## Save hex
|
|
||||||
recipe.output.tmp_file={build.project_name}.bin
|
|
||||||
recipe.output.save_file={build.project_name}.{build.variant}.bin
|
|
||||||
|
|
||||||
## Compute size
|
|
||||||
recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
|
|
||||||
recipe.size.regex=^(?:\.irom0\.text|\.text|\.data|\.rodata|)\s+([0-9]+).*
|
|
||||||
recipe.size.regex.data=^(?:\.data|\.rodata|\.bss)\s+([0-9]+).*
|
|
||||||
#recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
|
|
||||||
|
|
||||||
# ------------------------------
|
|
||||||
|
|
||||||
tools.esptool.cmd=esptool
|
|
||||||
tools.esptool.cmd.windows=esptool.exe
|
|
||||||
tools.esptool.path={runtime.tools.esptool.path}
|
|
||||||
tools.esptool.network_cmd=python
|
|
||||||
tools.esptool.network_cmd.windows=python.exe
|
|
||||||
|
|
||||||
tools.esptool.upload.protocol=esp
|
|
||||||
tools.esptool.upload.params.verbose=-vv
|
|
||||||
tools.esptool.upload.params.quiet=
|
|
||||||
tools.esptool.upload.pattern="{path}/{cmd}" {upload.verbose} -cd {upload.resetmethod} -cb {upload.speed} -cp "{serial.port}" -ca 0x00000 -cf "{build.path}/{build.project_name}.bin"
|
|
||||||
tools.esptool.upload.network_pattern="{network_cmd}" "{runtime.platform.path}/tools/espota.py" -i "{serial.port}" -p "{network.port}" "--auth={network.password}" -f "{build.path}/{build.project_name}.bin"
|
|
||||||
|
|
||||||
tools.mkspiffs.cmd=mkspiffs
|
|
||||||
tools.mkspiffs.cmd.windows=mkspiffs.exe
|
|
||||||
tools.mkspiffs.path={runtime.tools.mkspiffs.path}
|
|
||||||
|
|
||||||
tools.espupload.cmd=python
|
|
||||||
tools.espupload.cmd.windows=python.exe
|
|
||||||
tools.espupload.path={runtime.platform.path}/tools
|
|
||||||
|
|
||||||
tools.espupload.upload.protocol=espupload
|
|
||||||
tools.espupload.upload.params.verbose=
|
|
||||||
tools.espupload.upload.params.quiet=
|
|
||||||
tools.espupload.upload.pattern="{cmd}" "{path}/espupload.py" -f "{build.path}/{build.project_name}.bin"
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
/* Flash Split for 1M chips, no SPIFFS */
|
|
||||||
/* sketch 999KB */
|
|
||||||
/* eeprom 20KB */
|
|
||||||
|
|
||||||
MEMORY
|
|
||||||
{
|
|
||||||
dport0_0_seg : org = 0x3FF00000, len = 0x10
|
|
||||||
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
|
|
||||||
iram1_0_seg : org = 0x40100000, len = 0x8000
|
|
||||||
irom0_0_seg : org = 0x40201010, len = 0xf9ff0
|
|
||||||
}
|
|
||||||
|
|
||||||
PROVIDE ( _SPIFFS_start = 0x402FB000 );
|
|
||||||
PROVIDE ( _SPIFFS_end = 0x402FB000 );
|
|
||||||
PROVIDE ( _SPIFFS_page = 0 );
|
|
||||||
PROVIDE ( _SPIFFS_block = 0 );
|
|
||||||
|
|
||||||
INCLUDE "../ld/eagle.app.v6.common.ld"
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,131 +0,0 @@
|
|||||||
|
|
||||||
# ESP8266 platform
|
|
||||||
# ------------------------------
|
|
||||||
|
|
||||||
# For more info:
|
|
||||||
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
|
|
||||||
|
|
||||||
name=ESP8266 Modules
|
|
||||||
version=2.4.0
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
compiler.warning_flags=-w
|
|
||||||
compiler.warning_flags.none=-w
|
|
||||||
compiler.warning_flags.default=
|
|
||||||
compiler.warning_flags.more=-Wall
|
|
||||||
compiler.warning_flags.all=-Wall -Wextra
|
|
||||||
|
|
||||||
build.lwip_lib=-llwip_gcc
|
|
||||||
build.lwip_flags=-DLWIP_OPEN_SRC
|
|
||||||
|
|
||||||
compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
|
|
||||||
compiler.sdk.path={runtime.platform.path}/tools/sdk
|
|
||||||
compiler.libc.path={runtime.platform.path}/tools/sdk/libc/xtensa-lx106-elf
|
|
||||||
compiler.cpreprocessor.flags=-D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I{compiler.sdk.path}/include" "-I{compiler.sdk.path}/lwip/include" "-I{compiler.libc.path}/include" "-I{build.path}/core"
|
|
||||||
|
|
||||||
compiler.c.cmd=xtensa-lx106-elf-gcc
|
|
||||||
compiler.c.flags=-c {compiler.warning_flags} -Os -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -falign-functions=4 -MMD -std=gnu99 -ffunction-sections -fdata-sections
|
|
||||||
|
|
||||||
compiler.S.cmd=xtensa-lx106-elf-gcc
|
|
||||||
compiler.S.flags=-c -g -x assembler-with-cpp -MMD -mlongcalls
|
|
||||||
|
|
||||||
compiler.c.elf.flags=-g {compiler.warning_flags} -Os -nostdlib -Wl,--no-check-sections -u call_user_start -u _printf_float -u _scanf_float -Wl,-static "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" "-L{compiler.libc.path}/lib" "-T{build.flash_ld}" -Wl,--gc-sections -Wl,-wrap,system_restart_local -Wl,-wrap,spi_flash_read
|
|
||||||
|
|
||||||
compiler.c.elf.cmd=xtensa-lx106-elf-gcc
|
|
||||||
compiler.c.elf.libs=-lhal -lphy -lpp -lnet80211 {build.lwip_lib} -lwpa -lcrypto -lmain -lwps -laxtls -lespnow -lsmartconfig -lmesh -lwpa2 -lstdc++ -lm -lc -lgcc
|
|
||||||
|
|
||||||
compiler.cpp.cmd=xtensa-lx106-elf-g++
|
|
||||||
compiler.cpp.flags=-c {compiler.warning_flags} -Os -g -mlongcalls -mtext-section-literals -fno-exceptions -fno-rtti -falign-functions=4 -std=c++11 -MMD -ffunction-sections -fdata-sections
|
|
||||||
|
|
||||||
compiler.as.cmd=xtensa-lx106-elf-as
|
|
||||||
|
|
||||||
compiler.ar.cmd=xtensa-lx106-elf-ar
|
|
||||||
compiler.ar.flags=cru
|
|
||||||
|
|
||||||
compiler.elf2hex.cmd=esptool
|
|
||||||
compiler.elf2hex.flags=
|
|
||||||
|
|
||||||
compiler.size.cmd=xtensa-lx106-elf-size
|
|
||||||
|
|
||||||
compiler.esptool.cmd=esptool
|
|
||||||
compiler.esptool.cmd.windows=esptool.exe
|
|
||||||
|
|
||||||
# This can be overriden in boards.txt
|
|
||||||
build.extra_flags=-DESP8266
|
|
||||||
|
|
||||||
# These can be overridden in platform.local.txt
|
|
||||||
compiler.c.extra_flags=
|
|
||||||
compiler.c.elf.extra_flags=
|
|
||||||
compiler.S.extra_flags=
|
|
||||||
compiler.cpp.extra_flags=
|
|
||||||
compiler.ar.extra_flags=
|
|
||||||
compiler.objcopy.eep.extra_flags=
|
|
||||||
compiler.elf2hex.extra_flags=
|
|
||||||
|
|
||||||
## generate file with git version number
|
|
||||||
## needs bash, git, and echo
|
|
||||||
|
|
||||||
## windows-compatible version may be added later
|
|
||||||
|
|
||||||
|
|
||||||
## Compile c files
|
|
||||||
recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
|
|
||||||
|
|
||||||
## Compile c++ files
|
|
||||||
recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
|
|
||||||
|
|
||||||
## Compile S files
|
|
||||||
recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
|
|
||||||
|
|
||||||
## Create archives
|
|
||||||
recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/arduino.ar" "{object_file}"
|
|
||||||
|
|
||||||
## Combine gc-sections, archives, and objects
|
|
||||||
recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" -Wl,--start-group {object_files} "{build.path}/arduino.ar" {compiler.c.elf.libs} -Wl,--end-group "-L{build.path}"
|
|
||||||
|
|
||||||
## Create eeprom
|
|
||||||
recipe.objcopy.eep.pattern=
|
|
||||||
|
|
||||||
## Create hex
|
|
||||||
#recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.hex"
|
|
||||||
|
|
||||||
recipe.objcopy.hex.pattern="{runtime.tools.esptool.path}/{compiler.esptool.cmd}" -eo "{runtime.platform.path}/bootloaders/eboot/eboot.elf" -bo "{build.path}/{build.project_name}.bin" -bm {build.flash_mode} -bf {build.flash_freq} -bz {build.flash_size} -bs .text -bp 4096 -ec -eo "{build.path}/{build.project_name}.elf" -bs .irom0.text -bs .text -bs .data -bs .rodata -bc -ec
|
|
||||||
|
|
||||||
## Save hex
|
|
||||||
recipe.output.tmp_file={build.project_name}.bin
|
|
||||||
recipe.output.save_file={build.project_name}.{build.variant}.bin
|
|
||||||
|
|
||||||
## Compute size
|
|
||||||
recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
|
|
||||||
recipe.size.regex=^(?:\.irom0\.text|\.text|\.data|\.rodata|)\s+([0-9]+).*
|
|
||||||
recipe.size.regex.data=^(?:\.data|\.rodata|\.bss)\s+([0-9]+).*
|
|
||||||
#recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
|
|
||||||
|
|
||||||
# ------------------------------
|
|
||||||
|
|
||||||
tools.esptool.cmd=esptool
|
|
||||||
tools.esptool.cmd.windows=esptool.exe
|
|
||||||
tools.esptool.path={runtime.tools.esptool.path}
|
|
||||||
tools.esptool.network_cmd=python
|
|
||||||
tools.esptool.network_cmd.windows=python.exe
|
|
||||||
|
|
||||||
tools.esptool.upload.protocol=esp
|
|
||||||
tools.esptool.upload.params.verbose=-vv
|
|
||||||
tools.esptool.upload.params.quiet=
|
|
||||||
tools.esptool.upload.pattern="{path}/{cmd}" {upload.verbose} -cd {upload.resetmethod} -cb {upload.speed} -cp "{serial.port}" -ca 0x00000 -cf "{build.path}/{build.project_name}.bin"
|
|
||||||
tools.esptool.upload.network_pattern="{network_cmd}" "{runtime.platform.path}/tools/espota.py" -i "{serial.port}" -p "{network.port}" "--auth={network.password}" -f "{build.path}/{build.project_name}.bin"
|
|
||||||
|
|
||||||
tools.mkspiffs.cmd=mkspiffs
|
|
||||||
tools.mkspiffs.cmd.windows=mkspiffs.exe
|
|
||||||
tools.mkspiffs.path={runtime.tools.mkspiffs.path}
|
|
||||||
|
|
||||||
tools.espupload.cmd=python
|
|
||||||
tools.espupload.cmd.windows=python.exe
|
|
||||||
tools.espupload.path={runtime.platform.path}/tools
|
|
||||||
|
|
||||||
tools.espupload.upload.protocol=espupload
|
|
||||||
tools.espupload.upload.params.verbose=
|
|
||||||
tools.espupload.upload.params.quiet=
|
|
||||||
tools.espupload.upload.pattern="{cmd}" "{path}/espupload.py" -f "{build.path}/{build.project_name}.bin"
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
/* Flash Split for 1M chips */
|
|
||||||
/* sketch 999KB */
|
|
||||||
/* eeprom 20KB */
|
|
||||||
|
|
||||||
MEMORY
|
|
||||||
{
|
|
||||||
dport0_0_seg : org = 0x3FF00000, len = 0x10
|
|
||||||
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
|
|
||||||
iram1_0_seg : org = 0x40100000, len = 0x8000
|
|
||||||
irom0_0_seg : org = 0x40201010, len = 0xf9ff0
|
|
||||||
}
|
|
||||||
|
|
||||||
PROVIDE ( _SPIFFS_start = 0x402FB000 );
|
|
||||||
PROVIDE ( _SPIFFS_end = 0x402FB000 );
|
|
||||||
PROVIDE ( _SPIFFS_page = 0 );
|
|
||||||
PROVIDE ( _SPIFFS_block = 0 );
|
|
||||||
|
|
||||||
INCLUDE "esp8266.flash.common.ld"
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#include "include/ArduinoJson.h"
|
|
||||||
@ -1,427 +0,0 @@
|
|||||||
ArduinoJson: change log
|
|
||||||
=======================
|
|
||||||
|
|
||||||
v5.8.3
|
|
||||||
------
|
|
||||||
|
|
||||||
* Fixed an access violation in `DynamicJsonBuffer` when memory allocation fails (issue #433)
|
|
||||||
* Added operators `==` and `!=` for two `JsonVariant`s (issue #436)
|
|
||||||
* Fixed `JsonVariant::operator[const FlashStringHelper*]` (issue #441)
|
|
||||||
|
|
||||||
v5.8.2
|
|
||||||
------
|
|
||||||
|
|
||||||
* Fixed parsing of comments (issue #421)
|
|
||||||
* Fixed ignored `Stream` timeout (issue #422)
|
|
||||||
* Made sure we don't read more that necessary (issue #422)
|
|
||||||
* Fixed error when the key of a `JsonObject` is a `char[]` (issue #423)
|
|
||||||
* Reduced code size when using `const` references
|
|
||||||
* Fixed error with string of type `unsigned char*` (issue #428)
|
|
||||||
* Added `deprecated` attribute on `asArray()`, `asObject()` and `asString()` (issue #420)
|
|
||||||
|
|
||||||
v5.8.1
|
|
||||||
------
|
|
||||||
|
|
||||||
* Fixed error when assigning a `volatile int` to a `JsonVariant` (issue #415)
|
|
||||||
* Fixed errors with Variable Length Arrays (issue #416)
|
|
||||||
* Fixed error when both `ARDUINOJSON_ENABLE_STD_STREAM` and `ARDUINOJSON_ENABLE_ARDUINO_STREAM` are set to `1`
|
|
||||||
* Fixed error "Stream does not name a type" (issue #412)
|
|
||||||
|
|
||||||
v5.8.0
|
|
||||||
------
|
|
||||||
|
|
||||||
* Added operator `==` to compare `JsonVariant` and strings (issue #402)
|
|
||||||
* Added support for `Stream` (issue #300)
|
|
||||||
* Reduced memory consumption by not duplicating spaces and comments
|
|
||||||
|
|
||||||
**BREAKING CHANGES**:
|
|
||||||
|
|
||||||
`JsonBuffer::parseObject()` and `JsonBuffer::parseArray()` have been pulled down to the derived classes `DynamicJsonBuffer` and `StaticJsonBufferBase`.
|
|
||||||
|
|
||||||
This means that if you have code like:
|
|
||||||
|
|
||||||
```c++
|
|
||||||
void myFunction(JsonBuffer& jsonBuffer);
|
|
||||||
```
|
|
||||||
|
|
||||||
you need to replace it with one of the following:
|
|
||||||
|
|
||||||
```c++
|
|
||||||
void myFunction(DynamicJsonBuffer& jsonBuffer);
|
|
||||||
void myFunction(StaticJsonBufferBase& jsonBuffer);
|
|
||||||
template<typename TJsonBuffer> void myFunction(TJsonBuffer& jsonBuffer);
|
|
||||||
```
|
|
||||||
|
|
||||||
v5.7.3
|
|
||||||
------
|
|
||||||
|
|
||||||
* Added an `printTo(char[N])` and `prettyPrintTo(char[N])` (issue #292)
|
|
||||||
* Added ability to set a nested value like this: `root["A"]["B"] = "C"` (issue #352)
|
|
||||||
* Renamed `*.ipp` to `*Impl.hpp` because they were ignored by Arduino IDE (issue #396)
|
|
||||||
|
|
||||||
v5.7.2
|
|
||||||
------
|
|
||||||
|
|
||||||
* Made PROGMEM available on more platforms (issue #381)
|
|
||||||
* Fixed PROGMEM causing an exception on ESP8266 (issue #383)
|
|
||||||
|
|
||||||
v5.7.1
|
|
||||||
------
|
|
||||||
|
|
||||||
* Added support for PROGMEM (issue #76)
|
|
||||||
* Fixed compilation error when index is not an `int` (issue #381)
|
|
||||||
|
|
||||||
v5.7.0
|
|
||||||
------
|
|
||||||
|
|
||||||
* Templatized all functions using `String` or `std::string`
|
|
||||||
* Removed `ArduinoJson::String`
|
|
||||||
* Removed `JsonVariant::defaultValue<T>()`
|
|
||||||
* Removed non-template `JsonObject::get()` and `JsonArray.get()`
|
|
||||||
* Fixed support for `StringSumHelper` (issue #184)
|
|
||||||
* Replaced `ARDUINOJSON_USE_ARDUINO_STRING` by `ARDUINOJSON_ENABLE_STD_STRING` and `ARDUINOJSON_ENABLE_ARDUINO_STRING` (issue #378)
|
|
||||||
* Added example `StringExample.ino` to show where `String` can be used
|
|
||||||
* Increased default nesting limit to 50 when compiled for a computer (issue #349)
|
|
||||||
|
|
||||||
**BREAKING CHANGES**:
|
|
||||||
|
|
||||||
The non-template functions `JsonObject::get()` and `JsonArray.get()` have been removed. This means that you need to explicitely tell the type you expect in return.
|
|
||||||
|
|
||||||
Old code:
|
|
||||||
|
|
||||||
```c++
|
|
||||||
#define ARDUINOJSON_USE_ARDUINO_STRING 0
|
|
||||||
JsonVariant value1 = myObject.get("myKey");
|
|
||||||
JsonVariant value2 = myArray.get(0);
|
|
||||||
```
|
|
||||||
|
|
||||||
New code:
|
|
||||||
|
|
||||||
```c++
|
|
||||||
#define ARDUINOJSON_ENABLE_ARDUINO_STRING 0
|
|
||||||
#define ARDUINOJSON_ENABLE_STD_STRING 1
|
|
||||||
JsonVariant value1 = myObject.get<JsonVariant>("myKey");
|
|
||||||
JsonVariant value2 = myArray.get<JsonVariant>(0);
|
|
||||||
```
|
|
||||||
|
|
||||||
|
|
||||||
v5.6.7
|
|
||||||
------
|
|
||||||
|
|
||||||
* Fixed `array[idx].as<JsonVariant>()` and `object[key].as<JsonVariant>()`
|
|
||||||
* Fixed return value of `JsonObject::set()` (issue #350)
|
|
||||||
* Fixed undefined behavior in `Prettyfier` and `Print` (issue #354)
|
|
||||||
* Fixed parser that incorrectly rejected floats containing a `+` (issue #349)
|
|
||||||
|
|
||||||
v5.6.6
|
|
||||||
------
|
|
||||||
|
|
||||||
* Fixed `-Wparentheses` warning introduced in v5.6.5 (PR #335 by @nuket)
|
|
||||||
* Added `.mbedignore` for ARM mbdeb (PR #334 by @nuket)
|
|
||||||
* Fixed `JsonVariant::success()` which didn't propagate `JsonArray::success()` nor `JsonObject::success()` (issue #342).
|
|
||||||
|
|
||||||
v5.6.5
|
|
||||||
------
|
|
||||||
|
|
||||||
* `as<char*>()` now returns `true` when input is `null` (issue #330)
|
|
||||||
|
|
||||||
v5.6.4
|
|
||||||
------
|
|
||||||
|
|
||||||
* Fixed error in float serialization (issue #324)
|
|
||||||
|
|
||||||
v5.6.3
|
|
||||||
------
|
|
||||||
|
|
||||||
* Improved speed of float serialization (about twice faster)
|
|
||||||
* Added `as<JsonArray>()` as a synonym for `as<JsonArray&>()`... (issue #291)
|
|
||||||
* Fixed `call of overloaded isinf(double&) is ambiguous` (issue #284)
|
|
||||||
|
|
||||||
v5.6.2
|
|
||||||
------
|
|
||||||
|
|
||||||
* Fixed build when another lib does `#undef isnan` (issue #284)
|
|
||||||
|
|
||||||
v5.6.1
|
|
||||||
------
|
|
||||||
|
|
||||||
* Added missing `#pragma once` (issue #310)
|
|
||||||
|
|
||||||
v5.6.0
|
|
||||||
------
|
|
||||||
|
|
||||||
* ArduinoJson is now a header-only library (issue #199)
|
|
||||||
|
|
||||||
v5.5.1
|
|
||||||
------
|
|
||||||
|
|
||||||
* Fixed compilation error with Intel Galileo (issue #299)
|
|
||||||
|
|
||||||
v5.5.0
|
|
||||||
------
|
|
||||||
|
|
||||||
* Added `JsonVariant::success()` (issue #279)
|
|
||||||
* Renamed `JsonVariant::invalid<T>()` to `JsonVariant::defaultValue<T>()`
|
|
||||||
|
|
||||||
v5.4.0
|
|
||||||
------
|
|
||||||
|
|
||||||
* Changed `::String` to `ArduinoJson::String` (issue #275)
|
|
||||||
* Changed `::Print` to `ArduinoJson::Print` too
|
|
||||||
|
|
||||||
v5.3.0
|
|
||||||
------
|
|
||||||
|
|
||||||
* Added custom implementation of `ftoa` (issues #266, #267, #269 and #270)
|
|
||||||
* Added `JsonVariant JsonBuffer::parse()` (issue #265)
|
|
||||||
* Fixed `unsigned long` printed as `signed long` (issue #170)
|
|
||||||
|
|
||||||
v5.2.0
|
|
||||||
------
|
|
||||||
|
|
||||||
* Added `JsonVariant::as<char*>()` as a synonym for `JsonVariant::as<const char*>()` (issue #257)
|
|
||||||
* Added example `JsonHttpClient` (issue #256)
|
|
||||||
* Added `JsonArray::copyTo()` and `JsonArray::copyFrom()` (issue #254)
|
|
||||||
* Added `RawJson()` to insert pregenerated JSON portions (issue #259)
|
|
||||||
|
|
||||||
v5.1.1
|
|
||||||
------
|
|
||||||
|
|
||||||
* Removed `String` duplication when one replaces a value in a `JsonObject` (PR #232 by @ulion)
|
|
||||||
|
|
||||||
v5.1.0
|
|
||||||
------
|
|
||||||
|
|
||||||
* Added support of `long long` (issue #171)
|
|
||||||
* Moved all build settings to `ArduinoJson/Configuration.hpp`
|
|
||||||
|
|
||||||
**BREAKING CHANGE**:
|
|
||||||
If you defined `ARDUINOJSON_ENABLE_STD_STREAM`, you now need to define it to `1`.
|
|
||||||
|
|
||||||
v5.0.8
|
|
||||||
------
|
|
||||||
|
|
||||||
* Made the library compatible with [PlatformIO](http://platformio.org/) (issue #181)
|
|
||||||
* Fixed `JsonVariant::is<bool>()` that was incorrectly returning false (issue #214)
|
|
||||||
|
|
||||||
v5.0.7
|
|
||||||
------
|
|
||||||
|
|
||||||
* Made library easier to use from a CMake project: simply `add_subdirectory(ArduinoJson/src)`
|
|
||||||
* Changed `String` to be a `typedef` of `std::string` (issues #142 and #161)
|
|
||||||
|
|
||||||
**BREAKING CHANGES**:
|
|
||||||
- `JsonVariant(true).as<String>()` now returns `"true"` instead of `"1"`
|
|
||||||
- `JsonVariant(false).as<String>()` now returns `"false"` instead of `"0"`
|
|
||||||
|
|
||||||
v5.0.6
|
|
||||||
------
|
|
||||||
|
|
||||||
* Added parameter to `DynamicJsonBuffer` constructor to set initial size (issue #152)
|
|
||||||
* Fixed warning about library category in Arduino 1.6.6 (issue #147)
|
|
||||||
* Examples: Added a loop to wait for serial port to be ready (issue #156)
|
|
||||||
|
|
||||||
v5.0.5
|
|
||||||
------
|
|
||||||
|
|
||||||
* Added overload `JsonObjectSuscript::set(value, decimals)` (issue #143)
|
|
||||||
* Use `float` instead of `double` to reduce the size of `JsonVariant` (issue #134)
|
|
||||||
|
|
||||||
v5.0.4
|
|
||||||
------
|
|
||||||
|
|
||||||
* Fixed ambiguous overload with `JsonArraySubscript` and `JsonObjectSubscript` (issue #122)
|
|
||||||
|
|
||||||
v5.0.3
|
|
||||||
------
|
|
||||||
|
|
||||||
* Fixed `printTo(String)` which wrote numbers instead of strings (issue #120)
|
|
||||||
* Fixed return type of `JsonArray::is<T>()` and some others (issue #121)
|
|
||||||
|
|
||||||
v5.0.2
|
|
||||||
------
|
|
||||||
|
|
||||||
* Fixed segmentation fault in `parseObject(String)` and `parseArray(String)`, when the
|
|
||||||
`StaticJsonBuffer` is too small to hold a copy of the string
|
|
||||||
* Fixed Clang warning "register specifier is deprecated" (issue #102)
|
|
||||||
* Fixed GCC warning "declaration shadows a member" (issue #103)
|
|
||||||
* Fixed memory alignment, which made ESP8266 crash (issue #104)
|
|
||||||
* Fixed compilation on Visual Studio 2010 and 2012 (issue #107)
|
|
||||||
|
|
||||||
v5.0.1
|
|
||||||
------
|
|
||||||
|
|
||||||
* Fixed compilation with Arduino 1.0.6 (issue #99)
|
|
||||||
|
|
||||||
v5.0.0
|
|
||||||
------
|
|
||||||
|
|
||||||
* Added support of `String` class (issues #55, #56, #70, #77)
|
|
||||||
* Added `JsonBuffer::strdup()` to make a copy of a string (issues #10, #57)
|
|
||||||
* Implicitly call `strdup()` for `String` but not for `char*` (issues #84, #87)
|
|
||||||
* Added support of non standard JSON input (issue #44)
|
|
||||||
* Added support of comments in JSON input (issue #88)
|
|
||||||
* Added implicit cast between numerical types (issues #64, #69, #93)
|
|
||||||
* Added ability to read number values as string (issue #90)
|
|
||||||
* Redesigned `JsonVariant` to leverage converting constructors instead of assignment operators (issue #66)
|
|
||||||
* Switched to new the library layout (requires Arduino 1.0.6 or above)
|
|
||||||
|
|
||||||
**BREAKING CHANGES**:
|
|
||||||
- `JsonObject::add()` was renamed to `set()`
|
|
||||||
- `JsonArray::at()` and `JsonObject::at()` were renamed to `get()`
|
|
||||||
- Number of digits of floating point value are now set with `double_with_n_digits()`
|
|
||||||
|
|
||||||
**Personal note about the `String` class**:
|
|
||||||
Support of the `String` class has been added to the library because many people use it in their programs.
|
|
||||||
However, you should not see this as an invitation to use the `String` class.
|
|
||||||
The `String` class is **bad** because it uses dynamic memory allocation.
|
|
||||||
Compared to static allocation, it compiles to a bigger, slower program, and is less predictable.
|
|
||||||
You certainly don't want that in an embedded environment!
|
|
||||||
|
|
||||||
v4.6
|
|
||||||
----
|
|
||||||
|
|
||||||
* Fixed segmentation fault in `DynamicJsonBuffer` when memory allocation fails (issue #92)
|
|
||||||
|
|
||||||
v4.5
|
|
||||||
----
|
|
||||||
|
|
||||||
* Fixed buffer overflow when input contains a backslash followed by a terminator (issue #81)
|
|
||||||
|
|
||||||
**Upgrading is recommended** since previous versions contain a potential security risk.
|
|
||||||
|
|
||||||
Special thanks to [Giancarlo Canales Barreto](https://github.com/gcanalesb) for finding this nasty bug.
|
|
||||||
|
|
||||||
v4.4
|
|
||||||
----
|
|
||||||
|
|
||||||
* Added `JsonArray::measureLength()` and `JsonObject::measureLength()` (issue #75)
|
|
||||||
|
|
||||||
v4.3
|
|
||||||
----
|
|
||||||
|
|
||||||
* Added `JsonArray::removeAt()` to remove an element of an array (issue #58)
|
|
||||||
* Fixed stack-overflow in `DynamicJsonBuffer` when parsing huge JSON files (issue #65)
|
|
||||||
* Fixed wrong return value of `parseArray()` and `parseObject()` when allocation fails (issue #68)
|
|
||||||
|
|
||||||
v4.2
|
|
||||||
----
|
|
||||||
|
|
||||||
* Switched back to old library layout (issues #39, #43 and #45)
|
|
||||||
* Removed global new operator overload (issue #40, #45 and #46)
|
|
||||||
* Added an example with EthernetServer
|
|
||||||
|
|
||||||
v4.1
|
|
||||||
----
|
|
||||||
|
|
||||||
* Added DynamicJsonBuffer (issue #19)
|
|
||||||
|
|
||||||
v4.0
|
|
||||||
----
|
|
||||||
|
|
||||||
* Unified parser and generator API (issue #23)
|
|
||||||
* Updated library layout, now requires Arduino 1.0.6 or newer
|
|
||||||
|
|
||||||
**BREAKING CHANGE**: API changed significantly, see [Migrating code to the new API](https://github.com/bblanchon/ArduinoJson/wiki/Migrating-code-to-the-new-API).
|
|
||||||
|
|
||||||
|
|
||||||
v3.4
|
|
||||||
----
|
|
||||||
|
|
||||||
* Fixed escaped char parsing (issue #16)
|
|
||||||
|
|
||||||
|
|
||||||
v3.3
|
|
||||||
----
|
|
||||||
|
|
||||||
* Added indented output for the JSON generator (issue #11), see example bellow.
|
|
||||||
* Added `IndentedPrint`, a decorator for `Print` to allow indented output
|
|
||||||
|
|
||||||
Example:
|
|
||||||
|
|
||||||
JsonOject<2> json;
|
|
||||||
json["key"] = "value";
|
|
||||||
json.prettyPrintTo(Serial);
|
|
||||||
|
|
||||||
v3.2
|
|
||||||
----
|
|
||||||
|
|
||||||
* Fixed a bug when adding nested object in `JsonArray` (bug introduced in v3.1).
|
|
||||||
|
|
||||||
v3.1
|
|
||||||
----
|
|
||||||
|
|
||||||
* Calling `Generator::JsonObject::add()` twice with the same `key` now replaces the `value`
|
|
||||||
* Added `Generator::JsonObject::operator[]`, see bellow the new API
|
|
||||||
* Added `Generator::JsonObject::remove()` (issue #9)
|
|
||||||
|
|
||||||
Old generator API:
|
|
||||||
|
|
||||||
JsonObject<3> root;
|
|
||||||
root.add("sensor", "gps");
|
|
||||||
root.add("time", 1351824120);
|
|
||||||
root.add("data", array);
|
|
||||||
|
|
||||||
New generator API:
|
|
||||||
|
|
||||||
JsonObject<3> root;
|
|
||||||
root["sensor"] = "gps";
|
|
||||||
root["time"] = 1351824120;
|
|
||||||
root["data"] = array;
|
|
||||||
|
|
||||||
v3.0
|
|
||||||
----
|
|
||||||
|
|
||||||
* New parser API, see bellow
|
|
||||||
* Renamed `JsonHashTable` into `JsonObject`
|
|
||||||
* Added iterators for `JsonArray` and `JsonObject` (issue #4)
|
|
||||||
|
|
||||||
Old parser API:
|
|
||||||
|
|
||||||
JsonHashTable root = parser.parseHashTable(json);
|
|
||||||
|
|
||||||
char* sensor = root.getString("sensor");
|
|
||||||
long time = root.getLong("time");
|
|
||||||
double latitude = root.getArray("data").getDouble(0);
|
|
||||||
double longitude = root.getArray("data").getDouble(1);
|
|
||||||
|
|
||||||
New parser API:
|
|
||||||
|
|
||||||
JsonObject root = parser.parse(json);
|
|
||||||
|
|
||||||
char* sensor = root["sensor"];
|
|
||||||
long time = root["time"];
|
|
||||||
double latitude = root["data"][0];
|
|
||||||
double longitude = root["data"][1];
|
|
||||||
|
|
||||||
v2.1
|
|
||||||
----
|
|
||||||
|
|
||||||
* Fixed case `#include "jsmn.cpp"` which caused an error in Linux (issue #6)
|
|
||||||
* Fixed a buffer overrun in JSON Parser (issue #5)
|
|
||||||
|
|
||||||
v2.0
|
|
||||||
----
|
|
||||||
|
|
||||||
* Added JSON encoding (issue #2)
|
|
||||||
* Renamed the library `ArduinoJsonParser` becomes `ArduinoJson`
|
|
||||||
|
|
||||||
**Breaking change**: you need to add the following line at the top of your program.
|
|
||||||
|
|
||||||
using namespace ArduinoJson::Parser;
|
|
||||||
|
|
||||||
v1.2
|
|
||||||
----
|
|
||||||
|
|
||||||
* Fixed error in JSON parser example (issue #1)
|
|
||||||
|
|
||||||
v1.1
|
|
||||||
----
|
|
||||||
|
|
||||||
* Example: changed `char* json` into `char[] json` so that the bytes are not write protected
|
|
||||||
* Fixed parsing bug when the JSON contains multi-dimensional arrays
|
|
||||||
|
|
||||||
v1.0
|
|
||||||
----
|
|
||||||
|
|
||||||
Initial release
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
# Copyright Benoit Blanchon 2014-2017
|
|
||||||
# MIT License
|
|
||||||
#
|
|
||||||
# Arduino JSON library
|
|
||||||
# https://github.com/bblanchon/ArduinoJson
|
|
||||||
# If you like this project, please add a star!
|
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.0)
|
|
||||||
project(ArduinoJson)
|
|
||||||
|
|
||||||
enable_testing()
|
|
||||||
|
|
||||||
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
|
|
||||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
|
|
||||||
|
|
||||||
if(${COVERAGE})
|
|
||||||
set(CMAKE_CXX_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_subdirectory(test)
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
The MIT License (MIT)
|
|
||||||
---------------------
|
|
||||||
|
|
||||||
Copyright © 2014-2017 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:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
@ -1,143 +0,0 @@
|
|||||||
ArduinoJson - C++ JSON library for IoT
|
|
||||||
====================
|
|
||||||
|
|
||||||
[](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/master) [](https://travis-ci.org/bblanchon/ArduinoJson) [](https://coveralls.io/r/bblanchon/ArduinoJson?branch=master) [](https://github.com/bblanchon/ArduinoJson)
|
|
||||||
|
|
||||||
*An elegant and efficient JSON library for embedded systems.*
|
|
||||||
|
|
||||||
It's designed to have the most intuitive API, the smallest footprint and is able to work without any allocation on the heap (no malloc).
|
|
||||||
|
|
||||||
It has been written with Arduino in mind, but it isn't linked to Arduino libraries so you can use this library in any other C++ project.
|
|
||||||
For instance, it supports Aduino's `String` and `Stream`, but also `std::string`, `std::istream` and `std::ostream`.
|
|
||||||
|
|
||||||
Features
|
|
||||||
--------
|
|
||||||
|
|
||||||
* JSON decoding (comments are supported)
|
|
||||||
* JSON encoding (with optional indentation)
|
|
||||||
* Elegant API, very easy to use
|
|
||||||
* Fixed memory allocation (zero malloc)
|
|
||||||
* No data duplication (zero copy)
|
|
||||||
* Portable (written in C++98)
|
|
||||||
* Self-contained (no external dependency)
|
|
||||||
* Small footprint
|
|
||||||
* Header-only library
|
|
||||||
* MIT License
|
|
||||||
|
|
||||||
Works on
|
|
||||||
--------
|
|
||||||
|
|
||||||
* All Arduino boards (Uno, Due, Mini, Micro, Yun...)
|
|
||||||
* ESP8266
|
|
||||||
* Teensy
|
|
||||||
* Intel Edison and Galileo
|
|
||||||
* PlatformIO
|
|
||||||
* Energia
|
|
||||||
* RedBearLab boards (BLE Nano...)
|
|
||||||
* Computers (Windows, Linux, OSX...)
|
|
||||||
|
|
||||||
See [FAQ: Compatibility issues](https://bblanchon.github.io/ArduinoJson/faq/compilation-fails-device-crashes-nothing-on-serial-console)
|
|
||||||
|
|
||||||
Quick start
|
|
||||||
-----------
|
|
||||||
|
|
||||||
#### Decoding / Parsing
|
|
||||||
|
|
||||||
```c++
|
|
||||||
char json[] = "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
|
|
||||||
|
|
||||||
StaticJsonBuffer<200> jsonBuffer;
|
|
||||||
|
|
||||||
JsonObject& root = jsonBuffer.parseObject(json);
|
|
||||||
|
|
||||||
const char* sensor = root["sensor"];
|
|
||||||
long time = root["time"];
|
|
||||||
double latitude = root["data"][0];
|
|
||||||
double longitude = root["data"][1];
|
|
||||||
```
|
|
||||||
|
|
||||||
[See JsonParserExample.ino](examples/JsonParserExample/JsonParserExample.ino)
|
|
||||||
|
|
||||||
#### Encoding / Generating
|
|
||||||
|
|
||||||
```c++
|
|
||||||
StaticJsonBuffer<200> jsonBuffer;
|
|
||||||
|
|
||||||
JsonObject& root = jsonBuffer.createObject();
|
|
||||||
root["sensor"] = "gps";
|
|
||||||
root["time"] = 1351824120;
|
|
||||||
|
|
||||||
JsonArray& data = root.createNestedArray("data");
|
|
||||||
data.add(48.756080, 6); // 6 is the number of decimals to print
|
|
||||||
data.add(2.302038, 6); // if not specified, 2 digits are printed
|
|
||||||
|
|
||||||
root.printTo(Serial);
|
|
||||||
// This prints:
|
|
||||||
// {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]}
|
|
||||||
```
|
|
||||||
|
|
||||||
[See JsonGeneratorExample.ino](examples/JsonGeneratorExample/JsonGeneratorExample.ino)
|
|
||||||
|
|
||||||
|
|
||||||
Documentation
|
|
||||||
-------------
|
|
||||||
|
|
||||||
The documentation is available online in the [ArduinoJson wiki](https://github.com/bblanchon/ArduinoJson/wiki).
|
|
||||||
|
|
||||||
The [ArduinoJson Assistant](https://bblanchon.github.io/ArduinoJson/assistant/) helps you get started with the library.
|
|
||||||
|
|
||||||
|
|
||||||
Testimonials
|
|
||||||
------------
|
|
||||||
|
|
||||||
From Arduino's Forum user `jflaplante`:
|
|
||||||
> I tried aJson json-arduino before trying your library. I always ran into memory problem after a while.
|
|
||||||
> I have no such problem so far with your library. It is working perfectly with my web services.
|
|
||||||
|
|
||||||
From StackOverflow user `thegreendroid`:
|
|
||||||
> It has a really elegant, simple API and it works like a charm on embedded and Windows/Linux platforms. We recently started using this on an embedded project and I can vouch for its quality.
|
|
||||||
|
|
||||||
From GitHub user `zacsketches`:
|
|
||||||
> Thanks for a great library!!!
|
|
||||||
> I've been watching you consistently develop this library over the past six months, and I used it today for a publish and subscribe architecture designed to help hobbyists move into more advanced robotics. Your library allowed me to implement remote subscription in order to facilitate multi-processor robots.
|
|
||||||
> ArduinoJson saved me a week's worth of time!!
|
|
||||||
|
|
||||||
[From Reddit user `erm_what_`](https://www.reddit.com/r/arduino/comments/3jj6ep/announcing_arduinojson_50/cusjk8c):
|
|
||||||
> This is a great library and I wouldn't be able to do the project I'm doing without it. I completely recommend it.
|
|
||||||
|
|
||||||
[From Reddit user `makerhacks`](https://www.reddit.com/r/arduino/comments/3jj6ep/announcing_arduinojson_50/cusqg7b):
|
|
||||||
> I am just starting an ESP8266 clock project and now I can output JSON from my server script and interpret it painlessly.
|
|
||||||
|
|
||||||
[From Twitter user `@hemalchevli`](https://twitter.com/hemalchevli/status/715788439397011456):
|
|
||||||
> ArduinoJson library should be used as a benchmark/reference for making libraries. Truly elegant.
|
|
||||||
|
|
||||||
[From GitHub user `sticilface`](https://github.com/bblanchon/ArduinoJson/issues/381#issuecomment-260203594):
|
|
||||||
> its a great lib:) and i use it in everything!
|
|
||||||
|
|
||||||
Donators
|
|
||||||
--------
|
|
||||||
|
|
||||||
Special thanks to the following persons and companies who made generous donations to the library author:
|
|
||||||
|
|
||||||
* Robert Murphy <img alt='USA' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1fa-1f1f8.svg' width='18' height='18'>
|
|
||||||
* Surge Communications <img alt='USA' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1fa-1f1f8.svg' width='18' height='18'>
|
|
||||||
* Alex Scott <img alt='United Kingdom' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1ec-1f1e7.svg' width='18' height='18'>
|
|
||||||
* Firepick Services LLC <img alt='USA' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1fa-1f1f8.svg' width='18' height='18'>
|
|
||||||
* A B Doodkorte <img alt='Netherlands' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1f3-1f1f1.svg' width='18' height='18'>
|
|
||||||
* Scott Smith <img alt='USA' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1fa-1f1f8.svg' width='18' height='18'>
|
|
||||||
* Johann Stieger <img alt='Austria' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1e6-1f1f9.svg' width='18' height='18'>
|
|
||||||
* Gustavo Donizeti Gini <img alt='Brazil' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1e7-1f1f7.svg' width='18' height='18'>
|
|
||||||
* Charles-Henri Hallard <img alt='France' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1eb-1f1f7.svg' width='18' height='18'>
|
|
||||||
* Martijn van den Burg <img alt='Netherlands' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1f3-1f1f1.svg' width='18' height='18'>
|
|
||||||
* Nick Koumaris <img alt='Greece' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1ec-1f1f7.svg' width='18' height='18'>
|
|
||||||
* Jon Williams <img alt='USA' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1fa-1f1f8.svg' width='18' height='18'>
|
|
||||||
* Kestutis Liaugminas <img alt='Lithuania' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1f1-1f1f9.svg' width='18' height='18'>
|
|
||||||
* Darlington Adibe <img alt='Nigeria' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1f3-1f1ec.svg' width='18' height='18'>
|
|
||||||
* Yoeri Kroon <img alt='Netherlands' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1f3-1f1f1.svg' width='18' height='18'>
|
|
||||||
* Andrew Melvin <img alt='United Kingdom' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1ec-1f1e7.svg' width='18' height='18'>
|
|
||||||
* Doanh Luong <img alt ='Vietnam' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1fb-1f1f3.svg' width='18' height='18'>
|
|
||||||
* Christoph Schmidt <img alt ='Germany' src='https://cdnjs.cloudflare.com/ajax/libs/emojione/2.1.4/assets/svg/1f1e9-1f1ea.svg' width='18' height='18'>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
Found this library useful? Please star this project or [help me back with a donation!](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=donate%40benoitblanchon%2efr&lc=GB&item_name=Benoit%20Blanchon&item_number=Arduino%20JSON¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted) :smile:
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
version: 5.8.3.{build}
|
|
||||||
environment:
|
|
||||||
matrix:
|
|
||||||
- CMAKE_GENERATOR: Visual Studio 14 2015
|
|
||||||
- CMAKE_GENERATOR: Visual Studio 12 2013
|
|
||||||
- CMAKE_GENERATOR: Visual Studio 11 2012
|
|
||||||
- CMAKE_GENERATOR: Visual Studio 10 2010
|
|
||||||
# - CMAKE_GENERATOR: MinGW Makefiles
|
|
||||||
# Note: Disabled because of unexplicated error -1073741511
|
|
||||||
# This used to work fine with GCC 4.8.2 then failed after they upgraded to GCC 4.9.3
|
|
||||||
configuration: Debug
|
|
||||||
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
|
|
||||||
- cmake -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "%CMAKE_GENERATOR%" .
|
|
||||||
build_script:
|
|
||||||
- cmake --build . --config %CONFIGURATION%
|
|
||||||
test_script:
|
|
||||||
- ctest -V .
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#include <ArduinoJson.h>
|
|
||||||
|
|
||||||
using namespace ArduinoJson::Internals;
|
|
||||||
|
|
||||||
void setup() {
|
|
||||||
Serial.begin(9600);
|
|
||||||
while (!Serial) {
|
|
||||||
// wait serial port initialization
|
|
||||||
}
|
|
||||||
|
|
||||||
IndentedPrint serial(Serial);
|
|
||||||
serial.setTabSize(4);
|
|
||||||
|
|
||||||
serial.println("This is at indentation 0");
|
|
||||||
serial.indent();
|
|
||||||
serial.println("This is at indentation 1");
|
|
||||||
serial.println("This is also at indentation 1");
|
|
||||||
serial.indent();
|
|
||||||
serial.println("This is at indentation 2");
|
|
||||||
|
|
||||||
serial.unindent();
|
|
||||||
serial.unindent();
|
|
||||||
serial.println("This is back at indentation 0");
|
|
||||||
}
|
|
||||||
|
|
||||||
void loop() {
|
|
||||||
// not used in this example
|
|
||||||
}
|
|
||||||
@ -1,70 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#include <ArduinoJson.h>
|
|
||||||
|
|
||||||
void setup() {
|
|
||||||
Serial.begin(9600);
|
|
||||||
while (!Serial) {
|
|
||||||
// wait serial port initialization
|
|
||||||
}
|
|
||||||
|
|
||||||
// Memory pool for JSON object tree.
|
|
||||||
//
|
|
||||||
// Inside the brackets, 200 is the size of the pool in bytes.
|
|
||||||
// If the JSON object is more complex, you need to increase that value.
|
|
||||||
StaticJsonBuffer<200> jsonBuffer;
|
|
||||||
|
|
||||||
// StaticJsonBuffer allocates memory on the stack, it can be
|
|
||||||
// replaced by DynamicJsonBuffer which allocates in the heap.
|
|
||||||
// It's simpler but less efficient.
|
|
||||||
//
|
|
||||||
// DynamicJsonBuffer jsonBuffer;
|
|
||||||
|
|
||||||
// Create the root of the object tree.
|
|
||||||
//
|
|
||||||
// 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.
|
|
||||||
JsonObject& root = jsonBuffer.createObject();
|
|
||||||
|
|
||||||
// Add values in the object
|
|
||||||
//
|
|
||||||
// Most of the time, you can rely on the implicit casts.
|
|
||||||
// In other case, you can do root.set<long>("time", 1351824120);
|
|
||||||
root["sensor"] = "gps";
|
|
||||||
root["time"] = 1351824120;
|
|
||||||
|
|
||||||
// Add a nested array.
|
|
||||||
//
|
|
||||||
// It's also possible to create the array separately and add it to the
|
|
||||||
// JsonObject but it's less efficient.
|
|
||||||
JsonArray& data = root.createNestedArray("data");
|
|
||||||
data.add(double_with_n_digits(48.756080, 6));
|
|
||||||
data.add(double_with_n_digits(2.302038, 6));
|
|
||||||
|
|
||||||
root.printTo(Serial);
|
|
||||||
// This prints:
|
|
||||||
// {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]}
|
|
||||||
|
|
||||||
Serial.println();
|
|
||||||
|
|
||||||
root.prettyPrintTo(Serial);
|
|
||||||
// This prints:
|
|
||||||
// {
|
|
||||||
// "sensor": "gps",
|
|
||||||
// "time": 1351824120,
|
|
||||||
// "data": [
|
|
||||||
// 48.756080,
|
|
||||||
// 2.302038
|
|
||||||
// ]
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
void loop() {
|
|
||||||
// not used in this example
|
|
||||||
}
|
|
||||||
@ -1,184 +0,0 @@
|
|||||||
// Sample Arduino Json Web Client
|
|
||||||
// Downloads and parse http://jsonplaceholder.typicode.com/users/1
|
|
||||||
//
|
|
||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#include <ArduinoJson.h>
|
|
||||||
#include <Ethernet.h>
|
|
||||||
#include <SPI.h>
|
|
||||||
|
|
||||||
EthernetClient client;
|
|
||||||
|
|
||||||
const char* server = "jsonplaceholder.typicode.com"; // server's address
|
|
||||||
const char* resource = "/users/1"; // http resource
|
|
||||||
const unsigned long BAUD_RATE = 9600; // serial connection speed
|
|
||||||
const unsigned long HTTP_TIMEOUT = 10000; // max respone time from server
|
|
||||||
const size_t MAX_CONTENT_SIZE = 512; // max size of the HTTP response
|
|
||||||
|
|
||||||
// The type of data that we want to extract from the page
|
|
||||||
struct UserData {
|
|
||||||
char name[32];
|
|
||||||
char company[32];
|
|
||||||
};
|
|
||||||
|
|
||||||
// ARDUINO entry point #1: runs once when you press reset or power the board
|
|
||||||
void setup() {
|
|
||||||
initSerial();
|
|
||||||
initEthernet();
|
|
||||||
}
|
|
||||||
|
|
||||||
// ARDUINO entry point #2: runs over and over again forever
|
|
||||||
void loop() {
|
|
||||||
if (connect(server)) {
|
|
||||||
if (sendRequest(server, resource) && skipResponseHeaders()) {
|
|
||||||
UserData userData;
|
|
||||||
if (readReponseContent(&userData)) {
|
|
||||||
printUserData(&userData);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
disconnect();
|
|
||||||
wait();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initialize Serial port
|
|
||||||
void initSerial() {
|
|
||||||
Serial.begin(BAUD_RATE);
|
|
||||||
while (!Serial) {
|
|
||||||
; // wait for serial port to initialize
|
|
||||||
}
|
|
||||||
Serial.println("Serial ready");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initialize Ethernet library
|
|
||||||
void initEthernet() {
|
|
||||||
byte mac[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
|
|
||||||
if (!Ethernet.begin(mac)) {
|
|
||||||
Serial.println("Failed to configure Ethernet");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
Serial.println("Ethernet ready");
|
|
||||||
delay(1000);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open connection to the HTTP server
|
|
||||||
bool connect(const char* hostName) {
|
|
||||||
Serial.print("Connect to ");
|
|
||||||
Serial.println(hostName);
|
|
||||||
|
|
||||||
bool ok = client.connect(hostName, 80);
|
|
||||||
|
|
||||||
Serial.println(ok ? "Connected" : "Connection Failed!");
|
|
||||||
return ok;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send the HTTP GET request to the server
|
|
||||||
bool sendRequest(const char* host, const char* resource) {
|
|
||||||
Serial.print("GET ");
|
|
||||||
Serial.println(resource);
|
|
||||||
|
|
||||||
client.print("GET ");
|
|
||||||
client.print(resource);
|
|
||||||
client.println(" HTTP/1.0");
|
|
||||||
client.print("Host: ");
|
|
||||||
client.println(host);
|
|
||||||
client.println("Connection: close");
|
|
||||||
client.println();
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Skip HTTP headers so that we are at the beginning of the response's body
|
|
||||||
bool skipResponseHeaders() {
|
|
||||||
// HTTP headers end with an empty line
|
|
||||||
char endOfHeaders[] = "\r\n\r\n";
|
|
||||||
|
|
||||||
client.setTimeout(HTTP_TIMEOUT);
|
|
||||||
bool ok = client.find(endOfHeaders);
|
|
||||||
|
|
||||||
if (!ok) {
|
|
||||||
Serial.println("No response or invalid response!");
|
|
||||||
}
|
|
||||||
|
|
||||||
return ok;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Parse the JSON from the input string and extract the interesting values
|
|
||||||
// Here is the JSON we need to parse
|
|
||||||
// {
|
|
||||||
// "id": 1,
|
|
||||||
// "name": "Leanne Graham",
|
|
||||||
// "username": "Bret",
|
|
||||||
// "email": "Sincere@april.biz",
|
|
||||||
// "address": {
|
|
||||||
// "street": "Kulas Light",
|
|
||||||
// "suite": "Apt. 556",
|
|
||||||
// "city": "Gwenborough",
|
|
||||||
// "zipcode": "92998-3874",
|
|
||||||
// "geo": {
|
|
||||||
// "lat": "-37.3159",
|
|
||||||
// "lng": "81.1496"
|
|
||||||
// }
|
|
||||||
// },
|
|
||||||
// "phone": "1-770-736-8031 x56442",
|
|
||||||
// "website": "hildegard.org",
|
|
||||||
// "company": {
|
|
||||||
// "name": "Romaguera-Crona",
|
|
||||||
// "catchPhrase": "Multi-layered client-server neural-net",
|
|
||||||
// "bs": "harness real-time e-markets"
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
bool readReponseContent(struct UserData* userData) {
|
|
||||||
// Compute optimal size of the JSON buffer according to what we need to parse.
|
|
||||||
// This is only required if you use StaticJsonBuffer.
|
|
||||||
const size_t BUFFER_SIZE =
|
|
||||||
JSON_OBJECT_SIZE(8) // the root object has 8 elements
|
|
||||||
+ JSON_OBJECT_SIZE(5) // the "address" object has 5 elements
|
|
||||||
+ JSON_OBJECT_SIZE(2) // the "geo" object has 2 elements
|
|
||||||
+ JSON_OBJECT_SIZE(3) // the "company" object has 3 elements
|
|
||||||
+ MAX_CONTENT_SIZE; // additional space for strings
|
|
||||||
|
|
||||||
// Allocate a temporary memory pool
|
|
||||||
DynamicJsonBuffer jsonBuffer(BUFFER_SIZE);
|
|
||||||
|
|
||||||
JsonObject& root = jsonBuffer.parseObject(client);
|
|
||||||
|
|
||||||
if (!root.success()) {
|
|
||||||
Serial.println("JSON parsing failed!");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Here were copy the strings we're interested in
|
|
||||||
strcpy(userData->name, root["name"]);
|
|
||||||
strcpy(userData->company, root["company"]["name"]);
|
|
||||||
// It's not mandatory to make a copy, you could just use the pointers
|
|
||||||
// Since, they are pointing inside the "content" buffer, so you need to make
|
|
||||||
// sure it's still in memory when you read the string
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Print the data extracted from the JSON
|
|
||||||
void printUserData(const struct UserData* userData) {
|
|
||||||
Serial.print("Name = ");
|
|
||||||
Serial.println(userData->name);
|
|
||||||
Serial.print("Company = ");
|
|
||||||
Serial.println(userData->company);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Close the connection with the HTTP server
|
|
||||||
void disconnect() {
|
|
||||||
Serial.println("Disconnect");
|
|
||||||
client.stop();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Pause for a 1 minute
|
|
||||||
void wait() {
|
|
||||||
Serial.println("Wait 60 seconds");
|
|
||||||
delay(60000);
|
|
||||||
}
|
|
||||||
@ -1,67 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#include <ArduinoJson.h>
|
|
||||||
|
|
||||||
void setup() {
|
|
||||||
Serial.begin(9600);
|
|
||||||
while (!Serial) {
|
|
||||||
// wait serial port initialization
|
|
||||||
}
|
|
||||||
|
|
||||||
// Memory pool for JSON object tree.
|
|
||||||
//
|
|
||||||
// Inside the brackets, 200 is the size of the pool in bytes,
|
|
||||||
// If the JSON object is more complex, you need to increase that value.
|
|
||||||
StaticJsonBuffer<200> jsonBuffer;
|
|
||||||
|
|
||||||
// StaticJsonBuffer allocates memory on the stack, it can be
|
|
||||||
// replaced by DynamicJsonBuffer which allocates in the heap.
|
|
||||||
// It's simpler but less efficient.
|
|
||||||
//
|
|
||||||
// DynamicJsonBuffer jsonBuffer;
|
|
||||||
|
|
||||||
// JSON 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.
|
|
||||||
char json[] =
|
|
||||||
"{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
|
|
||||||
|
|
||||||
// Root of the object tree.
|
|
||||||
//
|
|
||||||
// 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.
|
|
||||||
JsonObject& root = jsonBuffer.parseObject(json);
|
|
||||||
|
|
||||||
// Test if parsing succeeds.
|
|
||||||
if (!root.success()) {
|
|
||||||
Serial.println("parseObject() failed");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fetch values.
|
|
||||||
//
|
|
||||||
// Most of the time, you can rely on the implicit casts.
|
|
||||||
// In other case, you can do root["time"].as<long>();
|
|
||||||
const char* sensor = root["sensor"];
|
|
||||||
long time = root["time"];
|
|
||||||
double latitude = root["data"][0];
|
|
||||||
double longitude = root["data"][1];
|
|
||||||
|
|
||||||
// Print values.
|
|
||||||
Serial.println(sensor);
|
|
||||||
Serial.println(time);
|
|
||||||
Serial.println(latitude, 6);
|
|
||||||
Serial.println(longitude, 6);
|
|
||||||
}
|
|
||||||
|
|
||||||
void loop() {
|
|
||||||
// not used in this example
|
|
||||||
}
|
|
||||||
@ -1,74 +0,0 @@
|
|||||||
// Sample Arduino Json Web Server
|
|
||||||
// Created by Benoit Blanchon.
|
|
||||||
// Heavily inspired by "Web Server" from David A. Mellis and Tom Igoe
|
|
||||||
|
|
||||||
#include <SPI.h>
|
|
||||||
#include <Ethernet.h>
|
|
||||||
#include <ArduinoJson.h>
|
|
||||||
|
|
||||||
byte mac[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
|
|
||||||
IPAddress ip(192, 168, 0, 177);
|
|
||||||
EthernetServer server(80);
|
|
||||||
|
|
||||||
bool readRequest(EthernetClient& client) {
|
|
||||||
bool currentLineIsBlank = true;
|
|
||||||
while (client.connected()) {
|
|
||||||
if (client.available()) {
|
|
||||||
char c = client.read();
|
|
||||||
if (c == '\n' && currentLineIsBlank) {
|
|
||||||
return true;
|
|
||||||
} else if (c == '\n') {
|
|
||||||
currentLineIsBlank = true;
|
|
||||||
} else if (c != '\r') {
|
|
||||||
currentLineIsBlank = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
JsonObject& prepareResponse(JsonBuffer& jsonBuffer) {
|
|
||||||
JsonObject& root = jsonBuffer.createObject();
|
|
||||||
|
|
||||||
JsonArray& analogValues = root.createNestedArray("analog");
|
|
||||||
for (int pin = 0; pin < 6; pin++) {
|
|
||||||
int value = analogRead(pin);
|
|
||||||
analogValues.add(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
JsonArray& digitalValues = root.createNestedArray("digital");
|
|
||||||
for (int pin = 0; pin < 14; pin++) {
|
|
||||||
int value = digitalRead(pin);
|
|
||||||
digitalValues.add(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
return root;
|
|
||||||
}
|
|
||||||
|
|
||||||
void writeResponse(EthernetClient& client, JsonObject& json) {
|
|
||||||
client.println("HTTP/1.1 200 OK");
|
|
||||||
client.println("Content-Type: application/json");
|
|
||||||
client.println("Connection: close");
|
|
||||||
client.println();
|
|
||||||
|
|
||||||
json.prettyPrintTo(client);
|
|
||||||
}
|
|
||||||
|
|
||||||
void setup() {
|
|
||||||
Ethernet.begin(mac, ip);
|
|
||||||
server.begin();
|
|
||||||
}
|
|
||||||
|
|
||||||
void loop() {
|
|
||||||
EthernetClient client = server.available();
|
|
||||||
if (client) {
|
|
||||||
bool success = readRequest(client);
|
|
||||||
if (success) {
|
|
||||||
StaticJsonBuffer<500> jsonBuffer;
|
|
||||||
JsonObject& json = prepareResponse(jsonBuffer);
|
|
||||||
writeResponse(client, json);
|
|
||||||
}
|
|
||||||
delay(1);
|
|
||||||
client.stop();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,55 +0,0 @@
|
|||||||
// Send a JSON object on UDP at regular interval
|
|
||||||
//
|
|
||||||
// You can easily test this program with netcat:
|
|
||||||
// $ nc -ulp 8888
|
|
||||||
//
|
|
||||||
// by Benoit Blanchon, MIT License 2015-2017
|
|
||||||
|
|
||||||
#include <ArduinoJson.h>
|
|
||||||
#include <Ethernet.h>
|
|
||||||
#include <SPI.h>
|
|
||||||
|
|
||||||
byte mac[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
|
|
||||||
IPAddress localIp(192, 168, 0, 177);
|
|
||||||
IPAddress remoteIp(192, 168, 0, 109);
|
|
||||||
unsigned int remotePort = 8888;
|
|
||||||
unsigned localPort = 8888;
|
|
||||||
EthernetUDP udp;
|
|
||||||
|
|
||||||
JsonObject& buildJson(JsonBuffer& jsonBuffer) {
|
|
||||||
JsonObject& root = jsonBuffer.createObject();
|
|
||||||
|
|
||||||
JsonArray& analogValues = root.createNestedArray("analog");
|
|
||||||
for (int pin = 0; pin < 6; pin++) {
|
|
||||||
int value = analogRead(pin);
|
|
||||||
analogValues.add(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
JsonArray& digitalValues = root.createNestedArray("digital");
|
|
||||||
for (int pin = 0; pin < 14; pin++) {
|
|
||||||
int value = digitalRead(pin);
|
|
||||||
digitalValues.add(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
return root;
|
|
||||||
}
|
|
||||||
|
|
||||||
void sendJson(JsonObject& json) {
|
|
||||||
udp.beginPacket(remoteIp, remotePort);
|
|
||||||
json.printTo(udp);
|
|
||||||
udp.println();
|
|
||||||
udp.endPacket();
|
|
||||||
}
|
|
||||||
|
|
||||||
void setup() {
|
|
||||||
Ethernet.begin(mac, localIp);
|
|
||||||
udp.begin(localPort);
|
|
||||||
}
|
|
||||||
|
|
||||||
void loop() {
|
|
||||||
delay(1000);
|
|
||||||
|
|
||||||
StaticJsonBuffer<300> jsonBuffer;
|
|
||||||
JsonObject& json = buildJson(jsonBuffer);
|
|
||||||
sendJson(json);
|
|
||||||
}
|
|
||||||
@ -1,56 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#include <ArduinoJson.h>
|
|
||||||
|
|
||||||
// About
|
|
||||||
// -----
|
|
||||||
// This example shows the different ways you can use PROGMEM with ArduinoJson.
|
|
||||||
// Please don't see this as an invitation to use PROGMEM.
|
|
||||||
// On the contrary, you should always use char[] when possible, it's much more
|
|
||||||
// efficient in term of code size, speed and memory usage.
|
|
||||||
|
|
||||||
void setup() {
|
|
||||||
#ifdef PROGMEM
|
|
||||||
DynamicJsonBuffer jsonBuffer;
|
|
||||||
|
|
||||||
// You can use a Flash String as your JSON input.
|
|
||||||
// WARNING: the content of the Flash String will be duplicated in the
|
|
||||||
// JsonBuffer.
|
|
||||||
JsonObject& root =
|
|
||||||
jsonBuffer.parseObject(F("{\"sensor\":\"gps\",\"time\":1351824120,"
|
|
||||||
"\"data\":[48.756080,2.302038]}"));
|
|
||||||
|
|
||||||
// You can use a Flash String to get an element of a JsonObject
|
|
||||||
// No duplication is done.
|
|
||||||
long time = root[F("time")];
|
|
||||||
|
|
||||||
// You can use a Flash String to set an element of a JsonObject
|
|
||||||
// WARNING: the content of the Flash String will be duplicated in the
|
|
||||||
// JsonBuffer.
|
|
||||||
root[F("time")] = time;
|
|
||||||
|
|
||||||
// You can set a Flash String to a JsonObject or JsonArray:
|
|
||||||
// WARNING: the content of the Flash String will be duplicated in the
|
|
||||||
// JsonBuffer.
|
|
||||||
root["sensor"] = F("gps");
|
|
||||||
|
|
||||||
// You can compare the content of a JsonVariant to a Flash String
|
|
||||||
if (root["sensor"] == F("gps")) {
|
|
||||||
// ...
|
|
||||||
}
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
#warning PROGMEM is not supported on this platform
|
|
||||||
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void loop() {
|
|
||||||
// not used in this example
|
|
||||||
}
|
|
||||||
@ -1,63 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#include <ArduinoJson.h>
|
|
||||||
|
|
||||||
// About
|
|
||||||
// -----
|
|
||||||
// This example shows the different ways you can use String with ArduinoJson.
|
|
||||||
// Please don't see this as an invitation to use String.
|
|
||||||
// On the contrary, you should always use char[] when possible, it's much more
|
|
||||||
// efficient in term of code size, speed and memory usage.
|
|
||||||
|
|
||||||
void setup() {
|
|
||||||
DynamicJsonBuffer jsonBuffer;
|
|
||||||
|
|
||||||
// You can use a String as your JSON input.
|
|
||||||
// WARNING: the content of the String will be duplicated in the JsonBuffer.
|
|
||||||
String input =
|
|
||||||
"{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
|
|
||||||
JsonObject& root = jsonBuffer.parseObject(input);
|
|
||||||
|
|
||||||
// You can use a String to get an element of a JsonObject
|
|
||||||
// No duplication is done.
|
|
||||||
long time = root[String("time")];
|
|
||||||
|
|
||||||
// You can use a String to set an element of a JsonObject
|
|
||||||
// WARNING: the content of the String will be duplicated in the JsonBuffer.
|
|
||||||
root[String("time")] = time;
|
|
||||||
|
|
||||||
// You can get a String from a JsonObject or JsonArray:
|
|
||||||
// No duplication is done, at least not in the JsonBuffer.
|
|
||||||
String sensor = root["sensor"];
|
|
||||||
|
|
||||||
// Unfortunately, the following doesn't work (issue #118):
|
|
||||||
// sensor = root["sensor"]; // <- error "ambiguous overload for 'operator='"
|
|
||||||
// As a workaround, you need to replace by:
|
|
||||||
sensor = root["sensor"].as<String>();
|
|
||||||
|
|
||||||
// You can set a String to a JsonObject or JsonArray:
|
|
||||||
// WARNING: the content of the String will be duplicated in the JsonBuffer.
|
|
||||||
root["sensor"] = sensor;
|
|
||||||
|
|
||||||
// You can also concatenate strings
|
|
||||||
// WARNING: the content of the String will be duplicated in the JsonBuffer.
|
|
||||||
root[String("sen") + "sor"] = String("gp") + "s";
|
|
||||||
|
|
||||||
// You can compare the content of a JsonObject with a String
|
|
||||||
if (root["sensor"] == sensor) {
|
|
||||||
// ...
|
|
||||||
}
|
|
||||||
|
|
||||||
// Lastly, you can print the resulting JSON to a String
|
|
||||||
String output;
|
|
||||||
root.printTo(output);
|
|
||||||
}
|
|
||||||
|
|
||||||
void loop() {
|
|
||||||
// not used in this example
|
|
||||||
}
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
# CAUTION: this file is invoked by https://github.com/google/oss-fuzz
|
|
||||||
|
|
||||||
CXXFLAGS += -I../include
|
|
||||||
|
|
||||||
all: \
|
|
||||||
$(OUT)/json_fuzzer \
|
|
||||||
$(OUT)/json_fuzzer_seed_corpus.zip \
|
|
||||||
$(OUT)/json_fuzzer.options
|
|
||||||
|
|
||||||
$(OUT)/json_fuzzer: fuzzer.cpp
|
|
||||||
$(CXX) $(CXXFLAGS) $< -o$@ $(LIB_FUZZING_ENGINE)
|
|
||||||
|
|
||||||
$(OUT)/json_fuzzer_seed_corpus.zip: seed_corpus/*
|
|
||||||
zip -j $@ $?
|
|
||||||
|
|
||||||
$(OUT)/json_fuzzer.options:
|
|
||||||
@echo "[libfuzzer]" > $@
|
|
||||||
@echo "max_len = 256" >> $@
|
|
||||||
@echo "timeout = 10" >> $@
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# This script mimics an invocation from https://github.com/google/oss-fuzz
|
|
||||||
|
|
||||||
export CXX='clang++'
|
|
||||||
export CXXFLAGS='-fsanitize-coverage=trace-pc-guard -fsanitize=address'
|
|
||||||
export LIB_FUZZING_ENGINE=-lFuzzer
|
|
||||||
make OUT=.
|
|
||||||
./json_fuzzer my_corpus seed_corpus
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
#include <ArduinoJson.h>
|
|
||||||
|
|
||||||
class memstream : public std::istream {
|
|
||||||
struct membuf : std::streambuf {
|
|
||||||
membuf(const uint8_t *p, size_t l) {
|
|
||||||
setg((char *)p, (char *)p, (char *)p + l);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
membuf _buffer;
|
|
||||||
|
|
||||||
public:
|
|
||||||
memstream(const uint8_t *p, size_t l)
|
|
||||||
: std::istream(&_buffer), _buffer(p, l) {
|
|
||||||
rdbuf(&_buffer);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
|
||||||
DynamicJsonBuffer jsonBuffer;
|
|
||||||
memstream json(data, size);
|
|
||||||
jsonBuffer.parse(json);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
2
lib/ArduinoJson/fuzzing/my_corpus/.gitignore
vendored
2
lib/ArduinoJson/fuzzing/my_corpus/.gitignore
vendored
@ -1,2 +0,0 @@
|
|||||||
*
|
|
||||||
!.gitignore
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
"sensor": "gps",
|
|
||||||
"time": 1351824120,
|
|
||||||
"data": [
|
|
||||||
48.75608,
|
|
||||||
2.302038
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@ -1,53 +0,0 @@
|
|||||||
{
|
|
||||||
"coord": {
|
|
||||||
"lon": -0.13,
|
|
||||||
"lat": 51.51
|
|
||||||
},
|
|
||||||
"weather": [
|
|
||||||
{
|
|
||||||
"id": 301,
|
|
||||||
"main": "Drizzle",
|
|
||||||
"description": "drizzle",
|
|
||||||
"icon": "09n"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": 701,
|
|
||||||
"main": "Mist",
|
|
||||||
"description": "mist",
|
|
||||||
"icon": "50n"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": 741,
|
|
||||||
"main": "Fog",
|
|
||||||
"description": "fog",
|
|
||||||
"icon": "50n"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"base": "stations",
|
|
||||||
"main": {
|
|
||||||
"temp": 281.87,
|
|
||||||
"pressure": 1032,
|
|
||||||
"humidity": 100,
|
|
||||||
"temp_min": 281.15,
|
|
||||||
"temp_max": 283.15
|
|
||||||
},
|
|
||||||
"visibility": 2900,
|
|
||||||
"wind": {
|
|
||||||
"speed": 1.5
|
|
||||||
},
|
|
||||||
"clouds": {
|
|
||||||
"all": 90
|
|
||||||
},
|
|
||||||
"dt": 1483820400,
|
|
||||||
"sys": {
|
|
||||||
"type": 1,
|
|
||||||
"id": 5091,
|
|
||||||
"message": 0.0226,
|
|
||||||
"country": "GB",
|
|
||||||
"sunrise": 1483776245,
|
|
||||||
"sunset": 1483805443
|
|
||||||
},
|
|
||||||
"id": 2643743,
|
|
||||||
"name": "London",
|
|
||||||
"cod": 200
|
|
||||||
}
|
|
||||||
@ -1,90 +0,0 @@
|
|||||||
{
|
|
||||||
"response": {
|
|
||||||
"version": "0.1",
|
|
||||||
"termsofService": "http://www.wunderground.com/weather/api/d/terms.html",
|
|
||||||
"features": {
|
|
||||||
"conditions": 1
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"current_observation": {
|
|
||||||
"image": {
|
|
||||||
"url": "http://icons-ak.wxug.com/graphics/wu2/logo_130x80.png",
|
|
||||||
"title": "Weather Underground",
|
|
||||||
"link": "http://www.wunderground.com"
|
|
||||||
},
|
|
||||||
"display_location": {
|
|
||||||
"full": "San Francisco, CA",
|
|
||||||
"city": "San Francisco",
|
|
||||||
"state": "CA",
|
|
||||||
"state_name": "California",
|
|
||||||
"country": "US",
|
|
||||||
"country_iso3166": "US",
|
|
||||||
"zip": "94101",
|
|
||||||
"latitude": "37.77500916",
|
|
||||||
"longitude": "-122.41825867",
|
|
||||||
"elevation": "47.00000000"
|
|
||||||
},
|
|
||||||
"observation_location": {
|
|
||||||
"full": "SOMA - Near Van Ness, San Francisco, California",
|
|
||||||
"city": "SOMA - Near Van Ness, San Francisco",
|
|
||||||
"state": "California",
|
|
||||||
"country": "US",
|
|
||||||
"country_iso3166": "US",
|
|
||||||
"latitude": "37.773285",
|
|
||||||
"longitude": "-122.417725",
|
|
||||||
"elevation": "49 ft"
|
|
||||||
},
|
|
||||||
"estimated": {},
|
|
||||||
"station_id": "KCASANFR58",
|
|
||||||
"observation_time": "Last Updated on June 27, 5:27 PM PDT",
|
|
||||||
"observation_time_rfc822": "Wed, 27 Jun 2012 17:27:13 -0700",
|
|
||||||
"observation_epoch": "1340843233",
|
|
||||||
"local_time_rfc822": "Wed, 27 Jun 2012 17:27:14 -0700",
|
|
||||||
"local_epoch": "1340843234",
|
|
||||||
"local_tz_short": "PDT",
|
|
||||||
"local_tz_long": "America/Los_Angeles",
|
|
||||||
"local_tz_offset": "-0700",
|
|
||||||
"weather": "Partly Cloudy",
|
|
||||||
"temperature_string": "66.3 F (19.1 C)",
|
|
||||||
"temp_f": 66.3,
|
|
||||||
"temp_c": 19.1,
|
|
||||||
"relative_humidity": "65%",
|
|
||||||
"wind_string": "From the NNW at 22.0 MPH Gusting to 28.0 MPH",
|
|
||||||
"wind_dir": "NNW",
|
|
||||||
"wind_degrees": 346,
|
|
||||||
"wind_mph": 22,
|
|
||||||
"wind_gust_mph": "28.0",
|
|
||||||
"wind_kph": 35.4,
|
|
||||||
"wind_gust_kph": "45.1",
|
|
||||||
"pressure_mb": "1013",
|
|
||||||
"pressure_in": "29.93",
|
|
||||||
"pressure_trend": "+",
|
|
||||||
"dewpoint_string": "54 F (12 C)",
|
|
||||||
"dewpoint_f": 54,
|
|
||||||
"dewpoint_c": 12,
|
|
||||||
"heat_index_string": "NA",
|
|
||||||
"heat_index_f": "NA",
|
|
||||||
"heat_index_c": "NA",
|
|
||||||
"windchill_string": "NA",
|
|
||||||
"windchill_f": "NA",
|
|
||||||
"windchill_c": "NA",
|
|
||||||
"feelslike_string": "66.3 F (19.1 C)",
|
|
||||||
"feelslike_f": "66.3",
|
|
||||||
"feelslike_c": "19.1",
|
|
||||||
"visibility_mi": "10.0",
|
|
||||||
"visibility_km": "16.1",
|
|
||||||
"solarradiation": "",
|
|
||||||
"UV": "5",
|
|
||||||
"precip_1hr_string": "0.00 in ( 0 mm)",
|
|
||||||
"precip_1hr_in": "0.00",
|
|
||||||
"precip_1hr_metric": " 0",
|
|
||||||
"precip_today_string": "0.00 in (0 mm)",
|
|
||||||
"precip_today_in": "0.00",
|
|
||||||
"precip_today_metric": "0",
|
|
||||||
"icon": "partlycloudy",
|
|
||||||
"icon_url": "http://icons-ak.wxug.com/i/c/k/partlycloudy.gif",
|
|
||||||
"forecast_url": "http://www.wunderground.com/US/CA/San_Francisco.html",
|
|
||||||
"history_url": "http://www.wunderground.com/history/airport/KCASANFR58/2012/6/27/DailyHistory.html",
|
|
||||||
"ob_url": "http://www.wunderground.com/cgi-bin/findweather/getForecast?query=37.773285,-122.417725"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#include "ArduinoJson.hpp"
|
|
||||||
using namespace ArduinoJson;
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "ArduinoJson/DynamicJsonBuffer.hpp"
|
|
||||||
#include "ArduinoJson/JsonArray.hpp"
|
|
||||||
#include "ArduinoJson/JsonObject.hpp"
|
|
||||||
#include "ArduinoJson/JsonVariantComparisons.hpp"
|
|
||||||
#include "ArduinoJson/StaticJsonBuffer.hpp"
|
|
||||||
|
|
||||||
#include "ArduinoJson/Deserialization/JsonParserImpl.hpp"
|
|
||||||
#include "ArduinoJson/JsonArrayImpl.hpp"
|
|
||||||
#include "ArduinoJson/JsonBufferImpl.hpp"
|
|
||||||
#include "ArduinoJson/JsonObjectImpl.hpp"
|
|
||||||
#include "ArduinoJson/JsonVariantImpl.hpp"
|
|
||||||
#include "ArduinoJson/Serialization/JsonSerializerImpl.hpp"
|
|
||||||
|
|
||||||
using namespace ArduinoJson;
|
|
||||||
@ -1,137 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
// enable deprecated functions by default
|
|
||||||
#ifndef ARDUINOJSON_ENABLE_DEPRECATED
|
|
||||||
#define ARDUINOJSON_ENABLE_DEPRECATED 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef ARDUINO // assume this is an embedded platform
|
|
||||||
|
|
||||||
// store using float instead of double to reduce the memory usage (issue #134)
|
|
||||||
#ifndef ARDUINOJSON_USE_DOUBLE
|
|
||||||
#define ARDUINOJSON_USE_DOUBLE 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// store using a long because it usually match the size of a float.
|
|
||||||
#ifndef ARDUINOJSON_USE_LONG_LONG
|
|
||||||
#define ARDUINOJSON_USE_LONG_LONG 0
|
|
||||||
#endif
|
|
||||||
#ifndef ARDUINOJSON_USE_INT64
|
|
||||||
#define ARDUINOJSON_USE_INT64 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Arduino has its own implementation of String to replace std::string
|
|
||||||
#ifndef ARDUINOJSON_ENABLE_ARDUINO_STRING
|
|
||||||
#define ARDUINOJSON_ENABLE_ARDUINO_STRING 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ARDUINOJSON_ENABLE_ARDUINO_STREAM
|
|
||||||
#define ARDUINOJSON_ENABLE_ARDUINO_STREAM 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// On AVR archiecture, we can use PROGMEM
|
|
||||||
#ifndef ARDUINOJSON_ENABLE_PROGMEM
|
|
||||||
#ifdef PROGMEM
|
|
||||||
#define ARDUINOJSON_ENABLE_PROGMEM 1
|
|
||||||
#else
|
|
||||||
#define ARDUINOJSON_ENABLE_PROGMEM 0
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Arduino doesn't have std::string
|
|
||||||
#ifndef ARDUINOJSON_ENABLE_STD_STRING
|
|
||||||
#define ARDUINOJSON_ENABLE_STD_STRING 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Arduino doesn't support STL stream
|
|
||||||
#ifndef ARDUINOJSON_ENABLE_STD_STREAM
|
|
||||||
#define ARDUINOJSON_ENABLE_STD_STREAM 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ARDUINOJSON_ENABLE_ALIGNMENT
|
|
||||||
#ifdef ARDUINO_ARCH_AVR
|
|
||||||
// alignment isn't needed for 8-bit AVR
|
|
||||||
#define ARDUINOJSON_ENABLE_ALIGNMENT 0
|
|
||||||
#else
|
|
||||||
// but must processor needs pointer to be align on word size
|
|
||||||
#define ARDUINOJSON_ENABLE_ALIGNMENT 1
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// low value to prevent stack overflow
|
|
||||||
#ifndef ARDUINOJSON_DEFAULT_NESTING_LIMIT
|
|
||||||
#define ARDUINOJSON_DEFAULT_NESTING_LIMIT 10
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#else // assume this is a computer
|
|
||||||
|
|
||||||
// on a computer we have plenty of memory so we can use doubles
|
|
||||||
#ifndef ARDUINOJSON_USE_DOUBLE
|
|
||||||
#define ARDUINOJSON_USE_DOUBLE 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// use long long when available
|
|
||||||
#ifndef ARDUINOJSON_USE_LONG_LONG
|
|
||||||
#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1800)
|
|
||||||
#define ARDUINOJSON_USE_LONG_LONG 1
|
|
||||||
#else
|
|
||||||
#define ARDUINOJSON_USE_LONG_LONG 0
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// use _int64 on old versions of Visual Studio
|
|
||||||
#ifndef ARDUINOJSON_USE_INT64
|
|
||||||
#if defined(_MSC_VER) && _MSC_VER <= 1700
|
|
||||||
#define ARDUINOJSON_USE_INT64 1
|
|
||||||
#else
|
|
||||||
#define ARDUINOJSON_USE_INT64 0
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// on a computer, we can use std::string
|
|
||||||
#ifndef ARDUINOJSON_ENABLE_STD_STRING
|
|
||||||
#define ARDUINOJSON_ENABLE_STD_STRING 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// on a computer, there is no reason to beleive Arduino String is available
|
|
||||||
#ifndef ARDUINOJSON_ENABLE_ARDUINO_STRING
|
|
||||||
#define ARDUINOJSON_ENABLE_ARDUINO_STRING 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// PROGMEM is only available on AVR architecture
|
|
||||||
#ifndef ARDUINOJSON_ENABLE_PROGMEM
|
|
||||||
#define ARDUINOJSON_ENABLE_PROGMEM 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// on a computer, we can assume that the STL is there
|
|
||||||
#ifndef ARDUINOJSON_ENABLE_STD_STREAM
|
|
||||||
#define ARDUINOJSON_ENABLE_STD_STREAM 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// on a computer, there is no reason to beleive Arduino Stream is available
|
|
||||||
#ifndef ARDUINOJSON_ENABLE_ARDUINO_STREAM
|
|
||||||
#define ARDUINOJSON_ENABLE_ARDUINO_STREAM 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ARDUINOJSON_ENABLE_ALIGNMENT
|
|
||||||
// even if not required, most cpu's are faster with aligned pointers
|
|
||||||
#define ARDUINOJSON_ENABLE_ALIGNMENT 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// on a computer, we should have a lot of space on the stack
|
|
||||||
#ifndef ARDUINOJSON_DEFAULT_NESTING_LIMIT
|
|
||||||
#define ARDUINOJSON_DEFAULT_NESTING_LIMIT 50
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ARDUINOJSON_USE_LONG_LONG && ARDUINOJSON_USE_INT64
|
|
||||||
#error ARDUINOJSON_USE_LONG_LONG and ARDUINOJSON_USE_INT64 cannot be set together
|
|
||||||
#endif
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../Print.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
class Encoding {
|
|
||||||
public:
|
|
||||||
// Optimized for code size on a 8-bit AVR
|
|
||||||
static char escapeChar(char c) {
|
|
||||||
const char *p = escapeTable(false);
|
|
||||||
while (p[0] && p[1] != c) {
|
|
||||||
p += 2;
|
|
||||||
}
|
|
||||||
return p[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
// Optimized for code size on a 8-bit AVR
|
|
||||||
static char unescapeChar(char c) {
|
|
||||||
const char *p = escapeTable(true);
|
|
||||||
for (;;) {
|
|
||||||
if (p[0] == '\0') return c;
|
|
||||||
if (p[0] == c) return p[1];
|
|
||||||
p += 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
static const char *escapeTable(bool excludeIdenticals) {
|
|
||||||
return &"\"\"\\\\b\bf\fn\nr\rt\t"[excludeIdenticals ? 4 : 0];
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../JsonBuffer.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
class JsonBufferAllocated {
|
|
||||||
public:
|
|
||||||
void *operator new(size_t n, JsonBuffer *jsonBuffer) throw() {
|
|
||||||
if (!jsonBuffer) return NULL;
|
|
||||||
return jsonBuffer->alloc(n);
|
|
||||||
}
|
|
||||||
|
|
||||||
void operator delete(void *, JsonBuffer *)throw() {}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../Configuration.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
#if ARDUINOJSON_USE_DOUBLE
|
|
||||||
typedef double JsonFloat;
|
|
||||||
#else
|
|
||||||
typedef float JsonFloat;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../Configuration.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
#if ARDUINOJSON_USE_LONG_LONG
|
|
||||||
typedef long long JsonInteger;
|
|
||||||
typedef unsigned long long JsonUInt;
|
|
||||||
#elif ARDUINOJSON_USE_INT64
|
|
||||||
typedef __int64 JsonInteger;
|
|
||||||
typedef unsigned _int64 JsonUInt;
|
|
||||||
#else
|
|
||||||
typedef long JsonInteger;
|
|
||||||
typedef unsigned long JsonUInt;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
// A metafunction that returns the type of the value returned by
|
|
||||||
// JsonVariant::as<T>()
|
|
||||||
template <typename T>
|
|
||||||
struct JsonVariantAs {
|
|
||||||
typedef T type;
|
|
||||||
};
|
|
||||||
|
|
||||||
template <>
|
|
||||||
struct JsonVariantAs<char*> {
|
|
||||||
typedef const char* type;
|
|
||||||
};
|
|
||||||
|
|
||||||
template <>
|
|
||||||
struct JsonVariantAs<JsonArray> {
|
|
||||||
typedef JsonArray& type;
|
|
||||||
};
|
|
||||||
|
|
||||||
template <>
|
|
||||||
struct JsonVariantAs<const JsonArray> {
|
|
||||||
typedef const JsonArray& type;
|
|
||||||
};
|
|
||||||
|
|
||||||
template <>
|
|
||||||
struct JsonVariantAs<JsonObject> {
|
|
||||||
typedef JsonObject& type;
|
|
||||||
};
|
|
||||||
|
|
||||||
template <>
|
|
||||||
struct JsonVariantAs<const JsonObject> {
|
|
||||||
typedef const JsonObject& type;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,69 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../JsonVariantBase.hpp"
|
|
||||||
#include "../StringTraits/StringTraits.hpp"
|
|
||||||
#include "../TypeTraits/EnableIf.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
template <typename TComparand, typename Enable = void>
|
|
||||||
struct JsonVariantComparer {};
|
|
||||||
|
|
||||||
template <typename TString>
|
|
||||||
struct JsonVariantComparer<
|
|
||||||
TString,
|
|
||||||
typename TypeTraits::EnableIf<TypeTraits::IsString<TString>::value>::type> {
|
|
||||||
template <typename TVariant>
|
|
||||||
static bool equals(const JsonVariantBase<TVariant> &variant,
|
|
||||||
const TString &comparand) {
|
|
||||||
const char *value = variant.template as<const char *>();
|
|
||||||
return Internals::StringTraits<TString>::equals(comparand, value);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename TComparand>
|
|
||||||
struct JsonVariantComparer<
|
|
||||||
TComparand, typename TypeTraits::EnableIf<
|
|
||||||
!TypeTraits::IsVariant<TComparand>::value &&
|
|
||||||
!TypeTraits::IsString<TComparand>::value>::type> {
|
|
||||||
template <typename TVariant>
|
|
||||||
static bool equals(const JsonVariantBase<TVariant> &variant,
|
|
||||||
const TComparand &comparand) {
|
|
||||||
return variant.template as<TComparand>() == comparand;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename TVariant2>
|
|
||||||
struct JsonVariantComparer<TVariant2,
|
|
||||||
typename TypeTraits::EnableIf<
|
|
||||||
TypeTraits::IsVariant<TVariant2>::value>::type> {
|
|
||||||
template <typename TVariant1>
|
|
||||||
static bool equals(const JsonVariantBase<TVariant1> &left,
|
|
||||||
const TVariant2 &right) {
|
|
||||||
if (left.template is<bool>() && right.template is<bool>())
|
|
||||||
return left.template as<bool>() == right.template as<bool>();
|
|
||||||
if (left.template is<JsonInteger>() && right.template is<JsonInteger>())
|
|
||||||
return left.template as<JsonInteger>() ==
|
|
||||||
right.template as<JsonInteger>();
|
|
||||||
if (left.template is<JsonFloat>() && right.template is<JsonFloat>())
|
|
||||||
return left.template as<JsonFloat>() == right.template as<JsonFloat>();
|
|
||||||
if (left.template is<JsonArray>() && right.template is<JsonArray>())
|
|
||||||
return left.template as<JsonArray>() == right.template as<JsonArray>();
|
|
||||||
if (left.template is<JsonObject>() && right.template is<JsonObject>())
|
|
||||||
return left.template as<JsonObject>() == right.template as<JsonObject>();
|
|
||||||
if (left.template is<char *>() && right.template is<char *>())
|
|
||||||
return strcmp(left.template as<char *>(), right.template as<char *>()) ==
|
|
||||||
0;
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "JsonFloat.hpp"
|
|
||||||
#include "JsonInteger.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
|
|
||||||
// Forward declarations
|
|
||||||
class JsonArray;
|
|
||||||
class JsonObject;
|
|
||||||
|
|
||||||
namespace Internals {
|
|
||||||
// A union that defines the actual content of a JsonVariant.
|
|
||||||
// The enum JsonVariantType determines which member is in use.
|
|
||||||
union JsonVariantContent {
|
|
||||||
JsonFloat asFloat; // used for double and float
|
|
||||||
JsonUInt asInteger; // used for bool, char, short, int and longs
|
|
||||||
const char* asString; // asString can be null
|
|
||||||
JsonArray* asArray; // asArray cannot be null
|
|
||||||
JsonObject* asObject; // asObject cannot be null
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
struct JsonVariantDefault {
|
|
||||||
static T get() {
|
|
||||||
return T();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
struct JsonVariantDefault<const T> : JsonVariantDefault<T> {};
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
struct JsonVariantDefault<T&> : JsonVariantDefault<T> {};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
class JsonArray;
|
|
||||||
class JsonObject;
|
|
||||||
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
// Enumerated type to know the current type of a JsonVariant.
|
|
||||||
// The value determines which member of JsonVariantContent is used.
|
|
||||||
enum JsonVariantType {
|
|
||||||
JSON_UNDEFINED, // JsonVariant has not been initialized
|
|
||||||
JSON_UNPARSED, // JsonVariant contains an unparsed string
|
|
||||||
JSON_STRING, // JsonVariant stores a const char*
|
|
||||||
JSON_BOOLEAN, // JsonVariant stores a bool
|
|
||||||
JSON_POSITIVE_INTEGER, // JsonVariant stores an unsigned long
|
|
||||||
JSON_NEGATIVE_INTEGER, // JsonVariant stores an unsigned long that must be
|
|
||||||
// negated
|
|
||||||
JSON_ARRAY, // JsonVariant stores a pointer to a JsonArray
|
|
||||||
JSON_OBJECT, // JsonVariant stores a pointer to a JsonObject
|
|
||||||
|
|
||||||
// The following values are reserved for float values
|
|
||||||
// Multiple values are used for double, depending on the number of decimal
|
|
||||||
// digits that must be printed in the JSON output.
|
|
||||||
// This little trick allow to save one extra member in JsonVariant
|
|
||||||
JSON_FLOAT_0_DECIMALS
|
|
||||||
// JSON_FLOAT_1_DECIMAL
|
|
||||||
// JSON_FLOAT_2_DECIMALS
|
|
||||||
// ...
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,94 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../JsonBuffer.hpp"
|
|
||||||
#include "ListConstIterator.hpp"
|
|
||||||
#include "ListIterator.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
// A singly linked list of T.
|
|
||||||
// The linked list is composed of ListNode<T>.
|
|
||||||
// It is derived by JsonArray and JsonObject
|
|
||||||
template <typename T>
|
|
||||||
class List {
|
|
||||||
public:
|
|
||||||
typedef T value_type;
|
|
||||||
typedef ListNode<T> node_type;
|
|
||||||
typedef ListIterator<T> iterator;
|
|
||||||
typedef ListConstIterator<T> const_iterator;
|
|
||||||
|
|
||||||
// Creates an empty List<T> attached to a JsonBuffer.
|
|
||||||
// The JsonBuffer allows to allocate new nodes.
|
|
||||||
// When buffer is NULL, the List is not able to grow and success() returns
|
|
||||||
// false. This is used to identify bad memory allocations and parsing
|
|
||||||
// failures.
|
|
||||||
explicit List(JsonBuffer *buffer) : _buffer(buffer), _firstNode(NULL) {}
|
|
||||||
|
|
||||||
// Returns true if the object is valid
|
|
||||||
// Would return false in the following situation:
|
|
||||||
// - the memory allocation failed (StaticJsonBuffer was too small)
|
|
||||||
// - the JSON parsing failed
|
|
||||||
bool success() const {
|
|
||||||
return _buffer != NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Returns the numbers of elements in the list.
|
|
||||||
// For a JsonObject, it would return the number of key-value pairs
|
|
||||||
size_t size() const {
|
|
||||||
size_t nodeCount = 0;
|
|
||||||
for (node_type *node = _firstNode; node; node = node->next) nodeCount++;
|
|
||||||
return nodeCount;
|
|
||||||
}
|
|
||||||
|
|
||||||
iterator begin() {
|
|
||||||
return iterator(_firstNode);
|
|
||||||
}
|
|
||||||
iterator end() {
|
|
||||||
return iterator(NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
const_iterator begin() const {
|
|
||||||
return const_iterator(_firstNode);
|
|
||||||
}
|
|
||||||
const_iterator end() const {
|
|
||||||
return const_iterator(NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
node_type *addNewNode() {
|
|
||||||
node_type *newNode = new (_buffer) node_type();
|
|
||||||
|
|
||||||
if (_firstNode) {
|
|
||||||
node_type *lastNode = _firstNode;
|
|
||||||
while (lastNode->next) lastNode = lastNode->next;
|
|
||||||
lastNode->next = newNode;
|
|
||||||
} else {
|
|
||||||
_firstNode = newNode;
|
|
||||||
}
|
|
||||||
|
|
||||||
return newNode;
|
|
||||||
}
|
|
||||||
|
|
||||||
void removeNode(node_type *nodeToRemove) {
|
|
||||||
if (!nodeToRemove) return;
|
|
||||||
if (nodeToRemove == _firstNode) {
|
|
||||||
_firstNode = nodeToRemove->next;
|
|
||||||
} else {
|
|
||||||
for (node_type *node = _firstNode; node; node = node->next)
|
|
||||||
if (node->next == nodeToRemove) node->next = nodeToRemove->next;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
JsonBuffer *_buffer;
|
|
||||||
node_type *_firstNode;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "ListNode.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
// A read-only forward itertor for List<T>
|
|
||||||
template <typename T>
|
|
||||||
class ListConstIterator {
|
|
||||||
public:
|
|
||||||
explicit ListConstIterator(const ListNode<T> *node = NULL) : _node(node) {}
|
|
||||||
|
|
||||||
const T &operator*() const {
|
|
||||||
return _node->content;
|
|
||||||
}
|
|
||||||
const T *operator->() {
|
|
||||||
return &_node->content;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool operator==(const ListConstIterator<T> &other) const {
|
|
||||||
return _node == other._node;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool operator!=(const ListConstIterator<T> &other) const {
|
|
||||||
return _node != other._node;
|
|
||||||
}
|
|
||||||
|
|
||||||
ListConstIterator<T> &operator++() {
|
|
||||||
if (_node) _node = _node->next;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
const ListNode<T> *_node;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "ListConstIterator.hpp"
|
|
||||||
#include "ListNode.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
// A read-write forward iterator for List<T>
|
|
||||||
template <typename T>
|
|
||||||
class ListIterator {
|
|
||||||
public:
|
|
||||||
explicit ListIterator(ListNode<T> *node = NULL) : _node(node) {}
|
|
||||||
|
|
||||||
T &operator*() const {
|
|
||||||
return _node->content;
|
|
||||||
}
|
|
||||||
T *operator->() {
|
|
||||||
return &_node->content;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool operator==(const ListIterator<T> &other) const {
|
|
||||||
return _node == other._node;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool operator!=(const ListIterator<T> &other) const {
|
|
||||||
return _node != other._node;
|
|
||||||
}
|
|
||||||
|
|
||||||
ListIterator<T> &operator++() {
|
|
||||||
if (_node) _node = _node->next;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
operator ListConstIterator<T>() const {
|
|
||||||
return ListConstIterator<T>(_node);
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
ListNode<T> *_node;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <stddef.h> // for NULL
|
|
||||||
|
|
||||||
#include "JsonBufferAllocated.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
// A node for a singly-linked list.
|
|
||||||
// Used by List<T> and its iterators.
|
|
||||||
template <typename T>
|
|
||||||
struct ListNode : public Internals::JsonBufferAllocated {
|
|
||||||
ListNode() : next(NULL) {}
|
|
||||||
|
|
||||||
ListNode<T> *next;
|
|
||||||
T content;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,66 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
template <typename TFloat>
|
|
||||||
TFloat parse(const char *);
|
|
||||||
|
|
||||||
template <>
|
|
||||||
inline float parse<float>(const char *s) {
|
|
||||||
return static_cast<float>(strtod(s, NULL));
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
inline double parse<double>(const char *s) {
|
|
||||||
return strtod(s, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
inline long parse<long>(const char *s) {
|
|
||||||
return strtol(s, NULL, 10);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
inline unsigned long parse<unsigned long>(const char *s) {
|
|
||||||
return strtoul(s, NULL, 10);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
inline int parse<int>(const char *s) {
|
|
||||||
return atoi(s);
|
|
||||||
}
|
|
||||||
|
|
||||||
#if ARDUINOJSON_USE_LONG_LONG
|
|
||||||
template <>
|
|
||||||
inline long long parse<long long>(const char *s) {
|
|
||||||
return strtoll(s, NULL, 10);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
inline unsigned long long parse<unsigned long long>(const char *s) {
|
|
||||||
return strtoull(s, NULL, 10);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ARDUINOJSON_USE_INT64
|
|
||||||
template <>
|
|
||||||
inline __int64 parse<__int64>(const char *s) {
|
|
||||||
return _strtoi64(s, NULL, 10);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
inline unsigned __int64 parse<unsigned __int64>(const char *s) {
|
|
||||||
return _strtoui64(s, NULL, 10);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
// A type that is meant to be used by reference only (JsonArray and JsonObject)
|
|
||||||
class ReferenceType {
|
|
||||||
public:
|
|
||||||
bool operator==(const ReferenceType& other) const {
|
|
||||||
// two JsonArray are equal if they are the same instance
|
|
||||||
// (we don't compare the content)
|
|
||||||
return this == &other;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool operator!=(const ReferenceType& other) const {
|
|
||||||
return this != &other;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
ReferenceType() {}
|
|
||||||
|
|
||||||
private:
|
|
||||||
// copy constructor is private
|
|
||||||
ReferenceType(const ReferenceType&);
|
|
||||||
|
|
||||||
// copy operator is private
|
|
||||||
ReferenceType& operator=(const ReferenceType&);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,53 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../JsonBuffer.hpp"
|
|
||||||
#include "../JsonVariant.hpp"
|
|
||||||
#include "../StringTraits/StringTraits.hpp"
|
|
||||||
#include "../TypeTraits/EnableIf.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
template <typename TSource, typename Enable = void>
|
|
||||||
struct ValueSetter {
|
|
||||||
template <typename TDestination>
|
|
||||||
static bool set(JsonBuffer*, TDestination& destination,
|
|
||||||
const TSource& source) {
|
|
||||||
destination = source;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename TSource>
|
|
||||||
struct ValueSetter<TSource, typename TypeTraits::EnableIf<StringTraits<
|
|
||||||
TSource>::should_duplicate>::type> {
|
|
||||||
template <typename TDestination>
|
|
||||||
static bool set(JsonBuffer* buffer, TDestination& destination,
|
|
||||||
const TSource& source) {
|
|
||||||
const char* copy = buffer->strdup(source);
|
|
||||||
if (!copy) return false;
|
|
||||||
destination = copy;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename TSource>
|
|
||||||
struct ValueSetter<TSource, typename TypeTraits::EnableIf<!StringTraits<
|
|
||||||
TSource>::should_duplicate>::type> {
|
|
||||||
template <typename TDestination>
|
|
||||||
static bool set(JsonBuffer*, TDestination& destination,
|
|
||||||
const TSource& source) {
|
|
||||||
// unsigned char* -> char*
|
|
||||||
destination = reinterpret_cast<const char*>(source);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,64 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
template <typename TInput>
|
|
||||||
void skipSpacesAndComments(TInput& input) {
|
|
||||||
for (;;) {
|
|
||||||
switch (input.current()) {
|
|
||||||
// spaces
|
|
||||||
case ' ':
|
|
||||||
case '\t':
|
|
||||||
case '\r':
|
|
||||||
case '\n':
|
|
||||||
input.move();
|
|
||||||
continue;
|
|
||||||
|
|
||||||
// comments
|
|
||||||
case '/':
|
|
||||||
switch (input.next()) {
|
|
||||||
// C-style block comment
|
|
||||||
case '*':
|
|
||||||
input.move(); // skip '/'
|
|
||||||
// no need to skip '*'
|
|
||||||
for (;;) {
|
|
||||||
input.move();
|
|
||||||
if (input.current() == '\0') return;
|
|
||||||
if (input.current() == '*' && input.next() == '/') {
|
|
||||||
input.move(); // skip '*'
|
|
||||||
input.move(); // skip '/'
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
// C++-style line comment
|
|
||||||
case '/':
|
|
||||||
// not need to skip "//"
|
|
||||||
for (;;) {
|
|
||||||
input.move();
|
|
||||||
if (input.current() == '\0') return;
|
|
||||||
if (input.current() == '\n') break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
// not a comment, just a '/'
|
|
||||||
default:
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,107 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../JsonBuffer.hpp"
|
|
||||||
#include "../JsonVariant.hpp"
|
|
||||||
#include "../TypeTraits/IsConst.hpp"
|
|
||||||
#include "StringWriter.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
// Parse JSON string to create JsonArrays and JsonObjects
|
|
||||||
// This internal class is not indended to be used directly.
|
|
||||||
// Instead, use JsonBuffer.parseArray() or .parseObject()
|
|
||||||
template <typename TReader, typename TWriter>
|
|
||||||
class JsonParser {
|
|
||||||
public:
|
|
||||||
JsonParser(JsonBuffer *buffer, TReader reader, TWriter writer,
|
|
||||||
uint8_t nestingLimit)
|
|
||||||
: _buffer(buffer),
|
|
||||||
_reader(reader),
|
|
||||||
_writer(writer),
|
|
||||||
_nestingLimit(nestingLimit) {}
|
|
||||||
|
|
||||||
JsonArray &parseArray();
|
|
||||||
JsonObject &parseObject();
|
|
||||||
|
|
||||||
JsonVariant parseVariant() {
|
|
||||||
JsonVariant result;
|
|
||||||
parseAnythingTo(&result);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
JsonParser &operator=(const JsonParser &); // non-copiable
|
|
||||||
|
|
||||||
static bool eat(TReader &, char charToSkip);
|
|
||||||
FORCE_INLINE bool eat(char charToSkip) {
|
|
||||||
return eat(_reader, charToSkip);
|
|
||||||
}
|
|
||||||
|
|
||||||
const char *parseString();
|
|
||||||
bool parseAnythingTo(JsonVariant *destination);
|
|
||||||
FORCE_INLINE bool parseAnythingToUnsafe(JsonVariant *destination);
|
|
||||||
|
|
||||||
inline bool parseArrayTo(JsonVariant *destination);
|
|
||||||
inline bool parseObjectTo(JsonVariant *destination);
|
|
||||||
inline bool parseStringTo(JsonVariant *destination);
|
|
||||||
|
|
||||||
static inline bool isInRange(char c, char min, char max) {
|
|
||||||
return min <= c && c <= max;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline bool isLetterOrNumber(char c) {
|
|
||||||
return isInRange(c, '0', '9') || isInRange(c, 'a', 'z') ||
|
|
||||||
isInRange(c, 'A', 'Z') || c == '+' || c == '-' || c == '.';
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline bool isQuote(char c) {
|
|
||||||
return c == '\'' || c == '\"';
|
|
||||||
}
|
|
||||||
|
|
||||||
JsonBuffer *_buffer;
|
|
||||||
TReader _reader;
|
|
||||||
TWriter _writer;
|
|
||||||
uint8_t _nestingLimit;
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename TJsonBuffer, typename TString, typename Enable = void>
|
|
||||||
struct JsonParserBuilder {
|
|
||||||
typedef typename Internals::StringTraits<TString>::Reader InputReader;
|
|
||||||
typedef JsonParser<InputReader, TJsonBuffer &> TParser;
|
|
||||||
|
|
||||||
static TParser makeParser(TJsonBuffer *buffer, TString &json,
|
|
||||||
uint8_t nestingLimit) {
|
|
||||||
return TParser(buffer, InputReader(json), *buffer, nestingLimit);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename TJsonBuffer, typename TChar>
|
|
||||||
struct JsonParserBuilder<
|
|
||||||
TJsonBuffer, TChar *,
|
|
||||||
typename TypeTraits::EnableIf<!TypeTraits::IsConst<TChar>::value>::type> {
|
|
||||||
typedef typename Internals::StringTraits<TChar *>::Reader TReader;
|
|
||||||
typedef StringWriter<TChar> TWriter;
|
|
||||||
typedef JsonParser<TReader, TWriter> TParser;
|
|
||||||
|
|
||||||
static TParser makeParser(TJsonBuffer *buffer, TChar *json,
|
|
||||||
uint8_t nestingLimit) {
|
|
||||||
return TParser(buffer, TReader(json), TWriter(json), nestingLimit);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename TJsonBuffer, typename TString>
|
|
||||||
inline typename JsonParserBuilder<TJsonBuffer, TString>::TParser makeParser(
|
|
||||||
TJsonBuffer *buffer, TString &json, uint8_t nestingLimit) {
|
|
||||||
return JsonParserBuilder<TJsonBuffer, TString>::makeParser(buffer, json,
|
|
||||||
nestingLimit);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,196 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "Comments.hpp"
|
|
||||||
#include "JsonParser.hpp"
|
|
||||||
|
|
||||||
template <typename TReader, typename TWriter>
|
|
||||||
inline bool ArduinoJson::Internals::JsonParser<TReader, TWriter>::eat(
|
|
||||||
TReader &reader, char charToSkip) {
|
|
||||||
skipSpacesAndComments(reader);
|
|
||||||
if (reader.current() != charToSkip) return false;
|
|
||||||
reader.move();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TReader, typename TWriter>
|
|
||||||
inline bool
|
|
||||||
ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseAnythingTo(
|
|
||||||
JsonVariant *destination) {
|
|
||||||
if (_nestingLimit == 0) return false;
|
|
||||||
_nestingLimit--;
|
|
||||||
bool success = parseAnythingToUnsafe(destination);
|
|
||||||
_nestingLimit++;
|
|
||||||
return success;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TReader, typename TWriter>
|
|
||||||
inline bool
|
|
||||||
ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseAnythingToUnsafe(
|
|
||||||
JsonVariant *destination) {
|
|
||||||
skipSpacesAndComments(_reader);
|
|
||||||
|
|
||||||
switch (_reader.current()) {
|
|
||||||
case '[':
|
|
||||||
return parseArrayTo(destination);
|
|
||||||
|
|
||||||
case '{':
|
|
||||||
return parseObjectTo(destination);
|
|
||||||
|
|
||||||
default:
|
|
||||||
return parseStringTo(destination);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TReader, typename TWriter>
|
|
||||||
inline ArduinoJson::JsonArray &
|
|
||||||
ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseArray() {
|
|
||||||
// Create an empty array
|
|
||||||
JsonArray &array = _buffer->createArray();
|
|
||||||
|
|
||||||
// Check opening braket
|
|
||||||
if (!eat('[')) goto ERROR_MISSING_BRACKET;
|
|
||||||
if (eat(']')) goto SUCCESS_EMPTY_ARRAY;
|
|
||||||
|
|
||||||
// Read each value
|
|
||||||
for (;;) {
|
|
||||||
// 1 - Parse value
|
|
||||||
JsonVariant value;
|
|
||||||
if (!parseAnythingTo(&value)) goto ERROR_INVALID_VALUE;
|
|
||||||
if (!array.add(value)) goto ERROR_NO_MEMORY;
|
|
||||||
|
|
||||||
// 2 - More values?
|
|
||||||
if (eat(']')) goto SUCCES_NON_EMPTY_ARRAY;
|
|
||||||
if (!eat(',')) goto ERROR_MISSING_COMMA;
|
|
||||||
}
|
|
||||||
|
|
||||||
SUCCESS_EMPTY_ARRAY:
|
|
||||||
SUCCES_NON_EMPTY_ARRAY:
|
|
||||||
return array;
|
|
||||||
|
|
||||||
ERROR_INVALID_VALUE:
|
|
||||||
ERROR_MISSING_BRACKET:
|
|
||||||
ERROR_MISSING_COMMA:
|
|
||||||
ERROR_NO_MEMORY:
|
|
||||||
return JsonArray::invalid();
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TReader, typename TWriter>
|
|
||||||
inline bool ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseArrayTo(
|
|
||||||
JsonVariant *destination) {
|
|
||||||
JsonArray &array = parseArray();
|
|
||||||
if (!array.success()) return false;
|
|
||||||
|
|
||||||
*destination = array;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TReader, typename TWriter>
|
|
||||||
inline ArduinoJson::JsonObject &
|
|
||||||
ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseObject() {
|
|
||||||
// Create an empty object
|
|
||||||
JsonObject &object = _buffer->createObject();
|
|
||||||
|
|
||||||
// Check opening brace
|
|
||||||
if (!eat('{')) goto ERROR_MISSING_BRACE;
|
|
||||||
if (eat('}')) goto SUCCESS_EMPTY_OBJECT;
|
|
||||||
|
|
||||||
// Read each key value pair
|
|
||||||
for (;;) {
|
|
||||||
// 1 - Parse key
|
|
||||||
const char *key = parseString();
|
|
||||||
if (!key) goto ERROR_INVALID_KEY;
|
|
||||||
if (!eat(':')) goto ERROR_MISSING_COLON;
|
|
||||||
|
|
||||||
// 2 - Parse value
|
|
||||||
JsonVariant value;
|
|
||||||
if (!parseAnythingTo(&value)) goto ERROR_INVALID_VALUE;
|
|
||||||
if (!object.set(key, value)) goto ERROR_NO_MEMORY;
|
|
||||||
|
|
||||||
// 3 - More keys/values?
|
|
||||||
if (eat('}')) goto SUCCESS_NON_EMPTY_OBJECT;
|
|
||||||
if (!eat(',')) goto ERROR_MISSING_COMMA;
|
|
||||||
}
|
|
||||||
|
|
||||||
SUCCESS_EMPTY_OBJECT:
|
|
||||||
SUCCESS_NON_EMPTY_OBJECT:
|
|
||||||
return object;
|
|
||||||
|
|
||||||
ERROR_INVALID_KEY:
|
|
||||||
ERROR_INVALID_VALUE:
|
|
||||||
ERROR_MISSING_BRACE:
|
|
||||||
ERROR_MISSING_COLON:
|
|
||||||
ERROR_MISSING_COMMA:
|
|
||||||
ERROR_NO_MEMORY:
|
|
||||||
return JsonObject::invalid();
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TReader, typename TWriter>
|
|
||||||
inline bool ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseObjectTo(
|
|
||||||
JsonVariant *destination) {
|
|
||||||
JsonObject &object = parseObject();
|
|
||||||
if (!object.success()) return false;
|
|
||||||
|
|
||||||
*destination = object;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TReader, typename TWriter>
|
|
||||||
inline const char *
|
|
||||||
ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseString() {
|
|
||||||
typename TypeTraits::RemoveReference<TWriter>::type::String str =
|
|
||||||
_writer.startString();
|
|
||||||
|
|
||||||
skipSpacesAndComments(_reader);
|
|
||||||
char c = _reader.current();
|
|
||||||
|
|
||||||
if (isQuote(c)) { // quotes
|
|
||||||
_reader.move();
|
|
||||||
char stopChar = c;
|
|
||||||
for (;;) {
|
|
||||||
c = _reader.current();
|
|
||||||
if (c == '\0') break;
|
|
||||||
_reader.move();
|
|
||||||
|
|
||||||
if (c == stopChar) break;
|
|
||||||
|
|
||||||
if (c == '\\') {
|
|
||||||
// replace char
|
|
||||||
c = Encoding::unescapeChar(_reader.current());
|
|
||||||
if (c == '\0') break;
|
|
||||||
_reader.move();
|
|
||||||
}
|
|
||||||
|
|
||||||
str.append(c);
|
|
||||||
}
|
|
||||||
} else { // no quotes
|
|
||||||
for (;;) {
|
|
||||||
if (!isLetterOrNumber(c)) break;
|
|
||||||
_reader.move();
|
|
||||||
str.append(c);
|
|
||||||
c = _reader.current();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return str.c_str();
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TReader, typename TWriter>
|
|
||||||
inline bool ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseStringTo(
|
|
||||||
JsonVariant *destination) {
|
|
||||||
bool hasQuotes = isQuote(_reader.current());
|
|
||||||
const char *value = parseString();
|
|
||||||
if (value == NULL) return false;
|
|
||||||
if (hasQuotes) {
|
|
||||||
*destination = value;
|
|
||||||
} else {
|
|
||||||
*destination = RawJson(value);
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
template <typename TChar>
|
|
||||||
class StringWriter {
|
|
||||||
public:
|
|
||||||
class String {
|
|
||||||
public:
|
|
||||||
String(TChar** ptr) : _writePtr(ptr), _startPtr(*ptr) {}
|
|
||||||
|
|
||||||
void append(TChar c) {
|
|
||||||
*(*_writePtr)++ = c;
|
|
||||||
}
|
|
||||||
|
|
||||||
const char* c_str() const {
|
|
||||||
*(*_writePtr)++ = 0;
|
|
||||||
return reinterpret_cast<const char*>(_startPtr);
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
TChar** _writePtr;
|
|
||||||
TChar* _startPtr;
|
|
||||||
};
|
|
||||||
|
|
||||||
StringWriter(TChar* buffer) : _ptr(buffer) {}
|
|
||||||
|
|
||||||
String startString() {
|
|
||||||
return String(&_ptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
TChar* _ptr;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,159 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "JsonBufferBase.hpp"
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
#if defined(__clang__)
|
|
||||||
#pragma clang diagnostic push
|
|
||||||
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
|
|
||||||
#elif defined(__GNUC__)
|
|
||||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
|
|
||||||
#pragma GCC diagnostic push
|
|
||||||
#endif
|
|
||||||
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
class DefaultAllocator {
|
|
||||||
public:
|
|
||||||
void* allocate(size_t size) {
|
|
||||||
return malloc(size);
|
|
||||||
}
|
|
||||||
void deallocate(void* pointer) {
|
|
||||||
free(pointer);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename TAllocator>
|
|
||||||
class DynamicJsonBufferBase
|
|
||||||
: public JsonBufferBase<DynamicJsonBufferBase<TAllocator> > {
|
|
||||||
struct Block;
|
|
||||||
struct EmptyBlock {
|
|
||||||
Block* next;
|
|
||||||
size_t capacity;
|
|
||||||
size_t size;
|
|
||||||
};
|
|
||||||
struct Block : EmptyBlock {
|
|
||||||
uint8_t data[1];
|
|
||||||
};
|
|
||||||
|
|
||||||
public:
|
|
||||||
DynamicJsonBufferBase(size_t initialSize = 256)
|
|
||||||
: _head(NULL), _nextBlockCapacity(initialSize) {}
|
|
||||||
|
|
||||||
~DynamicJsonBufferBase() {
|
|
||||||
Block* currentBlock = _head;
|
|
||||||
|
|
||||||
while (currentBlock != NULL) {
|
|
||||||
Block* nextBlock = currentBlock->next;
|
|
||||||
_allocator.deallocate(currentBlock);
|
|
||||||
currentBlock = nextBlock;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t size() const {
|
|
||||||
size_t total = 0;
|
|
||||||
for (const Block* b = _head; b; b = b->next) total += b->size;
|
|
||||||
return total;
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void* alloc(size_t bytes) {
|
|
||||||
alignNextAlloc();
|
|
||||||
return canAllocInHead(bytes) ? allocInHead(bytes) : allocInNewBlock(bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
class String {
|
|
||||||
public:
|
|
||||||
String(DynamicJsonBufferBase* parent)
|
|
||||||
: _parent(parent), _start(NULL), _length(0) {}
|
|
||||||
|
|
||||||
void append(char c) {
|
|
||||||
if (_parent->canAllocInHead(1)) {
|
|
||||||
char* end = static_cast<char*>(_parent->allocInHead(1));
|
|
||||||
*end = c;
|
|
||||||
if (_length == 0) _start = end;
|
|
||||||
} else {
|
|
||||||
char* newStart =
|
|
||||||
static_cast<char*>(_parent->allocInNewBlock(_length + 1));
|
|
||||||
if (_start && newStart) memcpy(newStart, _start, _length);
|
|
||||||
if (newStart) newStart[_length] = c;
|
|
||||||
_start = newStart;
|
|
||||||
}
|
|
||||||
_length++;
|
|
||||||
}
|
|
||||||
|
|
||||||
const char* c_str() {
|
|
||||||
append(0);
|
|
||||||
return _start;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
DynamicJsonBufferBase* _parent;
|
|
||||||
char* _start;
|
|
||||||
int _length;
|
|
||||||
};
|
|
||||||
|
|
||||||
String startString() {
|
|
||||||
return String(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
void alignNextAlloc() {
|
|
||||||
if (_head) _head->size = this->round_size_up(_head->size);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool canAllocInHead(size_t bytes) const {
|
|
||||||
return _head != NULL && _head->size + bytes <= _head->capacity;
|
|
||||||
}
|
|
||||||
|
|
||||||
void* allocInHead(size_t bytes) {
|
|
||||||
void* p = _head->data + _head->size;
|
|
||||||
_head->size += bytes;
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
|
|
||||||
void* allocInNewBlock(size_t bytes) {
|
|
||||||
size_t capacity = _nextBlockCapacity;
|
|
||||||
if (bytes > capacity) capacity = bytes;
|
|
||||||
if (!addNewBlock(capacity)) return NULL;
|
|
||||||
_nextBlockCapacity *= 2;
|
|
||||||
return allocInHead(bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool addNewBlock(size_t capacity) {
|
|
||||||
size_t bytes = sizeof(EmptyBlock) + capacity;
|
|
||||||
Block* block = static_cast<Block*>(_allocator.allocate(bytes));
|
|
||||||
if (block == NULL) return false;
|
|
||||||
block->capacity = capacity;
|
|
||||||
block->size = 0;
|
|
||||||
block->next = _head;
|
|
||||||
_head = block;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
TAllocator _allocator;
|
|
||||||
Block* _head;
|
|
||||||
size_t _nextBlockCapacity;
|
|
||||||
};
|
|
||||||
|
|
||||||
#if defined(__clang__)
|
|
||||||
#pragma clang diagnostic pop
|
|
||||||
#elif defined(__GNUC__)
|
|
||||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
|
|
||||||
#pragma GCC diagnostic pop
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Implements a JsonBuffer with dynamic memory allocation.
|
|
||||||
// You are strongly encouraged to consider using StaticJsonBuffer which is much
|
|
||||||
// more suitable for embedded systems.
|
|
||||||
typedef DynamicJsonBufferBase<DefaultAllocator> DynamicJsonBuffer;
|
|
||||||
}
|
|
||||||
@ -1,234 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "Data/JsonBufferAllocated.hpp"
|
|
||||||
#include "Data/List.hpp"
|
|
||||||
#include "Data/ReferenceType.hpp"
|
|
||||||
#include "Data/ValueSetter.hpp"
|
|
||||||
#include "JsonVariant.hpp"
|
|
||||||
#include "Serialization/JsonPrintable.hpp"
|
|
||||||
#include "StringTraits/StringTraits.hpp"
|
|
||||||
#include "TypeTraits/EnableIf.hpp"
|
|
||||||
#include "TypeTraits/IsArray.hpp"
|
|
||||||
#include "TypeTraits/IsFloatingPoint.hpp"
|
|
||||||
#include "TypeTraits/IsSame.hpp"
|
|
||||||
|
|
||||||
// Returns the size (in bytes) of an array with n elements.
|
|
||||||
// Can be very handy to determine the size of a StaticJsonBuffer.
|
|
||||||
#define JSON_ARRAY_SIZE(NUMBER_OF_ELEMENTS) \
|
|
||||||
(sizeof(JsonArray) + (NUMBER_OF_ELEMENTS) * sizeof(JsonArray::node_type))
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
|
|
||||||
// Forward declarations
|
|
||||||
class JsonObject;
|
|
||||||
class JsonBuffer;
|
|
||||||
class JsonArraySubscript;
|
|
||||||
|
|
||||||
// An array of JsonVariant.
|
|
||||||
//
|
|
||||||
// The constructor is private, instances must be created via
|
|
||||||
// JsonBuffer::createArray() or JsonBuffer::parseArray().
|
|
||||||
// A JsonArray can be serialized to a JSON string via JsonArray::printTo().
|
|
||||||
// It can also be deserialized from a JSON string via JsonBuffer::parseArray().
|
|
||||||
class JsonArray : public Internals::JsonPrintable<JsonArray>,
|
|
||||||
public Internals::ReferenceType,
|
|
||||||
public Internals::List<JsonVariant>,
|
|
||||||
public Internals::JsonBufferAllocated {
|
|
||||||
public:
|
|
||||||
// Create an empty JsonArray attached to the specified JsonBuffer.
|
|
||||||
// You should not call this constructor directly.
|
|
||||||
// Instead, use JsonBuffer::createArray() or JsonBuffer::parseArray().
|
|
||||||
explicit JsonArray(JsonBuffer *buffer)
|
|
||||||
: Internals::List<JsonVariant>(buffer) {}
|
|
||||||
|
|
||||||
// Gets the value at the specified index
|
|
||||||
const JsonArraySubscript operator[](size_t index) const;
|
|
||||||
|
|
||||||
// Gets or sets the value at specified index
|
|
||||||
JsonArraySubscript operator[](size_t index);
|
|
||||||
|
|
||||||
// Adds the specified value at the end of the array.
|
|
||||||
//
|
|
||||||
// bool add(TValue);
|
|
||||||
// TValue = bool, long, int, short, float, double, RawJson, JsonVariant,
|
|
||||||
// const std::string&, const String&,
|
|
||||||
// const JsonArray&, const JsonObject&
|
|
||||||
template <typename T>
|
|
||||||
typename TypeTraits::EnableIf<!TypeTraits::IsArray<T>::value, bool>::type add(
|
|
||||||
const T &value) {
|
|
||||||
return add_impl<const T &>(value);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// bool add(TValue);
|
|
||||||
// TValue = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename T>
|
|
||||||
bool add(const T *value) {
|
|
||||||
return add_impl<const T *>(value);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// bool add(TValue value, uint8_t decimals);
|
|
||||||
// TValue = float, double
|
|
||||||
template <typename T>
|
|
||||||
bool add(T value, uint8_t decimals) {
|
|
||||||
return add_impl<const JsonVariant &>(JsonVariant(value, decimals));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sets the value at specified index.
|
|
||||||
//
|
|
||||||
// bool add(size_t index, TValue);
|
|
||||||
// TValue = bool, long, int, short, float, double, RawJson, JsonVariant,
|
|
||||||
// const std::string&, const String&,
|
|
||||||
// const JsonArray&, const JsonObject&
|
|
||||||
template <typename T>
|
|
||||||
typename TypeTraits::EnableIf<!TypeTraits::IsArray<T>::value, bool>::type set(
|
|
||||||
size_t index, const T &value) {
|
|
||||||
return set_impl<const T &>(index, value);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// bool add(size_t index, TValue);
|
|
||||||
// TValue = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename T>
|
|
||||||
bool set(size_t index, const T *value) {
|
|
||||||
return set_impl<const T *>(index, value);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// bool set(size_t index, TValue value, uint8_t decimals);
|
|
||||||
// TValue = float, double
|
|
||||||
template <typename T>
|
|
||||||
typename TypeTraits::EnableIf<TypeTraits::IsFloatingPoint<T>::value,
|
|
||||||
bool>::type
|
|
||||||
set(size_t index, T value, uint8_t decimals) {
|
|
||||||
return set_impl<const JsonVariant &>(index, JsonVariant(value, decimals));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Gets the value at the specified index.
|
|
||||||
template <typename T>
|
|
||||||
typename Internals::JsonVariantAs<T>::type get(size_t index) const {
|
|
||||||
node_type *node = findNode(index);
|
|
||||||
return node ? node->content.as<T>()
|
|
||||||
: Internals::JsonVariantDefault<T>::get();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check the type of the value at specified index.
|
|
||||||
template <typename T>
|
|
||||||
bool is(size_t index) const {
|
|
||||||
node_type *node = findNode(index);
|
|
||||||
return node ? node->content.is<T>() : false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Creates a JsonArray and adds a reference at the end of the array.
|
|
||||||
// It's a shortcut for JsonBuffer::createArray() and JsonArray::add()
|
|
||||||
JsonArray &createNestedArray();
|
|
||||||
|
|
||||||
// Creates a JsonObject and adds a reference at the end of the array.
|
|
||||||
// It's a shortcut for JsonBuffer::createObject() and JsonArray::add()
|
|
||||||
JsonObject &createNestedObject();
|
|
||||||
|
|
||||||
// Removes element at specified index.
|
|
||||||
void removeAt(size_t index) {
|
|
||||||
removeNode(findNode(index));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Returns a reference an invalid JsonArray.
|
|
||||||
// This object is meant to replace a NULL pointer.
|
|
||||||
// This is used when memory allocation or JSON parsing fail.
|
|
||||||
static JsonArray &invalid() {
|
|
||||||
static JsonArray instance(NULL);
|
|
||||||
return instance;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Imports a 1D array
|
|
||||||
template <typename T, size_t N>
|
|
||||||
bool copyFrom(T (&array)[N]) {
|
|
||||||
return copyFrom(array, N);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Imports a 1D array
|
|
||||||
template <typename T>
|
|
||||||
bool copyFrom(T *array, size_t len) {
|
|
||||||
bool ok = true;
|
|
||||||
for (size_t i = 0; i < len; i++) {
|
|
||||||
ok &= add(array[i]);
|
|
||||||
}
|
|
||||||
return ok;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Imports a 2D array
|
|
||||||
template <typename T, size_t N1, size_t N2>
|
|
||||||
bool copyFrom(T (&array)[N1][N2]) {
|
|
||||||
bool ok = true;
|
|
||||||
for (size_t i = 0; i < N1; i++) {
|
|
||||||
JsonArray &nestedArray = createNestedArray();
|
|
||||||
for (size_t j = 0; j < N2; j++) {
|
|
||||||
ok &= nestedArray.add(array[i][j]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ok;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Exports a 1D array
|
|
||||||
template <typename T, size_t N>
|
|
||||||
size_t copyTo(T (&array)[N]) const {
|
|
||||||
return copyTo(array, N);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Exports a 1D array
|
|
||||||
template <typename T>
|
|
||||||
size_t copyTo(T *array, size_t len) const {
|
|
||||||
size_t i = 0;
|
|
||||||
for (const_iterator it = begin(); it != end() && i < len; ++it)
|
|
||||||
array[i++] = *it;
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Exports a 2D array
|
|
||||||
template <typename T, size_t N1, size_t N2>
|
|
||||||
void copyTo(T (&array)[N1][N2]) const {
|
|
||||||
size_t i = 0;
|
|
||||||
for (const_iterator it = begin(); it != end() && i < N1; ++it) {
|
|
||||||
it->as<JsonArray>().copyTo(array[i++]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
node_type *findNode(size_t index) const {
|
|
||||||
node_type *node = _firstNode;
|
|
||||||
while (node && index--) node = node->next;
|
|
||||||
return node;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TValueRef>
|
|
||||||
bool set_impl(size_t index, TValueRef value) {
|
|
||||||
node_type *node = findNode(index);
|
|
||||||
if (!node) return false;
|
|
||||||
|
|
||||||
return Internals::ValueSetter<TValueRef>::set(_buffer, node->content,
|
|
||||||
value);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TValueRef>
|
|
||||||
bool add_impl(TValueRef value) {
|
|
||||||
node_type *node = addNewNode();
|
|
||||||
if (!node) return false;
|
|
||||||
|
|
||||||
return Internals::ValueSetter<TValueRef>::set(_buffer, node->content,
|
|
||||||
value);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
namespace Internals {
|
|
||||||
template <>
|
|
||||||
struct JsonVariantDefault<JsonArray> {
|
|
||||||
static JsonArray &get() {
|
|
||||||
return JsonArray::invalid();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "JsonArray.hpp"
|
|
||||||
#include "JsonArraySubscript.hpp"
|
|
||||||
#include "JsonObject.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
|
|
||||||
inline JsonArray &JsonArray::createNestedArray() {
|
|
||||||
if (!_buffer) return JsonArray::invalid();
|
|
||||||
JsonArray &array = _buffer->createArray();
|
|
||||||
add(array);
|
|
||||||
return array;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline JsonObject &JsonArray::createNestedObject() {
|
|
||||||
if (!_buffer) return JsonObject::invalid();
|
|
||||||
JsonObject &object = _buffer->createObject();
|
|
||||||
add(object);
|
|
||||||
return object;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,123 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "Configuration.hpp"
|
|
||||||
#include "JsonVariantBase.hpp"
|
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#pragma warning(push)
|
|
||||||
#pragma warning(disable : 4522)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
class JsonArraySubscript : public JsonVariantBase<JsonArraySubscript> {
|
|
||||||
public:
|
|
||||||
FORCE_INLINE JsonArraySubscript(JsonArray& array, size_t index)
|
|
||||||
: _array(array), _index(index) {}
|
|
||||||
|
|
||||||
FORCE_INLINE JsonArraySubscript& operator=(const JsonArraySubscript& src) {
|
|
||||||
_array.set(_index, src);
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Replaces the value
|
|
||||||
//
|
|
||||||
// operator=(TValue)
|
|
||||||
// TValue = bool, long, int, short, float, double, RawJson, JsonVariant,
|
|
||||||
// const std::string&, const String&,
|
|
||||||
// const JsonArray&, const JsonObject&
|
|
||||||
template <typename T>
|
|
||||||
FORCE_INLINE JsonArraySubscript& operator=(const T& src) {
|
|
||||||
_array.set(_index, src);
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// operator=(TValue)
|
|
||||||
// TValue = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename T>
|
|
||||||
FORCE_INLINE JsonArraySubscript& operator=(const T* src) {
|
|
||||||
_array.set(_index, src);
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
FORCE_INLINE bool success() const {
|
|
||||||
return _index < _array.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
FORCE_INLINE typename Internals::JsonVariantAs<T>::type as() const {
|
|
||||||
return _array.get<T>(_index);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
FORCE_INLINE bool is() const {
|
|
||||||
return _array.is<T>(_index);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Replaces the value
|
|
||||||
//
|
|
||||||
// bool set(TValue)
|
|
||||||
// TValue = bool, long, int, short, float, double, RawJson, JsonVariant,
|
|
||||||
// const std::string&, const String&,
|
|
||||||
// const JsonArray&, const JsonObject&
|
|
||||||
template <typename TValue>
|
|
||||||
FORCE_INLINE bool set(const TValue& value) {
|
|
||||||
return _array.set(_index, value);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// bool set(TValue)
|
|
||||||
// TValue = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename TValue>
|
|
||||||
FORCE_INLINE bool set(const TValue* value) {
|
|
||||||
return _array.set(_index, value);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// bool set(TValue, uint8_t decimals);
|
|
||||||
// TValue = float, double
|
|
||||||
template <typename TValue>
|
|
||||||
FORCE_INLINE bool set(const TValue& value, uint8_t decimals) {
|
|
||||||
return _array.set(_index, value, decimals);
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
JsonArray& _array;
|
|
||||||
const size_t _index;
|
|
||||||
};
|
|
||||||
|
|
||||||
#if ARDUINOJSON_ENABLE_STD_STREAM
|
|
||||||
inline std::ostream& operator<<(std::ostream& os,
|
|
||||||
const JsonArraySubscript& source) {
|
|
||||||
return source.printTo(os);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
inline JsonArraySubscript JsonArray::operator[](size_t index) {
|
|
||||||
return JsonArraySubscript(*this, index);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline const JsonArraySubscript JsonArray::operator[](size_t index) const {
|
|
||||||
return JsonArraySubscript(*const_cast<JsonArray*>(this), index);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TImplem>
|
|
||||||
inline JsonArraySubscript JsonVariantBase<TImplem>::operator[](int index) {
|
|
||||||
return as<JsonArray>()[index];
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TImplem>
|
|
||||||
inline const JsonArraySubscript JsonVariantBase<TImplem>::operator[](
|
|
||||||
int index) const {
|
|
||||||
return as<JsonArray>()[index];
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace ArduinoJson
|
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#pragma warning(pop)
|
|
||||||
#endif
|
|
||||||
@ -1,97 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <stddef.h> // for size_t
|
|
||||||
#include <stdint.h> // for uint8_t
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#include "JsonVariant.hpp"
|
|
||||||
#include "TypeTraits/EnableIf.hpp"
|
|
||||||
#include "TypeTraits/IsArray.hpp"
|
|
||||||
|
|
||||||
#if defined(__clang__)
|
|
||||||
#pragma clang diagnostic push
|
|
||||||
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
|
|
||||||
#elif defined(__GNUC__)
|
|
||||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
|
|
||||||
#pragma GCC diagnostic push
|
|
||||||
#endif
|
|
||||||
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
class JsonArray;
|
|
||||||
class JsonObject;
|
|
||||||
|
|
||||||
// Entry point for using the library.
|
|
||||||
//
|
|
||||||
// Handle the memory management (done in derived classes) and calls the parser.
|
|
||||||
// This abstract class is implemented by StaticJsonBuffer which implements a
|
|
||||||
// fixed memory allocation.
|
|
||||||
class JsonBuffer {
|
|
||||||
public:
|
|
||||||
// CAUTION: NO VIRTUAL DESTRUCTOR!
|
|
||||||
// If we add a virtual constructor the Arduino compiler will add malloc() and
|
|
||||||
// free() to the binary, adding 706 useless bytes.
|
|
||||||
// virtual ~JsonBuffer() {}
|
|
||||||
|
|
||||||
// Allocates an empty JsonArray.
|
|
||||||
//
|
|
||||||
// Returns a reference to the new JsonArray or JsonArray::invalid() if the
|
|
||||||
// allocation fails.
|
|
||||||
JsonArray &createArray();
|
|
||||||
|
|
||||||
// Allocates an empty JsonObject.
|
|
||||||
//
|
|
||||||
// Returns a reference to the new JsonObject or JsonObject::invalid() if the
|
|
||||||
// allocation fails.
|
|
||||||
JsonObject &createObject();
|
|
||||||
|
|
||||||
// Duplicates a string
|
|
||||||
//
|
|
||||||
// char* strdup(TValue);
|
|
||||||
// TValue = const std::string&, const String&,
|
|
||||||
template <typename TString>
|
|
||||||
typename TypeTraits::EnableIf<!TypeTraits::IsArray<TString>::value,
|
|
||||||
char *>::type
|
|
||||||
strdup(const TString &src) {
|
|
||||||
return Internals::StringTraits<TString>::duplicate(src, this);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// char* strdup(TValue);
|
|
||||||
// TValue = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename TString>
|
|
||||||
char *strdup(const TString *src) {
|
|
||||||
return Internals::StringTraits<const TString *>::duplicate(src, this);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Allocates n bytes in the JsonBuffer.
|
|
||||||
// Return a pointer to the allocated memory or NULL if allocation fails.
|
|
||||||
virtual void *alloc(size_t size) = 0;
|
|
||||||
|
|
||||||
protected:
|
|
||||||
// Preserve aligment if necessary
|
|
||||||
static FORCE_INLINE size_t round_size_up(size_t bytes) {
|
|
||||||
#if ARDUINOJSON_ENABLE_ALIGNMENT
|
|
||||||
const size_t x = sizeof(void *) - 1;
|
|
||||||
return (bytes + x) & ~x;
|
|
||||||
#else
|
|
||||||
return bytes;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
#if defined(__clang__)
|
|
||||||
#pragma clang diagnostic pop
|
|
||||||
#elif defined(__GNUC__)
|
|
||||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
|
|
||||||
#pragma GCC diagnostic pop
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
@ -1,143 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "Deserialization/JsonParser.hpp"
|
|
||||||
|
|
||||||
#if defined(__clang__)
|
|
||||||
#pragma clang diagnostic push
|
|
||||||
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
|
|
||||||
#elif defined(__GNUC__)
|
|
||||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
|
|
||||||
#pragma GCC diagnostic push
|
|
||||||
#endif
|
|
||||||
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
template <typename TDerived>
|
|
||||||
class JsonBufferBase : public JsonBuffer {
|
|
||||||
public:
|
|
||||||
// Allocates and populate a JsonArray from a JSON string.
|
|
||||||
//
|
|
||||||
// The First argument is a pointer to the JSON string, the memory must be
|
|
||||||
// writable
|
|
||||||
// because the parser will insert null-terminators and replace escaped chars.
|
|
||||||
//
|
|
||||||
// The second argument set the nesting limit
|
|
||||||
//
|
|
||||||
// Returns a reference to the new JsonObject or JsonObject::invalid() if the
|
|
||||||
// allocation fails.
|
|
||||||
// With this overload, the JsonBuffer will make a copy of the string
|
|
||||||
//
|
|
||||||
// JsonArray& parseArray(TString);
|
|
||||||
// TString = const std::string&, const String&
|
|
||||||
template <typename TString>
|
|
||||||
typename TypeTraits::EnableIf<!TypeTraits::IsArray<TString>::value,
|
|
||||||
JsonArray &>::type
|
|
||||||
parseArray(const TString &json,
|
|
||||||
uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
|
|
||||||
return Internals::makeParser(that(), json, nestingLimit).parseArray();
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// JsonArray& parseArray(TString);
|
|
||||||
// TString = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename TString>
|
|
||||||
JsonArray &parseArray(
|
|
||||||
TString *json, uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
|
|
||||||
return Internals::makeParser(that(), json, nestingLimit).parseArray();
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// JsonArray& parseArray(TString);
|
|
||||||
// TString = std::istream&, Stream&
|
|
||||||
template <typename TString>
|
|
||||||
JsonArray &parseArray(
|
|
||||||
TString &json, uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
|
|
||||||
return Internals::makeParser(that(), json, nestingLimit).parseArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Allocates and populate a JsonObject from a JSON string.
|
|
||||||
//
|
|
||||||
// The First argument is a pointer to the JSON string, the memory must be
|
|
||||||
// writable
|
|
||||||
// because the parser will insert null-terminators and replace escaped chars.
|
|
||||||
//
|
|
||||||
// The second argument set the nesting limit
|
|
||||||
//
|
|
||||||
// Returns a reference to the new JsonObject or JsonObject::invalid() if the
|
|
||||||
// allocation fails.
|
|
||||||
//
|
|
||||||
// JsonObject& parseObject(TString);
|
|
||||||
// TString = const std::string&, const String&
|
|
||||||
template <typename TString>
|
|
||||||
typename TypeTraits::EnableIf<!TypeTraits::IsArray<TString>::value,
|
|
||||||
JsonObject &>::type
|
|
||||||
parseObject(const TString &json,
|
|
||||||
uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
|
|
||||||
return Internals::makeParser(that(), json, nestingLimit).parseObject();
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// JsonObject& parseObject(TString);
|
|
||||||
// TString = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename TString>
|
|
||||||
JsonObject &parseObject(
|
|
||||||
TString *json, uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
|
|
||||||
return Internals::makeParser(that(), json, nestingLimit).parseObject();
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// JsonObject& parseObject(TString);
|
|
||||||
// TString = std::istream&, Stream&
|
|
||||||
template <typename TString>
|
|
||||||
JsonObject &parseObject(
|
|
||||||
TString &json, uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
|
|
||||||
return Internals::makeParser(that(), json, nestingLimit).parseObject();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Generalized version of parseArray() and parseObject(), also works for
|
|
||||||
// integral types.
|
|
||||||
//
|
|
||||||
// JsonVariant parse(TString);
|
|
||||||
// TString = const std::string&, const String&
|
|
||||||
template <typename TString>
|
|
||||||
typename TypeTraits::EnableIf<!TypeTraits::IsArray<TString>::value,
|
|
||||||
JsonVariant>::type
|
|
||||||
parse(const TString &json,
|
|
||||||
uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
|
|
||||||
return Internals::makeParser(that(), json, nestingLimit).parseVariant();
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// JsonVariant parse(TString);
|
|
||||||
// TString = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename TString>
|
|
||||||
JsonVariant parse(TString *json,
|
|
||||||
uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
|
|
||||||
return Internals::makeParser(that(), json, nestingLimit).parseVariant();
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// JsonVariant parse(TString);
|
|
||||||
// TString = std::istream&, Stream&
|
|
||||||
template <typename TString>
|
|
||||||
JsonVariant parse(TString &json,
|
|
||||||
uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
|
|
||||||
return Internals::makeParser(that(), json, nestingLimit).parseVariant();
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
TDerived *that() {
|
|
||||||
return static_cast<TDerived *>(this);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
#if defined(__clang__)
|
|
||||||
#pragma clang diagnostic pop
|
|
||||||
#elif defined(__GNUC__)
|
|
||||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
|
|
||||||
#pragma GCC diagnostic pop
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "Deserialization/JsonParser.hpp"
|
|
||||||
|
|
||||||
inline ArduinoJson::JsonArray &ArduinoJson::JsonBuffer::createArray() {
|
|
||||||
JsonArray *ptr = new (this) JsonArray(this);
|
|
||||||
return ptr ? *ptr : JsonArray::invalid();
|
|
||||||
}
|
|
||||||
|
|
||||||
inline ArduinoJson::JsonObject &ArduinoJson::JsonBuffer::createObject() {
|
|
||||||
JsonObject *ptr = new (this) JsonObject(this);
|
|
||||||
return ptr ? *ptr : JsonObject::invalid();
|
|
||||||
}
|
|
||||||
@ -1,341 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "Data/JsonBufferAllocated.hpp"
|
|
||||||
#include "Data/List.hpp"
|
|
||||||
#include "Data/ReferenceType.hpp"
|
|
||||||
#include "Data/ValueSetter.hpp"
|
|
||||||
#include "JsonPair.hpp"
|
|
||||||
#include "Serialization/JsonPrintable.hpp"
|
|
||||||
#include "StringTraits/StringTraits.hpp"
|
|
||||||
#include "TypeTraits/EnableIf.hpp"
|
|
||||||
#include "TypeTraits/IsArray.hpp"
|
|
||||||
#include "TypeTraits/IsFloatingPoint.hpp"
|
|
||||||
#include "TypeTraits/IsSame.hpp"
|
|
||||||
|
|
||||||
// Returns the size (in bytes) of an object with n elements.
|
|
||||||
// Can be very handy to determine the size of a StaticJsonBuffer.
|
|
||||||
#define JSON_OBJECT_SIZE(NUMBER_OF_ELEMENTS) \
|
|
||||||
(sizeof(JsonObject) + (NUMBER_OF_ELEMENTS) * sizeof(JsonObject::node_type))
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
|
|
||||||
// Forward declarations
|
|
||||||
class JsonArray;
|
|
||||||
class JsonBuffer;
|
|
||||||
|
|
||||||
// A dictionary of JsonVariant indexed by string (char*)
|
|
||||||
//
|
|
||||||
// The constructor is private, instances must be created via
|
|
||||||
// JsonBuffer::createObject() or JsonBuffer::parseObject().
|
|
||||||
// A JsonObject can be serialized to a JSON string via JsonObject::printTo().
|
|
||||||
// It can also be deserialized from a JSON string via JsonBuffer::parseObject().
|
|
||||||
class JsonObject : public Internals::JsonPrintable<JsonObject>,
|
|
||||||
public Internals::ReferenceType,
|
|
||||||
public Internals::List<JsonPair>,
|
|
||||||
public Internals::JsonBufferAllocated {
|
|
||||||
public:
|
|
||||||
// Create an empty JsonArray attached to the specified JsonBuffer.
|
|
||||||
// You should not use this constructor directly.
|
|
||||||
// Instead, use JsonBuffer::createObject() or JsonBuffer.parseObject().
|
|
||||||
explicit JsonObject(JsonBuffer* buffer) : Internals::List<JsonPair>(buffer) {}
|
|
||||||
|
|
||||||
// Gets or sets the value associated with the specified key.
|
|
||||||
//
|
|
||||||
// JsonObjectSubscript operator[](TKey)
|
|
||||||
// TKey = const std::string&, const String&
|
|
||||||
template <typename TString>
|
|
||||||
typename TypeTraits::EnableIf<!TypeTraits::IsArray<TString>::value,
|
|
||||||
JsonObjectSubscript<const TString&> >::type
|
|
||||||
operator[](const TString& key) {
|
|
||||||
return JsonObjectSubscript<const TString&>(*this, key);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// JsonObjectSubscript operator[](TKey)
|
|
||||||
// TKey = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename TString>
|
|
||||||
JsonObjectSubscript<const TString*> operator[](const TString* key) {
|
|
||||||
return JsonObjectSubscript<const TString*>(*this, key);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Gets the value associated with the specified key.
|
|
||||||
//
|
|
||||||
// const JsonObjectSubscript operator[](TKey) const;
|
|
||||||
// TKey = const std::string&, const String&
|
|
||||||
template <typename TString>
|
|
||||||
typename TypeTraits::EnableIf<
|
|
||||||
!TypeTraits::IsArray<TString>::value,
|
|
||||||
const JsonObjectSubscript<const TString&> >::type
|
|
||||||
operator[](const TString& key) const {
|
|
||||||
return JsonObjectSubscript<const TString&>(*const_cast<JsonObject*>(this),
|
|
||||||
key);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// const JsonObjectSubscript operator[](TKey) const;
|
|
||||||
// TKey = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename TString>
|
|
||||||
const JsonObjectSubscript<const TString*> operator[](
|
|
||||||
const TString* key) const {
|
|
||||||
return JsonObjectSubscript<const TString*>(*const_cast<JsonObject*>(this),
|
|
||||||
key);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sets the specified key with the specified value.
|
|
||||||
//
|
|
||||||
// bool set(TKey, TValue);
|
|
||||||
// TKey = const std::string&, const String&
|
|
||||||
// TValue = bool, long, int, short, float, double, RawJson, JsonVariant,
|
|
||||||
// const std::string&, const String&,
|
|
||||||
// const JsonArray&, const JsonObject&
|
|
||||||
template <typename TValue, typename TString>
|
|
||||||
typename TypeTraits::EnableIf<!TypeTraits::IsArray<TString>::value &&
|
|
||||||
!TypeTraits::IsArray<TValue>::value,
|
|
||||||
bool>::type
|
|
||||||
set(const TString& key, const TValue& value) {
|
|
||||||
return set_impl<const TString&, const TValue&>(key, value);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// bool set(TKey, TValue);
|
|
||||||
// TKey = const std::string&, const String&
|
|
||||||
// TValue = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename TValue, typename TString>
|
|
||||||
typename TypeTraits::EnableIf<!TypeTraits::IsArray<TString>::value,
|
|
||||||
bool>::type
|
|
||||||
set(const TString& key, const TValue* value) {
|
|
||||||
return set_impl<const TString&, const TValue*>(key, value);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// bool set(TKey, TValue);
|
|
||||||
// TKey = const char*, const char[N], const FlashStringHelper*
|
|
||||||
// TValue = bool, long, int, short, float, double, RawJson, JsonVariant,
|
|
||||||
// const std::string&, const String&,
|
|
||||||
// const JsonArray&, const JsonObject&
|
|
||||||
template <typename TValue, typename TString>
|
|
||||||
typename TypeTraits::EnableIf<!TypeTraits::IsArray<TValue>::value, bool>::type
|
|
||||||
set(const TString* key, const TValue& value) {
|
|
||||||
return set_impl<const TString*, const TValue&>(key, value);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// bool set(TKey, TValue);
|
|
||||||
// TKey = const char*, const char[N], const FlashStringHelper*
|
|
||||||
// TValue = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename TValue, typename TString>
|
|
||||||
bool set(const TString* key, const TValue* value) {
|
|
||||||
return set_impl<const TString*, const TValue*>(key, value);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// bool set(TKey, TValue, uint8_t decimals);
|
|
||||||
// TKey = const std::string&, const String&
|
|
||||||
// TValue = float, double
|
|
||||||
template <typename TValue, typename TString>
|
|
||||||
typename TypeTraits::EnableIf<TypeTraits::IsFloatingPoint<TValue>::value &&
|
|
||||||
!TypeTraits::IsArray<TString>::value,
|
|
||||||
bool>::type
|
|
||||||
set(const TString& key, TValue value, uint8_t decimals) {
|
|
||||||
return set_impl<const TString&, const JsonVariant&>(
|
|
||||||
key, JsonVariant(value, decimals));
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// bool set(TKey, TValue, uint8_t decimals);
|
|
||||||
// TKey = const char*, const char[N], const FlashStringHelper*
|
|
||||||
// TValue = float, double
|
|
||||||
template <typename TValue, typename TString>
|
|
||||||
typename TypeTraits::EnableIf<TypeTraits::IsFloatingPoint<TValue>::value,
|
|
||||||
bool>::type
|
|
||||||
set(const TString* key, TValue value, uint8_t decimals) {
|
|
||||||
return set_impl<const TString*, const JsonVariant&>(
|
|
||||||
key, JsonVariant(value, decimals));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Gets the value associated with the specified key.
|
|
||||||
//
|
|
||||||
// TValue get<TValue>(TKey);
|
|
||||||
// TKey = const std::string&, const String&
|
|
||||||
// TValue = bool, char, long, int, short, float, double,
|
|
||||||
// const std::string&, const String&,
|
|
||||||
// const JsonArray&, const JsonObject&
|
|
||||||
template <typename TValue, typename TString>
|
|
||||||
typename TypeTraits::EnableIf<
|
|
||||||
!TypeTraits::IsArray<TString>::value,
|
|
||||||
typename Internals::JsonVariantAs<TValue>::type>::type
|
|
||||||
get(const TString& key) const {
|
|
||||||
return get_impl<const TString&, TValue>(key);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// TValue get<TValue>(TKey);
|
|
||||||
// TKey = const char*, const char[N], const FlashStringHelper*
|
|
||||||
// TValue = bool, char, long, int, short, float, double,
|
|
||||||
// const std::string&, const String&,
|
|
||||||
// const JsonArray&, const JsonObject&
|
|
||||||
template <typename TValue, typename TString>
|
|
||||||
typename Internals::JsonVariantAs<TValue>::type get(
|
|
||||||
const TString* key) const {
|
|
||||||
return get_impl<const TString*, TValue>(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Checks the type of the value associated with the specified key.
|
|
||||||
//
|
|
||||||
//
|
|
||||||
// bool is<TValue>(TKey) const;
|
|
||||||
// TKey = const std::string&, const String&
|
|
||||||
// TValue = bool, char, long, int, short, float, double,
|
|
||||||
// const std::string&, const String&,
|
|
||||||
// const JsonArray&, const JsonObject&
|
|
||||||
template <typename TValue, typename TString>
|
|
||||||
typename TypeTraits::EnableIf<!TypeTraits::IsArray<TString>::value,
|
|
||||||
bool>::type
|
|
||||||
is(const TString& key) const {
|
|
||||||
return is_impl<const TString&, TValue>(key);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// bool is<TValue>(TKey) const;
|
|
||||||
// TKey = const char*, const char[N], const FlashStringHelper*
|
|
||||||
// TValue = bool, char, long, int, short, float, double,
|
|
||||||
// const std::string&, const String&,
|
|
||||||
// const JsonArray&, const JsonObject&
|
|
||||||
template <typename TValue, typename TString>
|
|
||||||
bool is(const TString* key) const {
|
|
||||||
return is_impl<const TString*, TValue>(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Creates and adds a JsonArray.
|
|
||||||
//
|
|
||||||
// JsonArray& createNestedArray(TKey);
|
|
||||||
// TKey = const std::string&, const String&
|
|
||||||
template <typename TString>
|
|
||||||
typename TypeTraits::EnableIf<!TypeTraits::IsArray<TString>::value,
|
|
||||||
JsonArray&>::type
|
|
||||||
createNestedArray(const TString& key) {
|
|
||||||
return createNestedArray_impl<const TString&>(key);
|
|
||||||
}
|
|
||||||
// JsonArray& createNestedArray(TKey);
|
|
||||||
// TKey = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename TString>
|
|
||||||
JsonArray& createNestedArray(const TString* key) {
|
|
||||||
return createNestedArray_impl<const TString*>(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Creates and adds a JsonObject.
|
|
||||||
//
|
|
||||||
// JsonObject& createNestedObject(TKey);
|
|
||||||
// TKey = const std::string&, const String&
|
|
||||||
template <typename TString>
|
|
||||||
typename TypeTraits::EnableIf<!TypeTraits::IsArray<TString>::value,
|
|
||||||
JsonObject&>::type
|
|
||||||
createNestedObject(const TString& key) {
|
|
||||||
return createNestedObject_impl<const TString&>(key);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// JsonObject& createNestedObject(TKey);
|
|
||||||
// TKey = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename TString>
|
|
||||||
JsonObject& createNestedObject(const TString* key) {
|
|
||||||
return createNestedObject_impl<const TString*>(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Tells weither the specified key is present and associated with a value.
|
|
||||||
//
|
|
||||||
// bool containsKey(TKey);
|
|
||||||
// TKey = const std::string&, const String&
|
|
||||||
template <typename TString>
|
|
||||||
typename TypeTraits::EnableIf<!TypeTraits::IsArray<TString>::value,
|
|
||||||
bool>::type
|
|
||||||
containsKey(const TString& key) const {
|
|
||||||
return findNode<const TString&>(key) != NULL;
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// bool containsKey(TKey);
|
|
||||||
// TKey = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename TString>
|
|
||||||
bool containsKey(const TString* key) const {
|
|
||||||
return findNode<const TString*>(key) != NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Removes the specified key and the associated value.
|
|
||||||
//
|
|
||||||
// void remove(TKey);
|
|
||||||
// TKey = const std::string&, const String&
|
|
||||||
template <typename TString>
|
|
||||||
typename TypeTraits::EnableIf<!TypeTraits::IsArray<TString>::value,
|
|
||||||
void>::type
|
|
||||||
remove(const TString& key) {
|
|
||||||
removeNode(findNode<const TString&>(key));
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// void remove(TKey);
|
|
||||||
// TKey = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename TString>
|
|
||||||
void remove(const TString* key) {
|
|
||||||
removeNode(findNode<const TString*>(key));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Returns a reference an invalid JsonObject.
|
|
||||||
// This object is meant to replace a NULL pointer.
|
|
||||||
// This is used when memory allocation or JSON parsing fail.
|
|
||||||
static JsonObject& invalid() {
|
|
||||||
static JsonObject instance(NULL);
|
|
||||||
return instance;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
// Returns the list node that matches the specified key.
|
|
||||||
template <typename TStringRef>
|
|
||||||
node_type* findNode(TStringRef key) const {
|
|
||||||
for (node_type* node = _firstNode; node; node = node->next) {
|
|
||||||
if (Internals::StringTraits<TStringRef>::equals(key, node->content.key))
|
|
||||||
return node;
|
|
||||||
}
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TStringRef, typename TValue>
|
|
||||||
typename Internals::JsonVariantAs<TValue>::type get_impl(
|
|
||||||
TStringRef key) const {
|
|
||||||
node_type* node = findNode<TStringRef>(key);
|
|
||||||
return node ? node->content.value.as<TValue>()
|
|
||||||
: Internals::JsonVariantDefault<TValue>::get();
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TStringRef, typename TValueRef>
|
|
||||||
bool set_impl(TStringRef key, TValueRef value) {
|
|
||||||
node_type* node = findNode<TStringRef>(key);
|
|
||||||
if (!node) {
|
|
||||||
node = addNewNode();
|
|
||||||
if (!node) return false;
|
|
||||||
|
|
||||||
bool key_ok = Internals::ValueSetter<TStringRef>::set(
|
|
||||||
_buffer, node->content.key, key);
|
|
||||||
if (!key_ok) return false;
|
|
||||||
}
|
|
||||||
return Internals::ValueSetter<TValueRef>::set(_buffer, node->content.value,
|
|
||||||
value);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TStringRef, typename TValue>
|
|
||||||
bool is_impl(TStringRef key) const {
|
|
||||||
node_type* node = findNode<TStringRef>(key);
|
|
||||||
return node ? node->content.value.is<TValue>() : false;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TStringRef>
|
|
||||||
JsonArray& createNestedArray_impl(TStringRef key);
|
|
||||||
|
|
||||||
template <typename TStringRef>
|
|
||||||
JsonObject& createNestedObject_impl(TStringRef key);
|
|
||||||
};
|
|
||||||
|
|
||||||
namespace Internals {
|
|
||||||
template <>
|
|
||||||
struct JsonVariantDefault<JsonObject> {
|
|
||||||
static JsonObject& get() {
|
|
||||||
return JsonObject::invalid();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "JsonArray.hpp"
|
|
||||||
#include "JsonObject.hpp"
|
|
||||||
#include "JsonObjectSubscript.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
|
|
||||||
template <typename TStringRef>
|
|
||||||
inline JsonArray &JsonObject::createNestedArray_impl(TStringRef key) {
|
|
||||||
if (!_buffer) return JsonArray::invalid();
|
|
||||||
JsonArray &array = _buffer->createArray();
|
|
||||||
set(key, array);
|
|
||||||
return array;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TStringRef>
|
|
||||||
inline JsonObject &JsonObject::createNestedObject_impl(TStringRef key) {
|
|
||||||
if (!_buffer) return JsonObject::invalid();
|
|
||||||
JsonObject &object = _buffer->createObject();
|
|
||||||
set(key, object);
|
|
||||||
return object;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,116 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "Configuration.hpp"
|
|
||||||
#include "JsonVariantBase.hpp"
|
|
||||||
#include "TypeTraits/EnableIf.hpp"
|
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#pragma warning(push)
|
|
||||||
#pragma warning(disable : 4522)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
|
|
||||||
template <typename TStringRef>
|
|
||||||
class JsonObjectSubscript
|
|
||||||
: public JsonVariantBase<JsonObjectSubscript<TStringRef> > {
|
|
||||||
typedef JsonObjectSubscript<TStringRef> this_type;
|
|
||||||
|
|
||||||
public:
|
|
||||||
FORCE_INLINE JsonObjectSubscript(JsonObject& object, TStringRef key)
|
|
||||||
: _object(object), _key(key) {}
|
|
||||||
|
|
||||||
FORCE_INLINE this_type& operator=(const this_type& src) {
|
|
||||||
_object.set(_key, src);
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set the specified value
|
|
||||||
//
|
|
||||||
// operator=(TValue);
|
|
||||||
// TValue = bool, char, long, int, short, float, double,
|
|
||||||
// const std::string&, const String&,
|
|
||||||
// const JsonArray&, const JsonObject&
|
|
||||||
template <typename TValue>
|
|
||||||
FORCE_INLINE
|
|
||||||
typename TypeTraits::EnableIf<!TypeTraits::IsArray<TValue>::value,
|
|
||||||
this_type&>::type
|
|
||||||
operator=(const TValue& src) {
|
|
||||||
_object.set(_key, src);
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// operator=(TValue);
|
|
||||||
// TValue = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename TValue>
|
|
||||||
FORCE_INLINE this_type& operator=(const TValue* src) {
|
|
||||||
_object.set(_key, src);
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
FORCE_INLINE bool success() const {
|
|
||||||
return _object.containsKey(_key);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TValue>
|
|
||||||
FORCE_INLINE typename Internals::JsonVariantAs<TValue>::type as() const {
|
|
||||||
return _object.get<TValue>(_key);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TValue>
|
|
||||||
FORCE_INLINE bool is() const {
|
|
||||||
return _object.is<TValue>(_key);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sets the specified value.
|
|
||||||
//
|
|
||||||
// bool set(TValue);
|
|
||||||
// TValue = bool, char, long, int, short, float, double, RawJson, JsonVariant,
|
|
||||||
// const std::string&, const String&,
|
|
||||||
// const JsonArray&, const JsonObject&
|
|
||||||
template <typename TValue>
|
|
||||||
FORCE_INLINE
|
|
||||||
typename TypeTraits::EnableIf<!TypeTraits::IsArray<TValue>::value,
|
|
||||||
bool>::type
|
|
||||||
set(const TValue& value) {
|
|
||||||
return _object.set(_key, value);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// bool set(TValue);
|
|
||||||
// TValue = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename TValue>
|
|
||||||
FORCE_INLINE bool set(const TValue* value) {
|
|
||||||
return _object.set(_key, value);
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// bool set(TValue, uint8_t decimals);
|
|
||||||
// TValue = float, double
|
|
||||||
template <typename TValue>
|
|
||||||
FORCE_INLINE bool set(const TValue& value, uint8_t decimals) {
|
|
||||||
return _object.set(_key, value, decimals);
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
JsonObject& _object;
|
|
||||||
TStringRef _key;
|
|
||||||
};
|
|
||||||
|
|
||||||
#if ARDUINOJSON_ENABLE_STD_STREAM
|
|
||||||
template <typename TStringRef>
|
|
||||||
inline std::ostream& operator<<(std::ostream& os,
|
|
||||||
const JsonObjectSubscript<TStringRef>& source) {
|
|
||||||
return source.printTo(os);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
} // namespace ArduinoJson
|
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#pragma warning(pop)
|
|
||||||
#endif
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "JsonVariant.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
|
|
||||||
// A key value pair for JsonObject.
|
|
||||||
struct JsonPair {
|
|
||||||
const char* key;
|
|
||||||
JsonVariant value;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,357 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <stddef.h>
|
|
||||||
#include <stdint.h> // for uint8_t
|
|
||||||
|
|
||||||
#include "Data/JsonVariantContent.hpp"
|
|
||||||
#include "Data/JsonVariantDefault.hpp"
|
|
||||||
#include "Data/JsonVariantType.hpp"
|
|
||||||
#include "JsonVariantBase.hpp"
|
|
||||||
#include "RawJson.hpp"
|
|
||||||
#include "Serialization/JsonPrintable.hpp"
|
|
||||||
#include "TypeTraits/EnableIf.hpp"
|
|
||||||
#include "TypeTraits/IsChar.hpp"
|
|
||||||
#include "TypeTraits/IsFloatingPoint.hpp"
|
|
||||||
#include "TypeTraits/IsIntegral.hpp"
|
|
||||||
#include "TypeTraits/IsSame.hpp"
|
|
||||||
#include "TypeTraits/IsSignedIntegral.hpp"
|
|
||||||
#include "TypeTraits/IsUnsignedIntegral.hpp"
|
|
||||||
#include "TypeTraits/RemoveConst.hpp"
|
|
||||||
#include "TypeTraits/RemoveReference.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
|
|
||||||
// Forward declarations.
|
|
||||||
class JsonArray;
|
|
||||||
class JsonObject;
|
|
||||||
|
|
||||||
// A variant that can be a any value serializable to a JSON value.
|
|
||||||
//
|
|
||||||
// It can be set to:
|
|
||||||
// - a boolean
|
|
||||||
// - a char, short, int or a long (signed or unsigned)
|
|
||||||
// - a string (const char*)
|
|
||||||
// - a reference to a JsonArray or JsonObject
|
|
||||||
class JsonVariant : public JsonVariantBase<JsonVariant> {
|
|
||||||
friend void Internals::JsonSerializer::serialize(const JsonVariant &,
|
|
||||||
JsonWriter &);
|
|
||||||
|
|
||||||
public:
|
|
||||||
// Creates an uninitialized JsonVariant
|
|
||||||
JsonVariant() : _type(Internals::JSON_UNDEFINED) {}
|
|
||||||
|
|
||||||
// Create a JsonVariant containing a boolean value.
|
|
||||||
// It will be serialized as "true" or "false" in JSON.
|
|
||||||
JsonVariant(bool value) {
|
|
||||||
using namespace Internals;
|
|
||||||
_type = JSON_BOOLEAN;
|
|
||||||
_content.asInteger = static_cast<JsonInteger>(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create a JsonVariant containing a floating point value.
|
|
||||||
// The second argument specifies the number of decimal digits to write in
|
|
||||||
// the JSON string.
|
|
||||||
// JsonVariant(double value, uint8_t decimals);
|
|
||||||
// JsonVariant(float value, uint8_t decimals);
|
|
||||||
template <typename T>
|
|
||||||
JsonVariant(T value, uint8_t decimals = 2,
|
|
||||||
typename TypeTraits::EnableIf<
|
|
||||||
TypeTraits::IsFloatingPoint<T>::value>::type * = 0) {
|
|
||||||
using namespace Internals;
|
|
||||||
_type = static_cast<JsonVariantType>(JSON_FLOAT_0_DECIMALS + decimals);
|
|
||||||
_content.asFloat = static_cast<JsonFloat>(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create a JsonVariant containing an integer value.
|
|
||||||
// JsonVariant(signed short)
|
|
||||||
// JsonVariant(signed int)
|
|
||||||
// JsonVariant(signed long)
|
|
||||||
template <typename T>
|
|
||||||
JsonVariant(T value,
|
|
||||||
typename TypeTraits::EnableIf<
|
|
||||||
TypeTraits::IsSignedIntegral<T>::value>::type * = 0) {
|
|
||||||
using namespace Internals;
|
|
||||||
if (value >= 0) {
|
|
||||||
_type = JSON_POSITIVE_INTEGER;
|
|
||||||
_content.asInteger = static_cast<JsonUInt>(value);
|
|
||||||
} else {
|
|
||||||
_type = JSON_NEGATIVE_INTEGER;
|
|
||||||
_content.asInteger = static_cast<JsonUInt>(-value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// JsonVariant(unsigned short)
|
|
||||||
// JsonVariant(unsigned int)
|
|
||||||
// JsonVariant(unsigned long)
|
|
||||||
template <typename T>
|
|
||||||
JsonVariant(T value,
|
|
||||||
typename TypeTraits::EnableIf<
|
|
||||||
TypeTraits::IsUnsignedIntegral<T>::value>::type * = 0) {
|
|
||||||
using namespace Internals;
|
|
||||||
_type = JSON_POSITIVE_INTEGER;
|
|
||||||
_content.asInteger = static_cast<JsonUInt>(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create a JsonVariant containing a string.
|
|
||||||
// JsonVariant(const char*);
|
|
||||||
// JsonVariant(const signed char*);
|
|
||||||
// JsonVariant(const unsigned char*);
|
|
||||||
template <typename TChar>
|
|
||||||
JsonVariant(
|
|
||||||
const TChar *value,
|
|
||||||
typename TypeTraits::EnableIf<TypeTraits::IsChar<TChar>::value>::type * =
|
|
||||||
0) {
|
|
||||||
_type = Internals::JSON_STRING;
|
|
||||||
_content.asString = reinterpret_cast<const char *>(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create a JsonVariant containing an unparsed string
|
|
||||||
JsonVariant(RawJson value) {
|
|
||||||
_type = Internals::JSON_UNPARSED;
|
|
||||||
_content.asString = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create a JsonVariant containing a reference to an array.
|
|
||||||
// CAUTION: we are lying about constness, because the array can be modified if
|
|
||||||
// the variant is converted back to a JsonArray&
|
|
||||||
JsonVariant(const JsonArray &array);
|
|
||||||
|
|
||||||
// Create a JsonVariant containing a reference to an object.
|
|
||||||
// CAUTION: we are lying about constness, because the object can be modified
|
|
||||||
// if the variant is converted back to a JsonObject&
|
|
||||||
JsonVariant(const JsonObject &object);
|
|
||||||
|
|
||||||
// Get the variant as the specified type.
|
|
||||||
//
|
|
||||||
// short as<signed short>() const;
|
|
||||||
// int as<signed int>() const;
|
|
||||||
// long as<signed long>() const;
|
|
||||||
template <typename T>
|
|
||||||
const typename TypeTraits::EnableIf<TypeTraits::IsSignedIntegral<T>::value,
|
|
||||||
T>::type
|
|
||||||
as() const {
|
|
||||||
return static_cast<T>(variantAsInteger());
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// short as<unsigned short>() const;
|
|
||||||
// int as<unsigned int>() const;
|
|
||||||
// long as<unsigned long>() const;
|
|
||||||
template <typename T>
|
|
||||||
const typename TypeTraits::EnableIf<TypeTraits::IsUnsignedIntegral<T>::value,
|
|
||||||
T>::type
|
|
||||||
as() const {
|
|
||||||
return static_cast<T>(asUnsignedInteger());
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// double as<double>() const;
|
|
||||||
// float as<float>() const;
|
|
||||||
template <typename T>
|
|
||||||
const typename TypeTraits::EnableIf<TypeTraits::IsFloatingPoint<T>::value,
|
|
||||||
T>::type
|
|
||||||
as() const {
|
|
||||||
return static_cast<T>(variantAsFloat());
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// const char* as<const char*>() const;
|
|
||||||
// const char* as<char*>() const;
|
|
||||||
template <typename T>
|
|
||||||
typename TypeTraits::EnableIf<TypeTraits::IsSame<T, const char *>::value ||
|
|
||||||
TypeTraits::IsSame<T, char *>::value,
|
|
||||||
const char *>::type
|
|
||||||
as() const {
|
|
||||||
return variantAsString();
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// std::string as<std::string>() const;
|
|
||||||
// String as<String>() const;
|
|
||||||
template <typename T>
|
|
||||||
typename TypeTraits::EnableIf<Internals::StringTraits<T>::has_append, T>::type
|
|
||||||
as() const {
|
|
||||||
const char *cstr = variantAsString();
|
|
||||||
if (cstr) return T(cstr);
|
|
||||||
T s;
|
|
||||||
printTo(s);
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// const bool as<bool>() const
|
|
||||||
template <typename T>
|
|
||||||
const typename TypeTraits::EnableIf<TypeTraits::IsSame<T, bool>::value,
|
|
||||||
T>::type
|
|
||||||
as() const {
|
|
||||||
return variantAsInteger() != 0;
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// JsonArray& as<JsonArray> const;
|
|
||||||
// JsonArray& as<JsonArray&> const;
|
|
||||||
template <typename T>
|
|
||||||
typename TypeTraits::EnableIf<
|
|
||||||
TypeTraits::IsSame<typename TypeTraits::RemoveReference<T>::type,
|
|
||||||
JsonArray>::value,
|
|
||||||
JsonArray &>::type
|
|
||||||
as() const {
|
|
||||||
return variantAsArray();
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// const JsonArray& as<const JsonArray&> const;
|
|
||||||
template <typename T>
|
|
||||||
typename TypeTraits::EnableIf<
|
|
||||||
TypeTraits::IsSame<typename TypeTraits::RemoveReference<T>::type,
|
|
||||||
const JsonArray>::value,
|
|
||||||
const JsonArray &>::type
|
|
||||||
as() const {
|
|
||||||
return variantAsArray();
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// JsonObject& as<JsonObject> const;
|
|
||||||
// JsonObject& as<JsonObject&> const;
|
|
||||||
template <typename T>
|
|
||||||
typename TypeTraits::EnableIf<
|
|
||||||
TypeTraits::IsSame<typename TypeTraits::RemoveReference<T>::type,
|
|
||||||
JsonObject>::value,
|
|
||||||
JsonObject &>::type
|
|
||||||
as() const {
|
|
||||||
return variantAsObject();
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// JsonObject& as<const JsonObject> const;
|
|
||||||
// JsonObject& as<const JsonObject&> const;
|
|
||||||
template <typename T>
|
|
||||||
typename TypeTraits::EnableIf<
|
|
||||||
TypeTraits::IsSame<typename TypeTraits::RemoveReference<T>::type,
|
|
||||||
const JsonObject>::value,
|
|
||||||
const JsonObject &>::type
|
|
||||||
as() const {
|
|
||||||
return variantAsObject();
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// JsonVariant as<JsonVariant> const;
|
|
||||||
template <typename T>
|
|
||||||
typename TypeTraits::EnableIf<TypeTraits::IsSame<T, JsonVariant>::value,
|
|
||||||
T>::type
|
|
||||||
as() const {
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Tells weither the variant has the specified type.
|
|
||||||
// Returns true if the variant has type type T, false otherwise.
|
|
||||||
//
|
|
||||||
// short as<short>() const;
|
|
||||||
// int as<int>() const;
|
|
||||||
// long as<long>() const;
|
|
||||||
template <typename T>
|
|
||||||
const typename TypeTraits::EnableIf<TypeTraits::IsIntegral<T>::value &&
|
|
||||||
!TypeTraits::IsSame<T, bool>::value,
|
|
||||||
bool>::type
|
|
||||||
is() const {
|
|
||||||
return isInteger();
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// double is<double>() const;
|
|
||||||
// float is<float>() const;
|
|
||||||
template <typename T>
|
|
||||||
const typename TypeTraits::EnableIf<TypeTraits::IsFloatingPoint<T>::value,
|
|
||||||
bool>::type
|
|
||||||
is() const {
|
|
||||||
return isFloat();
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// const bool is<bool>() const
|
|
||||||
template <typename T>
|
|
||||||
const typename TypeTraits::EnableIf<TypeTraits::IsSame<T, bool>::value,
|
|
||||||
bool>::type
|
|
||||||
is() const {
|
|
||||||
return isBoolean();
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// bool is<const char*>() const;
|
|
||||||
// bool is<char*>() const;
|
|
||||||
template <typename T>
|
|
||||||
typename TypeTraits::EnableIf<TypeTraits::IsSame<T, const char *>::value ||
|
|
||||||
TypeTraits::IsSame<T, char *>::value,
|
|
||||||
bool>::type
|
|
||||||
is() const {
|
|
||||||
return isString();
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// bool is<JsonArray> const;
|
|
||||||
// bool is<JsonArray&> const;
|
|
||||||
// bool is<const JsonArray&> const;
|
|
||||||
template <typename T>
|
|
||||||
typename TypeTraits::EnableIf<
|
|
||||||
TypeTraits::IsSame<
|
|
||||||
typename TypeTraits::RemoveConst<
|
|
||||||
typename TypeTraits::RemoveReference<T>::type>::type,
|
|
||||||
JsonArray>::value,
|
|
||||||
bool>::type
|
|
||||||
is() const {
|
|
||||||
return isArray();
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// bool is<JsonObject> const;
|
|
||||||
// bool is<JsonObject&> const;
|
|
||||||
// bool is<const JsonObject&> const;
|
|
||||||
template <typename T>
|
|
||||||
typename TypeTraits::EnableIf<
|
|
||||||
TypeTraits::IsSame<
|
|
||||||
typename TypeTraits::RemoveConst<
|
|
||||||
typename TypeTraits::RemoveReference<T>::type>::type,
|
|
||||||
JsonObject>::value,
|
|
||||||
bool>::type
|
|
||||||
is() const {
|
|
||||||
return isObject();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Returns true if the variant has a value
|
|
||||||
bool success() const {
|
|
||||||
return _type != Internals::JSON_UNDEFINED;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
// It's not allowed to store a char
|
|
||||||
template <typename T>
|
|
||||||
JsonVariant(T value, typename TypeTraits::EnableIf<
|
|
||||||
TypeTraits::IsSame<T, char>::value>::type * = 0);
|
|
||||||
|
|
||||||
JsonArray &variantAsArray() const;
|
|
||||||
JsonObject &variantAsObject() const;
|
|
||||||
const char *variantAsString() const;
|
|
||||||
Internals::JsonFloat variantAsFloat() const;
|
|
||||||
Internals::JsonInteger variantAsInteger() const;
|
|
||||||
Internals::JsonUInt asUnsignedInteger() const;
|
|
||||||
bool isBoolean() const;
|
|
||||||
bool isFloat() const;
|
|
||||||
bool isInteger() const;
|
|
||||||
bool isArray() const {
|
|
||||||
return _type == Internals::JSON_ARRAY;
|
|
||||||
}
|
|
||||||
bool isObject() const {
|
|
||||||
return _type == Internals::JSON_OBJECT;
|
|
||||||
}
|
|
||||||
bool isString() const {
|
|
||||||
return _type == Internals::JSON_STRING ||
|
|
||||||
(_type == Internals::JSON_UNPARSED && _content.asString &&
|
|
||||||
!strcmp("null", _content.asString));
|
|
||||||
}
|
|
||||||
|
|
||||||
// The current type of the variant
|
|
||||||
Internals::JsonVariantType _type;
|
|
||||||
|
|
||||||
// The various alternatives for the value of the variant.
|
|
||||||
Internals::JsonVariantContent _content;
|
|
||||||
};
|
|
||||||
|
|
||||||
inline JsonVariant float_with_n_digits(float value, uint8_t digits) {
|
|
||||||
return JsonVariant(value, digits);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline JsonVariant double_with_n_digits(double value, uint8_t digits) {
|
|
||||||
return JsonVariant(value, digits);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,139 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "Data/JsonVariantAs.hpp"
|
|
||||||
#include "Polyfills/attributes.hpp"
|
|
||||||
#include "Serialization/JsonPrintable.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
|
|
||||||
// Forward declarations.
|
|
||||||
class JsonArraySubscript;
|
|
||||||
template <typename TKey>
|
|
||||||
class JsonObjectSubscript;
|
|
||||||
|
|
||||||
template <typename TImpl>
|
|
||||||
class JsonVariantBase : public Internals::JsonPrintable<TImpl> {
|
|
||||||
public:
|
|
||||||
#if ARDUINOJSON_ENABLE_DEPRECATED
|
|
||||||
DEPRECATED("use as<JsonArray>() instead")
|
|
||||||
FORCE_INLINE JsonArray &asArray() const {
|
|
||||||
return as<JsonArray>();
|
|
||||||
}
|
|
||||||
|
|
||||||
DEPRECATED("use as<JsonObject>() instead")
|
|
||||||
FORCE_INLINE JsonObject &asObject() const {
|
|
||||||
return as<JsonObject>();
|
|
||||||
}
|
|
||||||
|
|
||||||
DEPRECATED("use as<char*>() instead")
|
|
||||||
FORCE_INLINE const char *asString() const {
|
|
||||||
return as<const char *>();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Gets the variant as an array.
|
|
||||||
// Returns a reference to the JsonArray or JsonArray::invalid() if the
|
|
||||||
// variant
|
|
||||||
// is not an array.
|
|
||||||
FORCE_INLINE operator JsonArray &() const {
|
|
||||||
return as<JsonArray &>();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Gets the variant as an object.
|
|
||||||
// Returns a reference to the JsonObject or JsonObject::invalid() if the
|
|
||||||
// variant is not an object.
|
|
||||||
FORCE_INLINE operator JsonObject &() const {
|
|
||||||
return as<JsonObject &>();
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
FORCE_INLINE operator T() const {
|
|
||||||
return as<T>();
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
FORCE_INLINE const typename Internals::JsonVariantAs<T>::type as() const {
|
|
||||||
return impl()->template as<T>();
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
FORCE_INLINE bool is() const {
|
|
||||||
return impl()->template is<T>();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Mimics an array or an object.
|
|
||||||
// Returns the size of the array or object if the variant has that type.
|
|
||||||
// Returns 0 if the variant is neither an array nor an object
|
|
||||||
size_t size() const {
|
|
||||||
return as<JsonArray>().size() + as<JsonObject>().size();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Mimics an array.
|
|
||||||
// Returns the element at specified index if the variant is an array.
|
|
||||||
// Returns JsonVariant::invalid() if the variant is not an array.
|
|
||||||
FORCE_INLINE const JsonArraySubscript operator[](int index) const;
|
|
||||||
FORCE_INLINE JsonArraySubscript operator[](int index);
|
|
||||||
|
|
||||||
// Mimics an object.
|
|
||||||
// Returns the value associated with the specified key if the variant is
|
|
||||||
// an object.
|
|
||||||
// Return JsonVariant::invalid() if the variant is not an object.
|
|
||||||
//
|
|
||||||
// const JsonObjectSubscript operator[](TKey) const;
|
|
||||||
// TKey = const std::string&, const String&
|
|
||||||
template <typename TString>
|
|
||||||
FORCE_INLINE typename TypeTraits::EnableIf<
|
|
||||||
Internals::StringTraits<TString>::has_equals,
|
|
||||||
const JsonObjectSubscript<const TString &> >::type
|
|
||||||
operator[](const TString &key) const {
|
|
||||||
return as<JsonObject>()[key];
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// const JsonObjectSubscript operator[](TKey) const;
|
|
||||||
// TKey = const std::string&, const String&
|
|
||||||
template <typename TString>
|
|
||||||
FORCE_INLINE typename TypeTraits::EnableIf<
|
|
||||||
Internals::StringTraits<TString>::has_equals,
|
|
||||||
JsonObjectSubscript<const TString &> >::type
|
|
||||||
operator[](const TString &key) {
|
|
||||||
return as<JsonObject>()[key];
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// JsonObjectSubscript operator[](TKey);
|
|
||||||
// TKey = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename TString>
|
|
||||||
FORCE_INLINE typename TypeTraits::EnableIf<
|
|
||||||
Internals::StringTraits<const TString *>::has_equals,
|
|
||||||
JsonObjectSubscript<const TString *> >::type
|
|
||||||
operator[](const TString *key) {
|
|
||||||
return as<JsonObject>()[key];
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// JsonObjectSubscript operator[](TKey);
|
|
||||||
// TKey = const char*, const char[N], const FlashStringHelper*
|
|
||||||
template <typename TString>
|
|
||||||
FORCE_INLINE typename TypeTraits::EnableIf<
|
|
||||||
Internals::StringTraits<TString *>::has_equals,
|
|
||||||
const JsonObjectSubscript<const TString *> >::type
|
|
||||||
operator[](const TString *key) const {
|
|
||||||
return as<JsonObject>()[key];
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
const TImpl *impl() const {
|
|
||||||
return static_cast<const TImpl *>(this);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
namespace TypeTraits {
|
|
||||||
template <typename T>
|
|
||||||
struct IsVariant : IsBaseOf<JsonVariantBase<T>, T> {};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,88 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "Data/JsonVariantComparer.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
template <typename TVariant, typename TComparand>
|
|
||||||
inline bool operator==(const JsonVariantBase<TVariant> &variant,
|
|
||||||
TComparand comparand) {
|
|
||||||
return Internals::JsonVariantComparer<TComparand>::equals(variant, comparand);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TVariant, typename TComparand>
|
|
||||||
inline typename TypeTraits::EnableIf<!TypeTraits::IsVariant<TComparand>::value,
|
|
||||||
bool>::type
|
|
||||||
operator==(TComparand comparand, const JsonVariantBase<TVariant> &variant) {
|
|
||||||
return Internals::JsonVariantComparer<TComparand>::equals(variant, comparand);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TVariant, typename TComparand>
|
|
||||||
inline bool operator!=(const JsonVariantBase<TVariant> &variant,
|
|
||||||
TComparand comparand) {
|
|
||||||
return !Internals::JsonVariantComparer<TComparand>::equals(variant,
|
|
||||||
comparand);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TVariant, typename TComparand>
|
|
||||||
inline typename TypeTraits::EnableIf<!TypeTraits::IsVariant<TComparand>::value,
|
|
||||||
bool>::type
|
|
||||||
operator!=(TComparand comparand, const JsonVariantBase<TVariant> &variant) {
|
|
||||||
return !Internals::JsonVariantComparer<TComparand>::equals(variant,
|
|
||||||
comparand);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TVariant, typename TComparand>
|
|
||||||
inline bool operator<=(const JsonVariantBase<TVariant> &left,
|
|
||||||
TComparand right) {
|
|
||||||
return left.template as<TComparand>() <= right;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TVariant, typename TComparand>
|
|
||||||
inline bool operator<=(TComparand comparand,
|
|
||||||
const JsonVariantBase<TVariant> &variant) {
|
|
||||||
return comparand <= variant.template as<TComparand>();
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TVariant, typename TComparand>
|
|
||||||
inline bool operator>=(const JsonVariantBase<TVariant> &variant,
|
|
||||||
TComparand comparand) {
|
|
||||||
return variant.template as<TComparand>() >= comparand;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TVariant, typename TComparand>
|
|
||||||
inline bool operator>=(TComparand comparand,
|
|
||||||
const JsonVariantBase<TVariant> &variant) {
|
|
||||||
return comparand >= variant.template as<TComparand>();
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TVariant, typename TComparand>
|
|
||||||
inline bool operator<(const JsonVariantBase<TVariant> &varian,
|
|
||||||
TComparand comparand) {
|
|
||||||
return varian.template as<TComparand>() < comparand;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TVariant, typename TComparand>
|
|
||||||
inline bool operator<(TComparand comparand,
|
|
||||||
const JsonVariantBase<TVariant> &variant) {
|
|
||||||
return comparand < variant.template as<TComparand>();
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TVariant, typename TComparand>
|
|
||||||
inline bool operator>(const JsonVariantBase<TVariant> &variant,
|
|
||||||
TComparand comparand) {
|
|
||||||
return variant.template as<TComparand>() > comparand;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TVariant, typename TComparand>
|
|
||||||
inline bool operator>(TComparand comparand,
|
|
||||||
const JsonVariantBase<TVariant> &variant) {
|
|
||||||
return comparand > variant.template as<TComparand>();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,159 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "Configuration.hpp"
|
|
||||||
#include "Data/Parse.hpp"
|
|
||||||
#include "JsonArray.hpp"
|
|
||||||
#include "JsonObject.hpp"
|
|
||||||
#include "JsonVariant.hpp"
|
|
||||||
|
|
||||||
#include <errno.h> // for errno
|
|
||||||
#include <stdlib.h> // for strtol, strtod
|
|
||||||
#include <string.h> // for strcmp
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
|
|
||||||
inline JsonVariant::JsonVariant(const JsonArray &array) {
|
|
||||||
if (array.success()) {
|
|
||||||
_type = Internals::JSON_ARRAY;
|
|
||||||
_content.asArray = const_cast<JsonArray *>(&array);
|
|
||||||
} else {
|
|
||||||
_type = Internals::JSON_UNDEFINED;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline JsonVariant::JsonVariant(const JsonObject &object) {
|
|
||||||
if (object.success()) {
|
|
||||||
_type = Internals::JSON_OBJECT;
|
|
||||||
_content.asObject = const_cast<JsonObject *>(&object);
|
|
||||||
} else {
|
|
||||||
_type = Internals::JSON_UNDEFINED;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline JsonArray &JsonVariant::variantAsArray() const {
|
|
||||||
if (_type == Internals::JSON_ARRAY) return *_content.asArray;
|
|
||||||
return JsonArray::invalid();
|
|
||||||
}
|
|
||||||
|
|
||||||
inline JsonObject &JsonVariant::variantAsObject() const {
|
|
||||||
if (_type == Internals::JSON_OBJECT) return *_content.asObject;
|
|
||||||
return JsonObject::invalid();
|
|
||||||
}
|
|
||||||
|
|
||||||
inline Internals::JsonInteger JsonVariant::variantAsInteger() const {
|
|
||||||
using namespace Internals;
|
|
||||||
switch (_type) {
|
|
||||||
case JSON_UNDEFINED:
|
|
||||||
return 0;
|
|
||||||
case JSON_POSITIVE_INTEGER:
|
|
||||||
case JSON_BOOLEAN:
|
|
||||||
return _content.asInteger;
|
|
||||||
case JSON_NEGATIVE_INTEGER:
|
|
||||||
return -static_cast<Internals::JsonInteger>(_content.asInteger);
|
|
||||||
case JSON_STRING:
|
|
||||||
case JSON_UNPARSED:
|
|
||||||
if (!_content.asString) return 0;
|
|
||||||
if (!strcmp("true", _content.asString)) return 1;
|
|
||||||
return parse<Internals::JsonInteger>(_content.asString);
|
|
||||||
default:
|
|
||||||
return static_cast<Internals::JsonInteger>(_content.asFloat);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline Internals::JsonUInt JsonVariant::asUnsignedInteger() const {
|
|
||||||
using namespace Internals;
|
|
||||||
switch (_type) {
|
|
||||||
case JSON_UNDEFINED:
|
|
||||||
return 0;
|
|
||||||
case JSON_POSITIVE_INTEGER:
|
|
||||||
case JSON_BOOLEAN:
|
|
||||||
case JSON_NEGATIVE_INTEGER:
|
|
||||||
return _content.asInteger;
|
|
||||||
case JSON_STRING:
|
|
||||||
case JSON_UNPARSED:
|
|
||||||
if (!_content.asString) return 0;
|
|
||||||
if (!strcmp("true", _content.asString)) return 1;
|
|
||||||
return parse<Internals::JsonUInt>(_content.asString);
|
|
||||||
default:
|
|
||||||
return static_cast<Internals::JsonUInt>(_content.asFloat);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline const char *JsonVariant::variantAsString() const {
|
|
||||||
using namespace Internals;
|
|
||||||
if (_type == JSON_UNPARSED && _content.asString &&
|
|
||||||
!strcmp("null", _content.asString))
|
|
||||||
return NULL;
|
|
||||||
if (_type == JSON_STRING || _type == JSON_UNPARSED) return _content.asString;
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline Internals::JsonFloat JsonVariant::variantAsFloat() const {
|
|
||||||
using namespace Internals;
|
|
||||||
switch (_type) {
|
|
||||||
case JSON_UNDEFINED:
|
|
||||||
return 0;
|
|
||||||
case JSON_POSITIVE_INTEGER:
|
|
||||||
case JSON_BOOLEAN:
|
|
||||||
return static_cast<JsonFloat>(_content.asInteger);
|
|
||||||
case JSON_NEGATIVE_INTEGER:
|
|
||||||
return -static_cast<JsonFloat>(_content.asInteger);
|
|
||||||
case JSON_STRING:
|
|
||||||
case JSON_UNPARSED:
|
|
||||||
return _content.asString ? parse<JsonFloat>(_content.asString) : 0;
|
|
||||||
default:
|
|
||||||
return _content.asFloat;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool JsonVariant::isBoolean() const {
|
|
||||||
using namespace Internals;
|
|
||||||
if (_type == JSON_BOOLEAN) return true;
|
|
||||||
|
|
||||||
if (_type != JSON_UNPARSED || _content.asString == NULL) return false;
|
|
||||||
|
|
||||||
return !strcmp(_content.asString, "true") ||
|
|
||||||
!strcmp(_content.asString, "false");
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool JsonVariant::isInteger() const {
|
|
||||||
using namespace Internals;
|
|
||||||
if (_type == JSON_POSITIVE_INTEGER || _type == JSON_NEGATIVE_INTEGER)
|
|
||||||
return true;
|
|
||||||
|
|
||||||
if (_type != JSON_UNPARSED || _content.asString == NULL) return false;
|
|
||||||
|
|
||||||
char *end;
|
|
||||||
errno = 0;
|
|
||||||
strtol(_content.asString, &end, 10);
|
|
||||||
|
|
||||||
return *end == '\0' && errno == 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool JsonVariant::isFloat() const {
|
|
||||||
using namespace Internals;
|
|
||||||
if (_type >= JSON_FLOAT_0_DECIMALS) return true;
|
|
||||||
|
|
||||||
if (_type != JSON_UNPARSED || _content.asString == NULL) return false;
|
|
||||||
|
|
||||||
char *end;
|
|
||||||
errno = 0;
|
|
||||||
strtod(_content.asString, &end);
|
|
||||||
|
|
||||||
return *end == '\0' && errno == 0 && !is<long>();
|
|
||||||
}
|
|
||||||
|
|
||||||
#if ARDUINOJSON_ENABLE_STD_STREAM
|
|
||||||
inline std::ostream &operator<<(std::ostream &os, const JsonVariant &source) {
|
|
||||||
return source.printTo(os);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
} // namespace ArduinoJson
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#define FORCE_INLINE __forceinline
|
|
||||||
#define NO_INLINE __declspec(noinline)
|
|
||||||
#define DEPRECATED(msg) __declspec(deprecated(msg))
|
|
||||||
#else
|
|
||||||
#define FORCE_INLINE __attribute__((always_inline))
|
|
||||||
#define NO_INLINE __attribute__((noinline))
|
|
||||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
|
|
||||||
#define DEPRECATED(msg) __attribute__((deprecated(msg)))
|
|
||||||
#else
|
|
||||||
#define DEPRECATED(msg) __attribute__((deprecated))
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
@ -1,111 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
// If Visual Studo <= 2012
|
|
||||||
#if defined(_MSC_VER) && _MSC_VER <= 1700
|
|
||||||
|
|
||||||
#include <float.h>
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Polyfills {
|
|
||||||
template <typename T>
|
|
||||||
bool isNaN(T x) {
|
|
||||||
return _isnan(x) != 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
bool isInfinity(T x) {
|
|
||||||
return !_finite(x);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
#include <math.h>
|
|
||||||
|
|
||||||
// GCC warning: "conversion to 'float' from 'double' may alter its value"
|
|
||||||
#ifdef __GNUC__
|
|
||||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
|
|
||||||
#pragma GCC diagnostic push
|
|
||||||
#endif
|
|
||||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)
|
|
||||||
#pragma GCC diagnostic ignored "-Wfloat-conversion"
|
|
||||||
#else
|
|
||||||
#pragma GCC diagnostic ignored "-Wconversion"
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Workaround for libs that #undef isnan or isinf
|
|
||||||
// https://github.com/bblanchon/ArduinoJson/issues/284
|
|
||||||
#if !defined(isnan) || !defined(isinf)
|
|
||||||
namespace std {}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Polyfills {
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
bool isNaN(T x) {
|
|
||||||
// Workaround for libs that #undef isnan
|
|
||||||
// https://github.com/bblanchon/ArduinoJson/issues/284
|
|
||||||
#ifndef isnan
|
|
||||||
using namespace std;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return isnan(x);
|
|
||||||
}
|
|
||||||
|
|
||||||
#if defined(_GLIBCXX_HAVE_ISNANL) && _GLIBCXX_HAVE_ISNANL
|
|
||||||
template <>
|
|
||||||
inline bool isNaN<double>(double x) {
|
|
||||||
return isnanl(x);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(_GLIBCXX_HAVE_ISNANF) && _GLIBCXX_HAVE_ISNANF
|
|
||||||
template <>
|
|
||||||
inline bool isNaN<float>(float x) {
|
|
||||||
return isnanf(x);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
bool isInfinity(T x) {
|
|
||||||
// Workaround for libs that #undef isinf
|
|
||||||
// https://github.com/bblanchon/ArduinoJson/issues/284
|
|
||||||
#ifndef isinf
|
|
||||||
using namespace std;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return isinf(x);
|
|
||||||
}
|
|
||||||
|
|
||||||
#if defined(_GLIBCXX_HAVE_ISINFL) && _GLIBCXX_HAVE_ISINFL
|
|
||||||
template <>
|
|
||||||
inline bool isInfinity<double>(double x) {
|
|
||||||
return isinfl(x);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(_GLIBCXX_HAVE_ISINFF) && _GLIBCXX_HAVE_ISINFF
|
|
||||||
template <>
|
|
||||||
inline bool isInfinity<float>(float x) {
|
|
||||||
return isinff(x);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(__GNUC__)
|
|
||||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
|
|
||||||
#pragma GCC diagnostic pop
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Polyfills {
|
|
||||||
|
|
||||||
#ifdef ARDUINO
|
|
||||||
|
|
||||||
// on embedded platform, favor code size over speed
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
short normalize(T& value) {
|
|
||||||
short powersOf10 = 0;
|
|
||||||
while (value && value < 1) {
|
|
||||||
powersOf10--;
|
|
||||||
value *= 10;
|
|
||||||
}
|
|
||||||
while (value > 10) {
|
|
||||||
powersOf10++;
|
|
||||||
value /= 10;
|
|
||||||
}
|
|
||||||
return powersOf10;
|
|
||||||
}
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
// on non-embedded platform, favor speed over code size
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
short normalize(T& value) {
|
|
||||||
if (value == 0.0) return 0;
|
|
||||||
|
|
||||||
short powersOf10 = static_cast<short>(floor(log10(value)));
|
|
||||||
value /= pow(T(10), powersOf10);
|
|
||||||
|
|
||||||
return powersOf10;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#ifndef ARDUINO
|
|
||||||
|
|
||||||
#include <stddef.h>
|
|
||||||
#include <stdint.h>
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
// This class reproduces Arduino's Print class
|
|
||||||
class Print {
|
|
||||||
public:
|
|
||||||
virtual ~Print() {}
|
|
||||||
|
|
||||||
virtual size_t write(uint8_t) = 0;
|
|
||||||
|
|
||||||
size_t print(const char* s) {
|
|
||||||
size_t n = 0;
|
|
||||||
while (*s) {
|
|
||||||
n += write(static_cast<uint8_t>(*s++));
|
|
||||||
}
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t println() {
|
|
||||||
size_t n = 0;
|
|
||||||
n += write('\r');
|
|
||||||
n += write('\n');
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
#include <Print.h>
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
|
|
||||||
// A special type of data that can be used to insert pregenerated JSON portions.
|
|
||||||
class RawJson {
|
|
||||||
public:
|
|
||||||
explicit RawJson(const char* str) : _str(str) {}
|
|
||||||
operator const char*() const {
|
|
||||||
return _str;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
const char* _str;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../Print.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
// A dummy Print implementation used in JsonPrintable::measureLength()
|
|
||||||
class DummyPrint : public Print {
|
|
||||||
public:
|
|
||||||
virtual size_t write(uint8_t) {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../Print.hpp"
|
|
||||||
#include "../StringTraits/StringTraits.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
// A Print implementation that allows to write in a String
|
|
||||||
template <typename TString>
|
|
||||||
class DynamicStringBuilder : public Print {
|
|
||||||
public:
|
|
||||||
DynamicStringBuilder(TString &str) : _str(str) {}
|
|
||||||
|
|
||||||
virtual size_t write(uint8_t c) {
|
|
||||||
StringTraits<TString>::append(_str, static_cast<char>(c));
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
DynamicStringBuilder &operator=(const DynamicStringBuilder &);
|
|
||||||
|
|
||||||
TString &_str;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,65 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../Print.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
// Decorator on top of Print to allow indented output.
|
|
||||||
// This class is used by JsonPrintable::prettyPrintTo() but can also be used
|
|
||||||
// for your own purpose, like logging.
|
|
||||||
class IndentedPrint : public Print {
|
|
||||||
public:
|
|
||||||
explicit IndentedPrint(Print &p) : sink(&p) {
|
|
||||||
level = 0;
|
|
||||||
tabSize = 2;
|
|
||||||
isNewLine = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual size_t write(uint8_t c) {
|
|
||||||
size_t n = 0;
|
|
||||||
if (isNewLine) n += writeTabs();
|
|
||||||
n += sink->write(c);
|
|
||||||
isNewLine = c == '\n';
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Adds one level of indentation
|
|
||||||
void indent() {
|
|
||||||
if (level < MAX_LEVEL) level++;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Removes one level of indentation
|
|
||||||
void unindent() {
|
|
||||||
if (level > 0) level--;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set the number of space printed for each level of indentation
|
|
||||||
void setTabSize(uint8_t n) {
|
|
||||||
if (n < MAX_TAB_SIZE) tabSize = n & MAX_TAB_SIZE;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
Print *sink;
|
|
||||||
uint8_t level : 4;
|
|
||||||
uint8_t tabSize : 3;
|
|
||||||
bool isNewLine : 1;
|
|
||||||
|
|
||||||
size_t writeTabs() {
|
|
||||||
size_t n = 0;
|
|
||||||
for (int i = 0; i < level * tabSize; i++) n += sink->write(' ');
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
static const int MAX_LEVEL = 15; // because it's only 4 bits
|
|
||||||
static const int MAX_TAB_SIZE = 7; // because it's only 3 bits
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,115 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../Configuration.hpp"
|
|
||||||
#include "../TypeTraits/EnableIf.hpp"
|
|
||||||
#include "DummyPrint.hpp"
|
|
||||||
#include "DynamicStringBuilder.hpp"
|
|
||||||
#include "IndentedPrint.hpp"
|
|
||||||
#include "JsonSerializer.hpp"
|
|
||||||
#include "JsonWriter.hpp"
|
|
||||||
#include "Prettyfier.hpp"
|
|
||||||
#include "StaticStringBuilder.hpp"
|
|
||||||
|
|
||||||
#if ARDUINOJSON_ENABLE_STD_STREAM
|
|
||||||
#include "StreamPrintAdapter.hpp"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
// Implements all the overloads of printTo() and prettyPrintTo()
|
|
||||||
// Caution: this class use a template parameter to avoid virtual methods.
|
|
||||||
// This is a bit curious but allows to reduce the size of JsonVariant, JsonArray
|
|
||||||
// and JsonObject.
|
|
||||||
template <typename T>
|
|
||||||
class JsonPrintable {
|
|
||||||
public:
|
|
||||||
size_t printTo(Print &print) const {
|
|
||||||
JsonWriter writer(print);
|
|
||||||
JsonSerializer::serialize(downcast(), writer);
|
|
||||||
return writer.bytesWritten();
|
|
||||||
}
|
|
||||||
|
|
||||||
#if ARDUINOJSON_ENABLE_STD_STREAM
|
|
||||||
std::ostream &printTo(std::ostream &os) const {
|
|
||||||
StreamPrintAdapter adapter(os);
|
|
||||||
printTo(adapter);
|
|
||||||
return os;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
size_t printTo(char *buffer, size_t bufferSize) const {
|
|
||||||
StaticStringBuilder sb(buffer, bufferSize);
|
|
||||||
return printTo(sb);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <size_t N>
|
|
||||||
size_t printTo(char (&buffer)[N]) const {
|
|
||||||
return printTo(buffer, N);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TString>
|
|
||||||
typename TypeTraits::EnableIf<StringTraits<TString>::has_append, size_t>::type
|
|
||||||
printTo(TString &str) const {
|
|
||||||
DynamicStringBuilder<TString> sb(str);
|
|
||||||
return printTo(sb);
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t prettyPrintTo(IndentedPrint &print) const {
|
|
||||||
Prettyfier p(print);
|
|
||||||
return printTo(p);
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t prettyPrintTo(char *buffer, size_t bufferSize) const {
|
|
||||||
StaticStringBuilder sb(buffer, bufferSize);
|
|
||||||
return prettyPrintTo(sb);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <size_t N>
|
|
||||||
size_t prettyPrintTo(char (&buffer)[N]) const {
|
|
||||||
return prettyPrintTo(buffer, N);
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t prettyPrintTo(Print &print) const {
|
|
||||||
IndentedPrint indentedPrint = IndentedPrint(print);
|
|
||||||
return prettyPrintTo(indentedPrint);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TString>
|
|
||||||
typename TypeTraits::EnableIf<StringTraits<TString>::has_append, size_t>::type
|
|
||||||
prettyPrintTo(TString &str) const {
|
|
||||||
DynamicStringBuilder<TString> sb(str);
|
|
||||||
return prettyPrintTo(sb);
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t measureLength() const {
|
|
||||||
DummyPrint dp;
|
|
||||||
return printTo(dp);
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t measurePrettyLength() const {
|
|
||||||
DummyPrint dp;
|
|
||||||
return prettyPrintTo(dp);
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
const T &downcast() const {
|
|
||||||
return *static_cast<const T *>(this);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
#if ARDUINOJSON_ENABLE_STD_STREAM
|
|
||||||
template <typename T>
|
|
||||||
inline std::ostream &operator<<(std::ostream &os, const JsonPrintable<T> &v) {
|
|
||||||
return v.printTo(os);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "JsonWriter.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
|
|
||||||
class JsonArray;
|
|
||||||
class JsonArraySubscript;
|
|
||||||
class JsonObject;
|
|
||||||
template <typename TKey>
|
|
||||||
class JsonObjectSubscript;
|
|
||||||
class JsonVariant;
|
|
||||||
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
class JsonSerializer {
|
|
||||||
public:
|
|
||||||
static void serialize(const JsonArray &, JsonWriter &);
|
|
||||||
static void serialize(const JsonArraySubscript &, JsonWriter &);
|
|
||||||
static void serialize(const JsonObject &, JsonWriter &);
|
|
||||||
template <typename TKey>
|
|
||||||
static void serialize(const JsonObjectSubscript<TKey> &, JsonWriter &);
|
|
||||||
static void serialize(const JsonVariant &, JsonWriter &);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,101 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../JsonArray.hpp"
|
|
||||||
#include "../JsonArraySubscript.hpp"
|
|
||||||
#include "../JsonObject.hpp"
|
|
||||||
#include "../JsonObjectSubscript.hpp"
|
|
||||||
#include "../JsonVariant.hpp"
|
|
||||||
#include "JsonSerializer.hpp"
|
|
||||||
|
|
||||||
inline void ArduinoJson::Internals::JsonSerializer::serialize(
|
|
||||||
const JsonArray& array, JsonWriter& writer) {
|
|
||||||
writer.beginArray();
|
|
||||||
|
|
||||||
JsonArray::const_iterator it = array.begin();
|
|
||||||
while (it != array.end()) {
|
|
||||||
serialize(*it, writer);
|
|
||||||
|
|
||||||
++it;
|
|
||||||
if (it == array.end()) break;
|
|
||||||
|
|
||||||
writer.writeComma();
|
|
||||||
}
|
|
||||||
|
|
||||||
writer.endArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void ArduinoJson::Internals::JsonSerializer::serialize(
|
|
||||||
const JsonArraySubscript& arraySubscript, JsonWriter& writer) {
|
|
||||||
serialize(arraySubscript.as<JsonVariant>(), writer);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void ArduinoJson::Internals::JsonSerializer::serialize(
|
|
||||||
const JsonObject& object, JsonWriter& writer) {
|
|
||||||
writer.beginObject();
|
|
||||||
|
|
||||||
JsonObject::const_iterator it = object.begin();
|
|
||||||
while (it != object.end()) {
|
|
||||||
writer.writeString(it->key);
|
|
||||||
writer.writeColon();
|
|
||||||
serialize(it->value, writer);
|
|
||||||
|
|
||||||
++it;
|
|
||||||
if (it == object.end()) break;
|
|
||||||
|
|
||||||
writer.writeComma();
|
|
||||||
}
|
|
||||||
|
|
||||||
writer.endObject();
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename TKey>
|
|
||||||
inline void ArduinoJson::Internals::JsonSerializer::serialize(
|
|
||||||
const JsonObjectSubscript<TKey>& objectSubscript, JsonWriter& writer) {
|
|
||||||
serialize(objectSubscript.template as<JsonVariant>(), writer);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void ArduinoJson::Internals::JsonSerializer::serialize(
|
|
||||||
const JsonVariant& variant, JsonWriter& writer) {
|
|
||||||
switch (variant._type) {
|
|
||||||
case JSON_UNDEFINED:
|
|
||||||
return;
|
|
||||||
|
|
||||||
case JSON_ARRAY:
|
|
||||||
serialize(*variant._content.asArray, writer);
|
|
||||||
return;
|
|
||||||
|
|
||||||
case JSON_OBJECT:
|
|
||||||
serialize(*variant._content.asObject, writer);
|
|
||||||
return;
|
|
||||||
|
|
||||||
case JSON_STRING:
|
|
||||||
writer.writeString(variant._content.asString);
|
|
||||||
return;
|
|
||||||
|
|
||||||
case JSON_UNPARSED:
|
|
||||||
writer.writeRaw(variant._content.asString);
|
|
||||||
return;
|
|
||||||
|
|
||||||
case JSON_NEGATIVE_INTEGER:
|
|
||||||
writer.writeRaw('-');
|
|
||||||
case JSON_POSITIVE_INTEGER:
|
|
||||||
writer.writeInteger(variant._content.asInteger);
|
|
||||||
return;
|
|
||||||
|
|
||||||
case JSON_BOOLEAN:
|
|
||||||
writer.writeBoolean(variant._content.asInteger != 0);
|
|
||||||
return;
|
|
||||||
|
|
||||||
default:
|
|
||||||
uint8_t decimals =
|
|
||||||
static_cast<uint8_t>(variant._type - JSON_FLOAT_0_DECIMALS);
|
|
||||||
writer.writeFloat(variant._content.asFloat, decimals);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,184 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../Data/Encoding.hpp"
|
|
||||||
#include "../Data/JsonFloat.hpp"
|
|
||||||
#include "../Data/JsonInteger.hpp"
|
|
||||||
#include "../Polyfills/attributes.hpp"
|
|
||||||
#include "../Polyfills/math.hpp"
|
|
||||||
#include "../Polyfills/normalize.hpp"
|
|
||||||
#include "../Print.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
// Writes the JSON tokens to a Print implementation
|
|
||||||
// This class is used by:
|
|
||||||
// - JsonArray::writeTo()
|
|
||||||
// - JsonObject::writeTo()
|
|
||||||
// - JsonVariant::writeTo()
|
|
||||||
// Its derived by PrettyJsonWriter that overrides some members to add
|
|
||||||
// indentation.
|
|
||||||
class JsonWriter {
|
|
||||||
public:
|
|
||||||
explicit JsonWriter(Print &sink) : _sink(sink), _length(0) {}
|
|
||||||
|
|
||||||
// Returns the number of bytes sent to the Print implementation.
|
|
||||||
// This is very handy for implementations of printTo() that must return the
|
|
||||||
// number of bytes written.
|
|
||||||
size_t bytesWritten() const {
|
|
||||||
return _length;
|
|
||||||
}
|
|
||||||
|
|
||||||
void beginArray() {
|
|
||||||
writeRaw('[');
|
|
||||||
}
|
|
||||||
void endArray() {
|
|
||||||
writeRaw(']');
|
|
||||||
}
|
|
||||||
|
|
||||||
void beginObject() {
|
|
||||||
writeRaw('{');
|
|
||||||
}
|
|
||||||
void endObject() {
|
|
||||||
writeRaw('}');
|
|
||||||
}
|
|
||||||
|
|
||||||
void writeColon() {
|
|
||||||
writeRaw(':');
|
|
||||||
}
|
|
||||||
void writeComma() {
|
|
||||||
writeRaw(',');
|
|
||||||
}
|
|
||||||
|
|
||||||
void writeBoolean(bool value) {
|
|
||||||
writeRaw(value ? "true" : "false");
|
|
||||||
}
|
|
||||||
|
|
||||||
void writeString(const char *value) {
|
|
||||||
if (!value) {
|
|
||||||
writeRaw("null");
|
|
||||||
} else {
|
|
||||||
writeRaw('\"');
|
|
||||||
while (*value) writeChar(*value++);
|
|
||||||
writeRaw('\"');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void writeChar(char c) {
|
|
||||||
char specialChar = Encoding::escapeChar(c);
|
|
||||||
if (specialChar) {
|
|
||||||
writeRaw('\\');
|
|
||||||
writeRaw(specialChar);
|
|
||||||
} else {
|
|
||||||
writeRaw(c);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void writeFloat(JsonFloat value, uint8_t digits = 2) {
|
|
||||||
if (Polyfills::isNaN(value)) return writeRaw("NaN");
|
|
||||||
|
|
||||||
if (value < 0.0) {
|
|
||||||
writeRaw('-');
|
|
||||||
value = -value;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Polyfills::isInfinity(value)) return writeRaw("Infinity");
|
|
||||||
|
|
||||||
short powersOf10;
|
|
||||||
if (value > 1000 || value < 0.001) {
|
|
||||||
powersOf10 = Polyfills::normalize(value);
|
|
||||||
} else {
|
|
||||||
powersOf10 = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Round up last digit (so that print(1.999, 2) prints as "2.00")
|
|
||||||
value += getRoundingBias(digits);
|
|
||||||
|
|
||||||
// Extract the integer part of the value and print it
|
|
||||||
JsonUInt int_part = static_cast<JsonUInt>(value);
|
|
||||||
JsonFloat remainder = value - static_cast<JsonFloat>(int_part);
|
|
||||||
writeInteger(int_part);
|
|
||||||
|
|
||||||
// Print the decimal point, but only if there are digits beyond
|
|
||||||
if (digits > 0) {
|
|
||||||
writeRaw('.');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Extract digits from the remainder one at a time
|
|
||||||
while (digits-- > 0) {
|
|
||||||
// Extract digit
|
|
||||||
remainder *= 10.0;
|
|
||||||
char currentDigit = char(remainder);
|
|
||||||
remainder -= static_cast<JsonFloat>(currentDigit);
|
|
||||||
|
|
||||||
// Print
|
|
||||||
writeRaw(char('0' + currentDigit));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (powersOf10 < 0) {
|
|
||||||
writeRaw("e-");
|
|
||||||
writeInteger(-powersOf10);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (powersOf10 > 0) {
|
|
||||||
writeRaw('e');
|
|
||||||
writeInteger(powersOf10);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void writeInteger(JsonUInt value) {
|
|
||||||
char buffer[22];
|
|
||||||
char *ptr = buffer + sizeof(buffer) - 1;
|
|
||||||
|
|
||||||
*ptr = 0;
|
|
||||||
do {
|
|
||||||
*--ptr = static_cast<char>(value % 10 + '0');
|
|
||||||
value /= 10;
|
|
||||||
} while (value);
|
|
||||||
|
|
||||||
writeRaw(ptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
void writeRaw(const char *s) {
|
|
||||||
_length += _sink.print(s);
|
|
||||||
}
|
|
||||||
void writeRaw(char c) {
|
|
||||||
_length += _sink.write(c);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
Print &_sink;
|
|
||||||
size_t _length;
|
|
||||||
|
|
||||||
private:
|
|
||||||
JsonWriter &operator=(const JsonWriter &); // cannot be assigned
|
|
||||||
|
|
||||||
static JsonFloat getLastDigit(uint8_t digits) {
|
|
||||||
// Designed as a compromise between code size and speed
|
|
||||||
switch (digits) {
|
|
||||||
case 0:
|
|
||||||
return 1e-0;
|
|
||||||
case 1:
|
|
||||||
return 1e-1;
|
|
||||||
case 2:
|
|
||||||
return 1e-2;
|
|
||||||
case 3:
|
|
||||||
return 1e-3;
|
|
||||||
default:
|
|
||||||
return getLastDigit(uint8_t(digits - 4)) * 1e-4;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
FORCE_INLINE static JsonFloat getRoundingBias(uint8_t digits) {
|
|
||||||
return 0.5 * getLastDigit(digits);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,130 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "IndentedPrint.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
// Converts a compact JSON string into an indented one.
|
|
||||||
class Prettyfier : public Print {
|
|
||||||
public:
|
|
||||||
explicit Prettyfier(IndentedPrint& p) : _sink(p) {
|
|
||||||
_previousChar = 0;
|
|
||||||
_inString = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual size_t write(uint8_t c) {
|
|
||||||
size_t n = _inString ? handleStringChar(c) : handleMarkupChar(c);
|
|
||||||
_previousChar = c;
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
Prettyfier& operator=(const Prettyfier&); // cannot be assigned
|
|
||||||
|
|
||||||
bool inEmptyBlock() {
|
|
||||||
return _previousChar == '{' || _previousChar == '[';
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t handleStringChar(uint8_t c) {
|
|
||||||
bool isQuote = c == '"' && _previousChar != '\\';
|
|
||||||
|
|
||||||
if (isQuote) _inString = false;
|
|
||||||
|
|
||||||
return _sink.write(c);
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t handleMarkupChar(uint8_t c) {
|
|
||||||
switch (c) {
|
|
||||||
case '{':
|
|
||||||
case '[':
|
|
||||||
return writeBlockOpen(c);
|
|
||||||
|
|
||||||
case '}':
|
|
||||||
case ']':
|
|
||||||
return writeBlockClose(c);
|
|
||||||
|
|
||||||
case ':':
|
|
||||||
return writeColon();
|
|
||||||
|
|
||||||
case ',':
|
|
||||||
return writeComma();
|
|
||||||
|
|
||||||
case '"':
|
|
||||||
return writeQuoteOpen();
|
|
||||||
|
|
||||||
default:
|
|
||||||
return writeNormalChar(c);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t writeBlockClose(uint8_t c) {
|
|
||||||
size_t n = 0;
|
|
||||||
n += unindentIfNeeded();
|
|
||||||
n += _sink.write(c);
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t writeBlockOpen(uint8_t c) {
|
|
||||||
size_t n = 0;
|
|
||||||
n += indentIfNeeded();
|
|
||||||
n += _sink.write(c);
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t writeColon() {
|
|
||||||
size_t n = 0;
|
|
||||||
n += _sink.write(':');
|
|
||||||
n += _sink.write(' ');
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t writeComma() {
|
|
||||||
size_t n = 0;
|
|
||||||
n += _sink.write(',');
|
|
||||||
n += _sink.println();
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t writeQuoteOpen() {
|
|
||||||
_inString = true;
|
|
||||||
size_t n = 0;
|
|
||||||
n += indentIfNeeded();
|
|
||||||
n += _sink.write('"');
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t writeNormalChar(uint8_t c) {
|
|
||||||
size_t n = 0;
|
|
||||||
n += indentIfNeeded();
|
|
||||||
n += _sink.write(c);
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t indentIfNeeded() {
|
|
||||||
if (!inEmptyBlock()) return 0;
|
|
||||||
|
|
||||||
_sink.indent();
|
|
||||||
return _sink.println();
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t unindentIfNeeded() {
|
|
||||||
if (inEmptyBlock()) return 0;
|
|
||||||
|
|
||||||
_sink.unindent();
|
|
||||||
return _sink.println();
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t _previousChar;
|
|
||||||
IndentedPrint& _sink;
|
|
||||||
bool _inString;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../Print.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
// A Print implementation that allows to write in a char[]
|
|
||||||
class StaticStringBuilder : public Print {
|
|
||||||
public:
|
|
||||||
StaticStringBuilder(char *buf, size_t size)
|
|
||||||
: buffer(buf), capacity(size - 1), length(0) {
|
|
||||||
buffer[0] = '\0';
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual size_t write(uint8_t c) {
|
|
||||||
if (length >= capacity) return 0;
|
|
||||||
|
|
||||||
buffer[length++] = c;
|
|
||||||
buffer[length] = '\0';
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
char *buffer;
|
|
||||||
size_t capacity;
|
|
||||||
size_t length;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../Configuration.hpp"
|
|
||||||
|
|
||||||
#if ARDUINOJSON_ENABLE_STD_STREAM
|
|
||||||
|
|
||||||
#include "../Print.hpp"
|
|
||||||
|
|
||||||
#include <ostream>
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
class StreamPrintAdapter : public Print {
|
|
||||||
public:
|
|
||||||
explicit StreamPrintAdapter(std::ostream& os) : _os(os) {}
|
|
||||||
|
|
||||||
virtual size_t write(uint8_t c) {
|
|
||||||
_os << static_cast<char>(c);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
// cannot be assigned
|
|
||||||
StreamPrintAdapter& operator=(const StreamPrintAdapter&);
|
|
||||||
|
|
||||||
std::ostream& _os;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // ARDUINOJSON_ENABLE_STD_STREAM
|
|
||||||
@ -1,113 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "JsonBufferBase.hpp"
|
|
||||||
|
|
||||||
#if defined(__clang__)
|
|
||||||
#pragma clang diagnostic push
|
|
||||||
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
|
|
||||||
#elif defined(__GNUC__)
|
|
||||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
|
|
||||||
#pragma GCC diagnostic push
|
|
||||||
#endif
|
|
||||||
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
|
|
||||||
class StaticJsonBufferBase : public JsonBufferBase<StaticJsonBufferBase> {
|
|
||||||
public:
|
|
||||||
class String {
|
|
||||||
public:
|
|
||||||
String(StaticJsonBufferBase* parent) : _parent(parent) {
|
|
||||||
_start = parent->_buffer + parent->_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
void append(char c) {
|
|
||||||
if (_parent->canAlloc(1)) {
|
|
||||||
char* last = static_cast<char*>(_parent->doAlloc(1));
|
|
||||||
*last = c;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const char* c_str() const {
|
|
||||||
if (_parent->canAlloc(1)) {
|
|
||||||
char* last = static_cast<char*>(_parent->doAlloc(1));
|
|
||||||
*last = '\0';
|
|
||||||
return _start;
|
|
||||||
} else {
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
StaticJsonBufferBase* _parent;
|
|
||||||
char* _start;
|
|
||||||
};
|
|
||||||
|
|
||||||
StaticJsonBufferBase(char* buffer, size_t capa)
|
|
||||||
: _buffer(buffer), _capacity(capa), _size(0) {}
|
|
||||||
|
|
||||||
size_t capacity() const {
|
|
||||||
return _capacity;
|
|
||||||
}
|
|
||||||
size_t size() const {
|
|
||||||
return _size;
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void* alloc(size_t bytes) {
|
|
||||||
alignNextAlloc();
|
|
||||||
if (!canAlloc(bytes)) return NULL;
|
|
||||||
return doAlloc(bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
String startString() {
|
|
||||||
return String(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
void alignNextAlloc() {
|
|
||||||
_size = round_size_up(_size);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool canAlloc(size_t bytes) const {
|
|
||||||
return _size + bytes <= _capacity;
|
|
||||||
}
|
|
||||||
|
|
||||||
void* doAlloc(size_t bytes) {
|
|
||||||
void* p = &_buffer[_size];
|
|
||||||
_size += bytes;
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
|
|
||||||
char* _buffer;
|
|
||||||
size_t _capacity;
|
|
||||||
size_t _size;
|
|
||||||
};
|
|
||||||
|
|
||||||
// Implements a JsonBuffer with fixed memory allocation.
|
|
||||||
// The template paramenter CAPACITY specifies the capacity of the buffer in
|
|
||||||
// bytes.
|
|
||||||
template <size_t CAPACITY>
|
|
||||||
class StaticJsonBuffer : public StaticJsonBufferBase {
|
|
||||||
public:
|
|
||||||
explicit StaticJsonBuffer() : StaticJsonBufferBase(_buffer, CAPACITY) {}
|
|
||||||
|
|
||||||
private:
|
|
||||||
char _buffer[CAPACITY];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
#if defined(__clang__)
|
|
||||||
#pragma clang diagnostic pop
|
|
||||||
#elif defined(__GNUC__)
|
|
||||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
|
|
||||||
#pragma GCC diagnostic pop
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
@ -1,61 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <Stream.h>
|
|
||||||
|
|
||||||
#include "../TypeTraits/EnableIf.hpp"
|
|
||||||
#include "../TypeTraits/IsBaseOf.hpp"
|
|
||||||
#include "../TypeTraits/RemoveReference.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
struct ArduinoStreamTraits {
|
|
||||||
class Reader {
|
|
||||||
Stream& _stream;
|
|
||||||
char _current, _next;
|
|
||||||
|
|
||||||
public:
|
|
||||||
Reader(Stream& stream) : _stream(stream), _current(0), _next(0) {}
|
|
||||||
|
|
||||||
void move() {
|
|
||||||
_current = _next;
|
|
||||||
_next = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
char current() {
|
|
||||||
if (!_current) _current = read();
|
|
||||||
return _current;
|
|
||||||
}
|
|
||||||
|
|
||||||
char next() {
|
|
||||||
// assumes that current() has been called
|
|
||||||
if (!_next) _next = read();
|
|
||||||
return _next;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
char read() {
|
|
||||||
// don't use _stream.read() as it ignores the timeout
|
|
||||||
char c = 0;
|
|
||||||
_stream.readBytes(&c, 1);
|
|
||||||
return c;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename TStream>
|
|
||||||
struct StringTraits<TStream,
|
|
||||||
// match any type that is derived from Stream:
|
|
||||||
typename TypeTraits::EnableIf<TypeTraits::IsBaseOf<
|
|
||||||
Stream, typename TypeTraits::RemoveReference<
|
|
||||||
TStream>::type>::value>::type>
|
|
||||||
: ArduinoStreamTraits {};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,61 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../TypeTraits/EnableIf.hpp"
|
|
||||||
#include "../TypeTraits/IsChar.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
template <typename TChar>
|
|
||||||
struct CharPointerTraits {
|
|
||||||
class Reader {
|
|
||||||
const TChar* _ptr;
|
|
||||||
|
|
||||||
public:
|
|
||||||
Reader(const TChar* ptr)
|
|
||||||
: _ptr(ptr ? ptr : reinterpret_cast<const TChar*>("")) {}
|
|
||||||
|
|
||||||
void move() {
|
|
||||||
++_ptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
TChar current() const {
|
|
||||||
return _ptr[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
TChar next() const {
|
|
||||||
return _ptr[1];
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
static bool equals(const TChar* str, const char* expected) {
|
|
||||||
return strcmp(reinterpret_cast<const char*>(str), expected) == 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename Buffer>
|
|
||||||
static char* duplicate(const TChar* str, Buffer* buffer) {
|
|
||||||
if (!str) return NULL;
|
|
||||||
size_t size = strlen(reinterpret_cast<const char*>(str)) + 1;
|
|
||||||
void* dup = buffer->alloc(size);
|
|
||||||
if (dup != NULL) memcpy(dup, str, size);
|
|
||||||
return static_cast<char*>(dup);
|
|
||||||
}
|
|
||||||
|
|
||||||
static const bool has_append = false;
|
|
||||||
static const bool has_equals = true;
|
|
||||||
static const bool should_duplicate = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename TChar>
|
|
||||||
struct StringTraits<TChar*, typename TypeTraits::EnableIf<
|
|
||||||
TypeTraits::IsChar<TChar>::value>::type>
|
|
||||||
: CharPointerTraits<TChar> {};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,52 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
template <>
|
|
||||||
struct StringTraits<const __FlashStringHelper*, void> {
|
|
||||||
class Reader {
|
|
||||||
const char* _ptr;
|
|
||||||
|
|
||||||
public:
|
|
||||||
Reader(const __FlashStringHelper* ptr)
|
|
||||||
: _ptr(reinterpret_cast<const char*>(ptr)) {}
|
|
||||||
|
|
||||||
void move() {
|
|
||||||
_ptr++;
|
|
||||||
}
|
|
||||||
|
|
||||||
char current() const {
|
|
||||||
return pgm_read_byte_near(_ptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
char next() const {
|
|
||||||
return pgm_read_byte_near(_ptr + 1);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
static bool equals(const __FlashStringHelper* str, const char* expected) {
|
|
||||||
return strcmp_P(expected, (PGM_P)str) == 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename Buffer>
|
|
||||||
static char* duplicate(const __FlashStringHelper* str, Buffer* buffer) {
|
|
||||||
if (!str) return NULL;
|
|
||||||
size_t size = strlen_P((PGM_P)str) + 1;
|
|
||||||
void* dup = buffer->alloc(size);
|
|
||||||
if (dup != NULL) memcpy_P(dup, (PGM_P)str, size);
|
|
||||||
return static_cast<char*>(dup);
|
|
||||||
}
|
|
||||||
|
|
||||||
static const bool has_append = false;
|
|
||||||
static const bool has_equals = true;
|
|
||||||
static const bool should_duplicate = true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,59 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <istream>
|
|
||||||
#include "../TypeTraits/EnableIf.hpp"
|
|
||||||
#include "../TypeTraits/IsBaseOf.hpp"
|
|
||||||
#include "../TypeTraits/RemoveReference.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
struct StdStreamTraits {
|
|
||||||
class Reader {
|
|
||||||
std::istream& _stream;
|
|
||||||
char _current, _next;
|
|
||||||
|
|
||||||
public:
|
|
||||||
Reader(std::istream& stream) : _stream(stream), _current(0), _next(0) {}
|
|
||||||
|
|
||||||
void move() {
|
|
||||||
_current = _next;
|
|
||||||
_next = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
char current() {
|
|
||||||
if (!_current) _current = read();
|
|
||||||
return _current;
|
|
||||||
}
|
|
||||||
|
|
||||||
char next() {
|
|
||||||
// assumes that current() has been called
|
|
||||||
if (!_next) _next = read();
|
|
||||||
return _next;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
Reader& operator=(const Reader&); // Visual Studio C4512
|
|
||||||
|
|
||||||
char read() {
|
|
||||||
return _stream.eof() ? '\0' : static_cast<char>(_stream.get());
|
|
||||||
}
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename TStream>
|
|
||||||
struct StringTraits<TStream,
|
|
||||||
// match any type that is derived from std::istream:
|
|
||||||
typename TypeTraits::EnableIf<TypeTraits::IsBaseOf<
|
|
||||||
std::istream, typename TypeTraits::RemoveReference<
|
|
||||||
TStream>::type>::value>::type>
|
|
||||||
: StdStreamTraits {};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,62 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#if ARDUINOJSON_ENABLE_ARDUINO_STRING
|
|
||||||
#include <WString.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ARDUINOJSON_ENABLE_STD_STRING
|
|
||||||
#include <string>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
template <typename TString>
|
|
||||||
struct StdStringTraits {
|
|
||||||
template <typename Buffer>
|
|
||||||
static char* duplicate(const TString& str, Buffer* buffer) {
|
|
||||||
if (!str.c_str()) return NULL; // <- Arduino string can return NULL
|
|
||||||
size_t size = str.length() + 1;
|
|
||||||
void* dup = buffer->alloc(size);
|
|
||||||
if (dup != NULL) memcpy(dup, str.c_str(), size);
|
|
||||||
return static_cast<char*>(dup);
|
|
||||||
}
|
|
||||||
|
|
||||||
struct Reader : CharPointerTraits<char>::Reader {
|
|
||||||
Reader(const TString& str) : CharPointerTraits<char>::Reader(str.c_str()) {}
|
|
||||||
};
|
|
||||||
|
|
||||||
static bool equals(const TString& str, const char* expected) {
|
|
||||||
return 0 == strcmp(str.c_str(), expected);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void append(TString& str, char c) {
|
|
||||||
str += c;
|
|
||||||
}
|
|
||||||
|
|
||||||
static const bool has_append = true;
|
|
||||||
static const bool has_equals = true;
|
|
||||||
static const bool should_duplicate = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
#if ARDUINOJSON_ENABLE_ARDUINO_STRING
|
|
||||||
template <>
|
|
||||||
struct StringTraits<String, void> : StdStringTraits<String> {};
|
|
||||||
template <>
|
|
||||||
struct StringTraits<StringSumHelper, void> : StdStringTraits<StringSumHelper> {
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ARDUINOJSON_ENABLE_STD_STRING
|
|
||||||
template <>
|
|
||||||
struct StringTraits<std::string, void> : StdStringTraits<std::string> {};
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,57 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../Configuration.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace Internals {
|
|
||||||
|
|
||||||
template <typename TString, typename Enable = void>
|
|
||||||
struct StringTraits {};
|
|
||||||
|
|
||||||
template <typename TString>
|
|
||||||
struct StringTraits<const TString, void> : StringTraits<TString> {};
|
|
||||||
|
|
||||||
template <typename TString>
|
|
||||||
struct StringTraits<TString&, void> : StringTraits<TString> {};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#include "CharPointer.hpp"
|
|
||||||
|
|
||||||
#if ARDUINOJSON_ENABLE_STD_STRING || ARDUINOJSON_ENABLE_ARDUINO_STRING
|
|
||||||
#include "StdString.hpp"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ARDUINOJSON_ENABLE_STD_STREAM
|
|
||||||
#include "StdStream.hpp"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ARDUINOJSON_ENABLE_ARDUINO_STREAM
|
|
||||||
#include "ArduinoStream.hpp"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ARDUINOJSON_ENABLE_PROGMEM
|
|
||||||
#include "FlashString.hpp"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace TypeTraits {
|
|
||||||
template <typename T, typename Enable = void>
|
|
||||||
struct IsString {
|
|
||||||
static const bool value = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
struct IsString<T, typename TypeTraits::EnableIf<
|
|
||||||
Internals::StringTraits<T>::has_equals>::type> {
|
|
||||||
static const bool value = Internals::StringTraits<T>::has_equals;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace TypeTraits {
|
|
||||||
|
|
||||||
// A meta-function that return the type T if Condition is true.
|
|
||||||
template <bool Condition, typename T = void>
|
|
||||||
struct EnableIf {};
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
struct EnableIf<true, T> {
|
|
||||||
typedef T type;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace TypeTraits {
|
|
||||||
|
|
||||||
// A meta-function that return the type T without the const modifier
|
|
||||||
template <typename T>
|
|
||||||
struct IsArray {
|
|
||||||
static const bool value = false;
|
|
||||||
};
|
|
||||||
template <typename T>
|
|
||||||
struct IsArray<T[]> {
|
|
||||||
static const bool value = true;
|
|
||||||
};
|
|
||||||
template <typename T, size_t N>
|
|
||||||
struct IsArray<T[N]> {
|
|
||||||
static const bool value = true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace TypeTraits {
|
|
||||||
|
|
||||||
// A meta-function that returns true if Derived inherits from TBase is an
|
|
||||||
// integral type.
|
|
||||||
template <typename TBase, typename TDerived>
|
|
||||||
class IsBaseOf {
|
|
||||||
protected: // <- to avoid GCC's "all member functions in class are private"
|
|
||||||
typedef char Yes[1];
|
|
||||||
typedef char No[2];
|
|
||||||
|
|
||||||
static Yes &probe(const TBase *);
|
|
||||||
static No &probe(...);
|
|
||||||
|
|
||||||
public:
|
|
||||||
enum {
|
|
||||||
value = sizeof(probe(reinterpret_cast<TDerived *>(0))) == sizeof(Yes)
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "IsSame.hpp"
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace TypeTraits {
|
|
||||||
|
|
||||||
// A meta-function that returns true if T is a charater
|
|
||||||
template <typename T>
|
|
||||||
struct IsChar {
|
|
||||||
static const bool value = IsSame<T, char>::value ||
|
|
||||||
IsSame<T, signed char>::value ||
|
|
||||||
IsSame<T, unsigned char>::value;
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
struct IsChar<const T> : IsChar<T> {};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
// Copyright Benoit Blanchon 2014-2017
|
|
||||||
// MIT License
|
|
||||||
//
|
|
||||||
// Arduino JSON library
|
|
||||||
// https://github.com/bblanchon/ArduinoJson
|
|
||||||
// If you like this project, please add a star!
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
namespace ArduinoJson {
|
|
||||||
namespace TypeTraits {
|
|
||||||
|
|
||||||
// A meta-function that return the type T without the const modifier
|
|
||||||
template <typename T>
|
|
||||||
struct IsConst {
|
|
||||||
static const bool value = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
struct IsConst<const T> {
|
|
||||||
static const bool value = true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user