Initial commit
This commit is contained in:
commit
0c83634f42
368 changed files with 32173 additions and 0 deletions
5
.gitignore
vendored
Normal file
5
.gitignore
vendored
Normal file
|
@ -0,0 +1,5 @@
|
|||
.pio
|
||||
.vscode/.browse.c_cpp.db*
|
||||
.vscode/c_cpp_properties.json
|
||||
.vscode/launch.json
|
||||
.vscode/ipch
|
67
.travis.yml
Normal file
67
.travis.yml
Normal file
|
@ -0,0 +1,67 @@
|
|||
# Continuous Integration (CI) is the practice, in software
|
||||
# engineering, of merging all developer working copies with a shared mainline
|
||||
# several times a day < https://docs.platformio.org/page/ci/index.html >
|
||||
#
|
||||
# Documentation:
|
||||
#
|
||||
# * Travis CI Embedded Builds with PlatformIO
|
||||
# < https://docs.travis-ci.com/user/integration/platformio/ >
|
||||
#
|
||||
# * PlatformIO integration with Travis CI
|
||||
# < https://docs.platformio.org/page/ci/travis.html >
|
||||
#
|
||||
# * User Guide for `platformio ci` command
|
||||
# < https://docs.platformio.org/page/userguide/cmd_ci.html >
|
||||
#
|
||||
#
|
||||
# Please choose one of the following templates (proposed below) and uncomment
|
||||
# it (remove "# " before each line) or use own configuration according to the
|
||||
# Travis CI documentation (see above).
|
||||
#
|
||||
|
||||
|
||||
#
|
||||
# Template #1: General project. Test it using existing `platformio.ini`.
|
||||
#
|
||||
|
||||
# language: python
|
||||
# python:
|
||||
# - "2.7"
|
||||
#
|
||||
# sudo: false
|
||||
# cache:
|
||||
# directories:
|
||||
# - "~/.platformio"
|
||||
#
|
||||
# install:
|
||||
# - pip install -U platformio
|
||||
# - platformio update
|
||||
#
|
||||
# script:
|
||||
# - platformio run
|
||||
|
||||
|
||||
#
|
||||
# Template #2: The project is intended to be used as a library with examples.
|
||||
#
|
||||
|
||||
# language: python
|
||||
# python:
|
||||
# - "2.7"
|
||||
#
|
||||
# sudo: false
|
||||
# cache:
|
||||
# directories:
|
||||
# - "~/.platformio"
|
||||
#
|
||||
# env:
|
||||
# - PLATFORMIO_CI_SRC=path/to/test/file.c
|
||||
# - PLATFORMIO_CI_SRC=examples/file.ino
|
||||
# - PLATFORMIO_CI_SRC=path/to/test/directory
|
||||
#
|
||||
# install:
|
||||
# - pip install -U platformio
|
||||
# - platformio update
|
||||
#
|
||||
# script:
|
||||
# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N
|
7
.vscode/extensions.json
vendored
Normal file
7
.vscode/extensions.json
vendored
Normal file
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
// See http://go.microsoft.com/fwlink/?LinkId=827846
|
||||
// for the documentation about the extensions.json format
|
||||
"recommendations": [
|
||||
"platformio.platformio-ide"
|
||||
]
|
||||
}
|
6
.vscode/settings.json
vendored
Normal file
6
.vscode/settings.json
vendored
Normal file
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"terminal.integrated.env.windows": {
|
||||
"PATH": "C:\\Users\\lord\\.platformio\\penv\\Scripts;C:\\Users\\lord\\.platformio\\penv;F:\\toolchain\\Python37\\Scripts\\;F:\\toolchain\\Python37\\;C:\\ProgramData\\Oracle\\Java\\javapath;C:\\Program Files\\Common Files\\Microsoft Shared\\Windows Live;C:\\Program Files (x86)\\Common Files\\Microsoft Shared\\Windows Live;C:\\Program Files (x86)\\AMD APP\\bin\\x86_64;C:\\Program Files (x86)\\AMD APP\\bin\\x86;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Program Files (x86)\\ATI Technologies\\ATI.ACE\\Core-Static;C:\\Program Files (x86)\\GNU\\GnuPG\\pub;C:\\Program Files (x86)\\IVI Foundation\\VISA\\WinNT\\Bin\\;F:\\Program Files (x86)\\Calibre2\\;C:\\Program Files (x86)\\Common Files\\Adobe\\AGL;C:\\Program Files (x86)\\QuickTime\\QTSystem\\;C:\\Program Files (x86)\\Windows Live\\Shared;f:\\Program Files (x86)\\Universal Extractor;f:\\Program Files (x86)\\Universal Extractor\\bin;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\Program Files\\Git\\cmd;F:\\Program Files (x86)\\GtkSharp\\2.12\\bin;F:\\Program Files\\nodejs\\;C:\\WINDOWS\\System32\\OpenSSH\\;C:\\Program Files\\TortoiseGit\\bin;F:\\Program Files\\Microsoft VS Code\\bin;f:\\toolchain\\;F:\\toolchain\\CMake\\bin;C:\\Program Files (x86)\\IVI Foundation\\IVI\\bin;C:\\Program Files\\IVI Foundation\\IVI\\bin;C:\\Program Files\\IVI Foundation\\VISA\\Win64\\Bin\\;C:\\Program Files (x86)\\IVI Foundation\\VISA\\WinNT\\Bin;f:\\Program Files (x86)\\OpenVPN\\bin;f:\\Program Files (x86)\\Nmap;C:\\Users\\lord\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Users\\lord\\AppData\\Roaming\\npm;f:\\program files\\Microsoft VS Code\\bin;C:\\Users\\lord\\AppData\\Local\\Microsoft\\WindowsApps;;f:\\Program Files\\Docker Toolbox;F:\\toolchain\\Python37\\Scripts\\;F:\\toolchain\\Python37\\;C:\\ProgramData\\Oracle\\Java\\javapath;C:\\Program Files\\Common Files\\Microsoft Shared\\Windows Live;C:\\Program Files (x86)\\Common Files\\Microsoft Shared\\Windows Live;C:\\Program Files (x86)\\AMD APP\\bin\\x86_64;C:\\Program Files (x86)\\AMD APP\\bin\\x86;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Program Files (x86)\\ATI Technologies\\ATI.ACE\\Core-Static;C:\\Program Files (x86)\\GNU\\GnuPG\\pub;C:\\Program Files (x86)\\IVI Foundation\\VISA\\WinNT\\Bin\\;F:\\Program Files (x86)\\Calibre2\\;C:\\Program Files (x86)\\Common Files\\Adobe\\AGL;C:\\Program Files (x86)\\QuickTime\\QTSystem\\;C:\\Program Files (x86)\\Windows Live\\Shared;f:\\Program Files (x86)\\Universal Extractor;f:\\Program Files (x86)\\Universal Extractor\\bin;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\Program Files\\Git\\cmd;F:\\Program Files (x86)\\GtkSharp\\2.12\\bin;F:\\Program Files\\nodejs\\;C:\\WINDOWS\\System32\\OpenSSH\\;C:\\Program Files\\TortoiseGit\\bin;F:\\Program Files\\Microsoft VS Code\\bin;f:\\toolchain\\;F:\\toolchain\\CMake\\bin;C:\\Program Files (x86)\\IVI Foundation\\IVI\\bin;C:\\Program Files\\IVI Foundation\\IVI\\bin;C:\\Program Files\\IVI Foundation\\VISA\\Win64\\Bin\\;C:\\Program Files (x86)\\IVI Foundation\\VISA\\WinNT\\Bin;f:\\Program Files (x86)\\OpenVPN\\bin;f:\\Program Files (x86)\\Nmap;C:\\Users\\lord\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Users\\lord\\AppData\\Roaming\\npm;f:\\program files\\Microsoft VS Code\\bin;C:\\Users\\lord\\AppData\\Local\\Microsoft\\WindowsApps;;f:\\Program Files\\Docker Toolbox",
|
||||
"PLATFORMIO_CALLER": "vscode"
|
||||
}
|
||||
}
|
296
extra/fx.proto
Normal file
296
extra/fx.proto
Normal file
|
@ -0,0 +1,296 @@
|
|||
syntax = "proto2";
|
||||
package fx;
|
||||
|
||||
// ENUMS
|
||||
|
||||
enum Mode {
|
||||
FX_MODE_STATIC = 0;
|
||||
FX_MODE_BLINK = 1;
|
||||
FX_MODE_BREATH = 2;
|
||||
FX_MODE_COLOR_WIPE = 3;
|
||||
FX_MODE_COLOR_WIPE_INV = 4;
|
||||
FX_MODE_COLOR_WIPE_REV = 5;
|
||||
FX_MODE_COLOR_WIPE_REV_INV = 6;
|
||||
FX_MODE_COLOR_WIPE_RANDOM = 7;
|
||||
FX_MODE_RANDOM_COLOR = 8;
|
||||
FX_MODE_SINGLE_DYNAMIC = 9;
|
||||
FX_MODE_MULTI_DYNAMIC = 10;
|
||||
FX_MODE_RAINBOW = 11;
|
||||
FX_MODE_RAINBOW_CYCLE = 12;
|
||||
FX_MODE_SCAN = 13;
|
||||
FX_MODE_DUAL_SCAN = 14;
|
||||
FX_MODE_FADE = 15;
|
||||
FX_MODE_THEATER_CHASE = 16;
|
||||
FX_MODE_THEATER_CHASE_RAINBOW = 17;
|
||||
FX_MODE_RUNNING_LIGHTS = 18;
|
||||
FX_MODE_TWINKLE = 19;
|
||||
FX_MODE_TWINKLE_RANDOM = 20;
|
||||
FX_MODE_TWINKLE_FADE = 21;
|
||||
FX_MODE_TWINKLE_FADE_RANDOM = 22;
|
||||
FX_MODE_SPARKLE = 23;
|
||||
FX_MODE_FLASH_SPARKLE = 24;
|
||||
FX_MODE_HYPER_SPARKLE = 25;
|
||||
FX_MODE_STROBE = 26;
|
||||
FX_MODE_STROBE_RAINBOW = 27;
|
||||
FX_MODE_MULTI_STROBE = 28;
|
||||
FX_MODE_BLINK_RAINBOW = 29;
|
||||
FX_MODE_CHASE_WHITE = 30;
|
||||
FX_MODE_CHASE_COLOR = 31;
|
||||
FX_MODE_CHASE_RANDOM = 32;
|
||||
FX_MODE_CHASE_RAINBOW = 33;
|
||||
FX_MODE_CHASE_FLASH = 34;
|
||||
FX_MODE_CHASE_FLASH_RANDOM = 35;
|
||||
FX_MODE_CHASE_RAINBOW_WHITE = 36;
|
||||
FX_MODE_CHASE_BLACKOUT = 37;
|
||||
FX_MODE_CHASE_BLACKOUT_RAINBOW = 38;
|
||||
FX_MODE_COLOR_SWEEP_RANDOM = 39;
|
||||
FX_MODE_RUNNING_COLOR = 40;
|
||||
FX_MODE_RUNNING_RED_BLUE = 41;
|
||||
FX_MODE_RUNNING_RANDOM = 42;
|
||||
FX_MODE_LARSON_SCANNER = 43;
|
||||
FX_MODE_COMET = 44;
|
||||
FX_MODE_FIREWORKS = 45;
|
||||
FX_MODE_FIREWORKS_RANDOM = 46;
|
||||
FX_MODE_MERRY_CHRISTMAS = 47;
|
||||
FX_MODE_FIRE_FLICKER = 48;
|
||||
FX_MODE_FIRE_FLICKER_SOFT = 49;
|
||||
FX_MODE_FIRE_FLICKER_INTENSE = 50;
|
||||
FX_MODE_CIRCUS_COMBUSTUS = 51;
|
||||
FX_MODE_HALLOWEEN = 52;
|
||||
FX_MODE_BICOLOR_CHASE = 53;
|
||||
FX_MODE_TRICOLOR_CHASE = 54;
|
||||
FX_MODE_ICU = 55;
|
||||
FX_MODE_CUSTOM_0 = 56;
|
||||
FX_MODE_CUSTOM_1 = 57;
|
||||
FX_MODE_CUSTOM_2 = 58;
|
||||
FX_MODE_CUSTOM_3 = 59;
|
||||
}
|
||||
|
||||
enum FadeRate {
|
||||
FADE_RATE_XFAST = 1;
|
||||
FADE_RATE_FAST = 2;
|
||||
FADE_RATE_MEDIUM = 3;
|
||||
FADE_RATE_SLOW = 4;
|
||||
FADE_RATE_XSLOW = 5;
|
||||
FADE_RATE_XXSLOW = 6;
|
||||
FADE_RATE_GLACIAL = 7;
|
||||
}
|
||||
|
||||
enum Size {
|
||||
SIZE_SMALL = 0;
|
||||
SIZE_MEDIUM = 1;
|
||||
SIZE_LARGE = 2;
|
||||
SIZE_XLARGE = 3;
|
||||
}
|
||||
|
||||
// TYPES
|
||||
|
||||
message RGB {
|
||||
required uint32 r = 1;
|
||||
required uint32 g = 2;
|
||||
required uint32 b = 3;
|
||||
}
|
||||
|
||||
message RGBW {
|
||||
required uint32 r = 1;
|
||||
required uint32 g = 2;
|
||||
required uint32 b = 3;
|
||||
required uint32 w = 4;
|
||||
}
|
||||
|
||||
message ColorType {
|
||||
oneof colorTypes {
|
||||
RGB rgb = 1;
|
||||
RGBW rgbw = 2;
|
||||
fixed32 color = 3;
|
||||
}
|
||||
}
|
||||
|
||||
message Options {
|
||||
required bool reverse = 1;
|
||||
required FadeRate fadeRate = 2;
|
||||
required bool gammaCorrect = 3;
|
||||
required Size size = 4;
|
||||
}
|
||||
|
||||
// MESSAGES
|
||||
|
||||
message init_msg {
|
||||
//(void),
|
||||
}
|
||||
message service_msg {
|
||||
//(void),
|
||||
}
|
||||
message start_msg {
|
||||
//(void),
|
||||
}
|
||||
message stop_msg {
|
||||
//(void),
|
||||
}
|
||||
message pause_msg {
|
||||
//(void),
|
||||
}
|
||||
message resume_msg {
|
||||
//(void),
|
||||
}
|
||||
message strip_off_msg {
|
||||
//(void),
|
||||
}
|
||||
message fade_out_msg {
|
||||
optional uint32 fadeTime = 1;
|
||||
}
|
||||
message setMode_msg {
|
||||
optional uint32 segment = 1;
|
||||
required Mode mode = 2;
|
||||
}
|
||||
message setOptions_msg {
|
||||
required uint32 segment = 1;
|
||||
required Options options = 2;
|
||||
}
|
||||
message setSpeed_msg {
|
||||
optional uint32 segment = 1;
|
||||
required uint32 speed = 2;
|
||||
}
|
||||
message increaseSpeed_msg {
|
||||
required uint32 step = 1;
|
||||
}
|
||||
message decreaseSpeed_msg {
|
||||
required uint32 step = 1;
|
||||
}
|
||||
message setColor_msg {
|
||||
optional uint32 segment = 1;
|
||||
repeated ColorType color = 2;
|
||||
}
|
||||
message setBrightness_msg {
|
||||
required uint32 brightness = 1;
|
||||
}
|
||||
message increaseBrightness_msg {
|
||||
required uint32 step = 1;
|
||||
}
|
||||
message decreaseBrightness_msg {
|
||||
required uint32 step = 1;
|
||||
}
|
||||
message setLength_msg {
|
||||
required uint32 numPixels = 1;
|
||||
}
|
||||
message increaseLength_msg {
|
||||
required uint32 step = 1;
|
||||
}
|
||||
message decreaseLength_msg {
|
||||
required uint32 step = 1;
|
||||
}
|
||||
message trigger_msg {
|
||||
//(void),
|
||||
}
|
||||
message setNumSegments_msg {
|
||||
required uint32 numSegments = 1;
|
||||
}
|
||||
message setSegment_msg {
|
||||
required uint32 segment = 1;
|
||||
required uint32 start = 2;
|
||||
required uint32 end = 3;
|
||||
required Mode mode = 4;
|
||||
repeated ColorType color = 5;
|
||||
required Options options = 6;
|
||||
}
|
||||
message resetSegments_msg {
|
||||
//(),
|
||||
}
|
||||
message resetSegmentRuntimes_msg {
|
||||
//(),
|
||||
}
|
||||
message resetSegmentRuntime_msg {
|
||||
required uint32 segment = 1;
|
||||
}
|
||||
message setPixelColor_msg {
|
||||
required uint32 offset = 1;
|
||||
required ColorType color = 2;
|
||||
}
|
||||
message copyPixels_msg {
|
||||
required uint32 destination = 1;
|
||||
required uint32 source = 2;
|
||||
required uint32 count = 3;
|
||||
}
|
||||
message show_msg {
|
||||
//(void);
|
||||
}
|
||||
|
||||
// MAIN MESSAGE
|
||||
|
||||
message Root {
|
||||
oneof msg {
|
||||
init_msg init = 1;
|
||||
start_msg start = 2;
|
||||
stop_msg stop = 3;
|
||||
pause_msg pause = 4;
|
||||
resume_msg resume = 5;
|
||||
strip_off_msg strip_off = 6;
|
||||
fade_out_msg fade_out = 7;
|
||||
setMode_msg setMode = 8;
|
||||
setOptions_msg setOptions = 9;
|
||||
setSpeed_msg setSpeed = 10;
|
||||
increaseSpeed_msg increaseSpeed = 11;
|
||||
decreaseSpeed_msg decreaseSpeed = 12;
|
||||
setColor_msg setColor = 13;
|
||||
setBrightness_msg setBrightness = 14;
|
||||
increaseBrightness_msg increaseBrightness = 15;
|
||||
decreaseBrightness_msg decreaseBrightness = 16;
|
||||
setLength_msg setLength = 17;
|
||||
increaseLength_msg increaseLength = 18;
|
||||
decreaseLength_msg decreaseLength = 19;
|
||||
trigger_msg trigger = 20;
|
||||
setNumSegments_msg setNumSegments = 21;
|
||||
setSegment_msg setSegment = 22;
|
||||
resetSegments_msg resetSegments = 23;
|
||||
resetSegmentRuntimes_msg resetSegmentRuntimes = 24;
|
||||
resetSegmentRuntime_msg resetSegmentRuntime = 25;
|
||||
setPixelColor_msg setPixelColor = 26;
|
||||
copyPixels_msg copyPixels = 27;
|
||||
show_msg show = 28;
|
||||
}
|
||||
}
|
||||
|
||||
//ORG
|
||||
// init(void),
|
||||
// service(void),
|
||||
// start(void),
|
||||
// stop(void),
|
||||
// pause(void),
|
||||
// resume(void),
|
||||
// strip_off(void),
|
||||
// fade_out(void),
|
||||
// fade_out(uint32_t),
|
||||
// setMode(uint8_t m),
|
||||
// setMode(uint8_t seg, uint8_t m),
|
||||
// setOptions(uint8_t seg, uint8_t o),
|
||||
// setCustomMode(uint16_t (*p)()),
|
||||
// setCustomShow(void (*p)()),
|
||||
// setSpeed(uint16_t s),
|
||||
// setSpeed(uint8_t seg, uint16_t s),
|
||||
// increaseSpeed(uint8_t s),
|
||||
// decreaseSpeed(uint8_t s),
|
||||
// setColor(uint8_t r, uint8_t g, uint8_t b),
|
||||
// setColor(uint8_t r, uint8_t g, uint8_t b, uint8_t w),
|
||||
// setColor(uint32_t c),
|
||||
// setColor(uint8_t seg, uint32_t c),
|
||||
// setColors(uint8_t seg, uint32_t* c),
|
||||
// setBrightness(uint8_t b),
|
||||
// increaseBrightness(uint8_t s),
|
||||
// decreaseBrightness(uint8_t s),
|
||||
// setLength(uint16_t b),
|
||||
// increaseLength(uint16_t s),
|
||||
// decreaseLength(uint16_t s),
|
||||
// trigger(void),
|
||||
// setNumSegments(uint8_t n),
|
||||
// setSegment(uint8_t n, uint16_t start, uint16_t stop, uint8_t mode, uint32_t color, uint16_t speed, bool reverse),
|
||||
// setSegment(uint8_t n, uint16_t start, uint16_t stop, uint8_t mode, uint32_t color, uint16_t speed, uint8_t options),
|
||||
// setSegment(uint8_t n, uint16_t start, uint16_t stop, uint8_t mode, const uint32_t colors[], uint16_t speed, bool reverse),
|
||||
// setSegment(uint8_t n, uint16_t start, uint16_t stop, uint8_t mode, const uint32_t colors[], uint16_t speed, uint8_t options),
|
||||
// resetSegments(),
|
||||
// resetSegmentRuntimes(),
|
||||
// resetSegmentRuntime(uint8_t),
|
||||
// setPixelColor(uint16_t n, uint32_t c),
|
||||
// setPixelColor(uint16_t n, uint8_t r, uint8_t g, uint8_t b),
|
||||
// setPixelColor(uint16_t n, uint8_t r, uint8_t g, uint8_t b, uint8_t w),
|
||||
// copyPixels(uint16_t d, uint16_t s, uint16_t c),
|
||||
// show(void);
|
28
extra/nanopb/.gitignore
vendored
Normal file
28
extra/nanopb/.gitignore
vendored
Normal file
|
@ -0,0 +1,28 @@
|
|||
*.gcda
|
||||
*.gcno
|
||||
*.gcov
|
||||
*.o
|
||||
*.pb.c
|
||||
*.pb.h
|
||||
*.pb
|
||||
*.pyc
|
||||
*_pb2.py
|
||||
*~
|
||||
*.tar.gz
|
||||
.sconsign.dblite
|
||||
config.log
|
||||
.sconf_temp
|
||||
tests/build
|
||||
julkaisu.txt
|
||||
dist
|
||||
docs/*.html
|
||||
docs/generator_flow.png
|
||||
examples/simple/simple
|
||||
examples/network_server/client
|
||||
examples/network_server/server
|
||||
examples/using_double_on_avr/decode_double
|
||||
examples/using_double_on_avr/encode_double
|
||||
examples/using_double_on_avr/test_conversions
|
||||
examples/using_union_messages/decode
|
||||
examples/using_union_messages/encode
|
||||
generator/nanopb_pb2.pyc
|
60
extra/nanopb/.travis.yml
Normal file
60
extra/nanopb/.travis.yml
Normal file
|
@ -0,0 +1,60 @@
|
|||
# Travis CI has no ability to handle 3 langauges (c, c++, python)
|
||||
# and it overrides $CC/$CXX if language is set to c/c++ (only one, not both).
|
||||
#
|
||||
# Set language to python since at least the result of that is something useful.
|
||||
language: python
|
||||
|
||||
python:
|
||||
- "2.7"
|
||||
- "3.4"
|
||||
|
||||
# Manage the C/C++ compiler manually
|
||||
env:
|
||||
- CC=gcc CXX=g++
|
||||
- CC=gcc-4.8 CXX=g++-4.8
|
||||
- CC=gcc-4.9 CXX=g++-4.9
|
||||
- CC=gcc-5 CXX=g++-5
|
||||
- CC=clang CXX=clang++
|
||||
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
packages:
|
||||
- gcc-4.8
|
||||
- g++-4.8
|
||||
- gcc-4.9
|
||||
- g++-4.9
|
||||
- gcc-5
|
||||
- g++-5
|
||||
|
||||
|
||||
before_install:
|
||||
- export PATH=$HOME/.local/bin:$HOME/protobuf/bin:$PATH
|
||||
- export MAKEFLAGS=-j$(nproc)
|
||||
- $CC --version
|
||||
- $CXX --version
|
||||
- python --version
|
||||
- lsb_release -a
|
||||
|
||||
# Seems to be issues with concurrent builds
|
||||
#cache:
|
||||
# directories:
|
||||
# - $HOME/protobuf
|
||||
|
||||
# Rather then compile protobuf 3 from source, use the binaries now available
|
||||
# to speed up build time and reduce surprises until Ubuntu adds protobuf3
|
||||
# packages to the repository.
|
||||
install:
|
||||
- mkdir -p $HOME/protobuf && pushd $HOME/protobuf
|
||||
&& curl -LO 'https://github.com/google/protobuf/releases/download/v3.4.0/protoc-3.4.0-linux-x86_64.zip'
|
||||
&& unzip protoc-3.4.0-linux-x86_64.zip
|
||||
&& popd
|
||||
- curl -L 'https://github.com/google/protobuf/releases/download/v3.4.0/protobuf-python-3.4.0.tar.gz' | tar xzf -
|
||||
&& pushd protobuf-3.4.0/python
|
||||
&& python setup.py build && python setup.py install
|
||||
&& popd
|
||||
|
||||
script:
|
||||
- pushd generator/proto && make && popd
|
||||
- pushd tests && scons CC=$CC CXX=$CXX && popd
|
52
extra/nanopb/AUTHORS.txt
Normal file
52
extra/nanopb/AUTHORS.txt
Normal file
|
@ -0,0 +1,52 @@
|
|||
Petteri Aimonen <jpa@npb.mail.kapsi.fi>
|
||||
Michael Poole <mdpoole@troilus.org>
|
||||
Daniel Kan <extremeblue99@gmail.com>
|
||||
Stan Hu <stanhu@aclimalabs.com>
|
||||
David Hotham <david.hotham@blueyonder.co.uk>
|
||||
Steffen Siering <steffen siering gmail com>
|
||||
Jens Steinhauser <jens.steinhauser@gmail.com>
|
||||
Pavel Ilin <ilin.pa@gmail.com>
|
||||
Kent Ryhorchuk <kryhorchuk@xeralux.com>
|
||||
Martin Donath <scifish@gmail.com>
|
||||
Oliver Lee <oliverzlee@gmail.com>
|
||||
Michael Haberler <git@mah.priv.at>
|
||||
Nicolas Colomer <ncolomer@viadeoteam.com>
|
||||
Ivan Kravets <me@ikravets.com>
|
||||
Kyle Manna <kyle@kylemanna.com>
|
||||
Benjamin Kamath <ben.kamath@synapse.com>
|
||||
Andrew Ruder <andrew.ruder@elecsyscorp.com>
|
||||
Kenshi Kawaguchi <kenshi@recurse.ca>
|
||||
isotes <isotes@gmail.com>
|
||||
Maxim Khitrov <max@mxcrypt.com>
|
||||
Yaniv Mordekhay <yanivmo@users.noreply.github.com>
|
||||
Ming Zhao <mzhao@luminatewireless.com>
|
||||
Google, Inc.
|
||||
Tom Roeder <tmroeder@google.com>
|
||||
Piotr Sikora <piotrsikora@google.com>
|
||||
Bernhard Krämer <bdkrae@gmail.com>
|
||||
Konstantin Podsvirov <konstantin@podsvirov.pro>
|
||||
William A. Kennington III <wak@google.com>
|
||||
Guillaume Lager <g.lager@innoseis.com>
|
||||
Tobias Haegermarck <tobias.haegermarck@gmail.com>
|
||||
Justin DeMartino <jdemarti@gmail.com>
|
||||
Constantine Grantcharov <cgrantcharov@trustpointinnovation.com>
|
||||
Nick Ewalt <nicholasewalt@google.com>
|
||||
Harald Fernengel <harryf@gmx.com>
|
||||
Alice Wang <aw@squareup.com>
|
||||
Kevin Fitch <kfitch42@gmail.com>
|
||||
Kamal Marhubi <kamal@marhubi.com>
|
||||
Elco Jacobs <elco@brewpi.com>
|
||||
Sébastien Morin <sebastien.morin@primerogames.com>
|
||||
Dave Flogeras <dflogeras2@gmail.com>
|
||||
Edward Z. Yang <ezyang@mit.edu>
|
||||
Robbie Shade <rjshade@google.com>
|
||||
Andrew Ballinger <andrewballinger@stratisopt.com>
|
||||
Hamina, Juha-Pekka <Juha-Pekka.Hamina@nordicsemi.no>
|
||||
Jason Bishop <jason.bishop@bigassfans.com>
|
||||
matejcik <ja@matejcik.cz>
|
||||
Tobias Müller <Tobias_Mueller@twam.info>
|
||||
Jari Vetoniemi <mailroxas@gmail.com>
|
||||
Gabriel Staples <ercaguy@gmail.com>
|
||||
Amarnath <amarnath.h.96@gmail.com>
|
||||
Michal Rostecki <mrostecki@suse.de>
|
||||
Pei Wang <wangpei10@baidu.com>
|
21
extra/nanopb/BUILD
Normal file
21
extra/nanopb/BUILD
Normal file
|
@ -0,0 +1,21 @@
|
|||
licenses(["notice"])
|
||||
|
||||
exports_files(["LICENSE.txt"])
|
||||
|
||||
package(default_visibility = ["//visibility:public"])
|
||||
|
||||
cc_library(
|
||||
name = "nanopb",
|
||||
visibility = ["//visibility:public"],
|
||||
hdrs = [
|
||||
"pb.h",
|
||||
"pb_common.h",
|
||||
"pb_decode.h",
|
||||
"pb_encode.h",
|
||||
],
|
||||
srcs = [
|
||||
"pb_common.c",
|
||||
"pb_decode.c",
|
||||
"pb_encode.c",
|
||||
],
|
||||
)
|
320
extra/nanopb/CHANGELOG.txt
Normal file
320
extra/nanopb/CHANGELOG.txt
Normal file
|
@ -0,0 +1,320 @@
|
|||
nanopb-0.3.9.3 (2019-03-08)
|
||||
Fix fixed size and callback repeated fields inside proto3 submessages (#376, #382, #386)
|
||||
Fix incorrect PB_STATIC_ASSERT for bytes inside oneof (#363)
|
||||
Fix generator error with mangle_names option (#380)
|
||||
Generator: Allow comma separated options in plugin mode (#343)
|
||||
|
||||
nanopb-0.3.9.2 (2018-11-10)
|
||||
Erroneous free() when using callbacks combined with PB_ENABLE_MALLOC (#346)
|
||||
Fix possible null-pointer dereference in decode_callback_field (#342)
|
||||
Fix FindNanopb.cmake on Windows (#335)
|
||||
Fix large generator memory usage with oneof fields (#338)
|
||||
Fix error in splint test (#359)
|
||||
Allow cmake to build as a shared library (#352, #353)
|
||||
Add --no-strip-path command line option (#326)
|
||||
Option for flattening nested protobuf names (#333)
|
||||
Documentation fixes (#329, #350, #358)
|
||||
Better error messages (#351)
|
||||
|
||||
nanopb-0.3.9.1 (2018-04-14)
|
||||
Fix handling of special characters in string/bytes default values (issue #322)
|
||||
Fix encoding of negative numbers with PB_WITHOUT_64BIT (#285)
|
||||
Fix _zero initializer for enums that don't begin at 0. (#295)
|
||||
Multiple CMake fixes (#296, #299, #304, #312, #320)
|
||||
Fix compiler warnings (#305)
|
||||
Fix scons rules for Python 3
|
||||
Add check for large extension field number (issue #306)
|
||||
Updated included descriptor.proto version (#314)
|
||||
Resolve oneof sizes symbolically when needed (#311)
|
||||
Add fixed_count option (#260)
|
||||
Add some verbose prints in generator (issue #238)
|
||||
Add test/example of using 'map' type. (#289)
|
||||
|
||||
nanopb-0.3.9 (2017-09-23)
|
||||
Fix bugs in proto3 encoding of submessages (#256)
|
||||
Fix message size calculation for arrays of size 1 (#253)
|
||||
Fix segfault with FT_CALLBACK inside FT_POINTER (#259)
|
||||
Properly detect truncated tags in corrupted messages (#277)
|
||||
Make pb_decode_varint32 overflow checks exact (#258)
|
||||
Add option to build without 64-bit support (#86)
|
||||
Add options to define source and header file extensions (#264)
|
||||
Add pb_en/decode_nullterminated() (part of #278)
|
||||
Add pb_decode_delimited_noinit (#284)
|
||||
CMake: add dependency for .options file (#265)
|
||||
CMake: change use of relative paths (#250,#271,#273)
|
||||
Better error message for missing max_size option (#281)
|
||||
Travis-CI build fixes (#283)
|
||||
Add Bazel build system file (#266)
|
||||
|
||||
nanopb-0.3.8 (2017-03-05)
|
||||
Fix problems with multiple oneofs in same message (#229)
|
||||
Zero-valued extension fields were mistakenly ignored by encoder (#242)
|
||||
Multiple fixes related to proto3 mode (#242, #245, #247, #249)
|
||||
Fix potential unaligned access (#226, #227)
|
||||
Fix documentation for protoc --plugin argument (#239)
|
||||
Extend inline / fixed length bytes array support (#244)
|
||||
Add new option max_length for strings (#107)
|
||||
Make string substream API more robust (#230)
|
||||
Make pb_decode_varint32 public API (#231)
|
||||
Allow overriding proto3 mode (#228)
|
||||
Add optional enum->string mapping function (#223)
|
||||
Add transitional options.proto file (#241)
|
||||
Add better error message on Python library version imcompatibility (#240)
|
||||
Include version number in PlatformIO library.json (#222)
|
||||
CMake build script changes (#236, #237)
|
||||
Change download links to https
|
||||
Improvements to test cases.
|
||||
|
||||
nanopb-0.3.7 (2016-10-30)
|
||||
Add support for proto3-style singular fields (#182, #206, #216)
|
||||
Updated binary package protoc to version 3.1.0
|
||||
Add FT_INLINE allocation of bytes fields (#211)
|
||||
Include package name in include guard (#207)
|
||||
Fix missing warning with large bytes fields (issue #220)
|
||||
Added CMake project (#208)
|
||||
Add bazel BUILD file for nanopb (#209)
|
||||
Added an AUTHORS file (#211)
|
||||
Documentation updates
|
||||
Improvements to test cases.
|
||||
|
||||
nanopb-0.3.6 (2016-06-19)
|
||||
Protect against corrupted _count fields in pb_release (#205)
|
||||
Fix error in STATIC_ASSERT with multiple files (#203)
|
||||
Add -D option to specify output directory (#193)
|
||||
Generate MIN/MAX/ARRAYSIZE defines for enums (#194)
|
||||
Generate comments about uncalculable message sizes (#195)
|
||||
Documentation updates (#196, #201)
|
||||
Improvements to test cases.
|
||||
|
||||
nanopb-0.3.5 (2016-02-13)
|
||||
NOTE: If you are using pb_syshdr.h, you will need to add uint_least8_t
|
||||
definition. See docs/migration.rst for details.
|
||||
|
||||
Fix generator crash with Enum inside Oneof (#188)
|
||||
Fix some generator regressions related to .options file path (#172)
|
||||
Add support for platforms without uint8_t (#191)
|
||||
Allow const parameter to pb_istream_from_buffer (#152)
|
||||
Ignore null pointers in pb_release() (#183)
|
||||
Add support for anonymous unions (#184)
|
||||
Add Python3 support to the generator (#169)
|
||||
Add code generator insertion points to generated files (#178)
|
||||
Improvements to CMake script (#181)
|
||||
Improvements to test cases.
|
||||
|
||||
nanopb-0.3.4 (2015-09-26)
|
||||
Fix handling of unsigned 8- and 16-bit enums (issue 164)
|
||||
Fix generator on systems where python = python3. (issue 155)
|
||||
Fix compiler warning on GCC 5.x (issue 171)
|
||||
Make the generator better handle imported .protos (issue 165)
|
||||
Add packed_enum option to generator.
|
||||
Add syntax= line to .proto files (issue 167)
|
||||
Add PlatformIO registry manifest file. (pr 156)
|
||||
|
||||
nanopb-0.3.3 (2015-04-10)
|
||||
Fix missing files in Linux binary package (issue 146)
|
||||
Fix generator bug when oneof is first field in a message. (issue 142)
|
||||
Fix generator error when long_names:false is combined with Oneofs. (issue 147)
|
||||
Fix oneof submessage initialization bug. (issue 149)
|
||||
Fix problem with plugin options on Python 2.7.2 and older. (issue 153)
|
||||
Fix crash when callback is inside oneof field. (issue 148)
|
||||
Switch to .tar.gz format for Mac OS X packages. (issue 154)
|
||||
Always define enum long names so that cross-file references work. (issue 118)
|
||||
Add msgid generator option. (issue 151)
|
||||
Improve comment support in .options files. (issue 145)
|
||||
Updates for the CMake rule file, add cmake example.
|
||||
Better error messages for syntax errors in .options file
|
||||
|
||||
nanopb-0.3.2 (2015-01-24)
|
||||
Fix memory leaks with PB_ENABLE_MALLOC with some submessage hierarchies (issue 138)
|
||||
Implement support for oneofs (C unions). (issues 131, 141)
|
||||
Add int_size option for generator (issue 139)
|
||||
Add compilation option to disable struct packing. (issue 136)
|
||||
Change PB_RETURN_ERROR() macro to avoid compiler warnings (issue 140)
|
||||
Fix build problems with protoc 3.0.0
|
||||
Add support for POINTER type in extensions
|
||||
Initialize also extension fields to defaults in pb_decode().
|
||||
Detect too large varint values when decoding.
|
||||
|
||||
nanopb-0.3.1 (2014-09-11)
|
||||
Fix security issue due to size_t overflows. (issue 132)
|
||||
Fix memory leak with duplicated fields and PB_ENABLE_MALLOC
|
||||
Fix crash if pb_release() is called twice.
|
||||
Fix cyclic message support (issue 130)
|
||||
Fix error in generated initializers for repeated pointer fields.
|
||||
Improve tests (issues 113, 126)
|
||||
|
||||
nanopb-0.3.0 (2014-08-26)
|
||||
NOTE: See docs/migration.html or online at
|
||||
http://koti.kapsi.fi/~jpa/nanopb/docs/migration.html
|
||||
for changes in this version. Most importantly, you need to add
|
||||
pb_common.c to the list of files to compile.
|
||||
|
||||
Separated field iterator logic to pb_common.c (issue 128)
|
||||
Change the _count fields to use pb_size_t datatype (issue 82)
|
||||
Added PB_ prefix to macro names (issue 106)
|
||||
Added #if version guard to generated files (issue 129)
|
||||
Added migration document
|
||||
|
||||
nanopb-0.2.9 (2014-08-09)
|
||||
NOTE: If you are using the -e option with the generator, you have
|
||||
to prepend . to the argument to get the same behaviour as before.
|
||||
|
||||
Do not automatically add a dot with generator -e option. (issue 122)
|
||||
Fix problem with .options file and extension fields. (issue 125)
|
||||
Don't use SIZE_MAX macro, as it is not in C89. (issue 120)
|
||||
Generate #defines for initializing message structures. (issue 79)
|
||||
Add skip_message option to generator. (issue 121)
|
||||
Add PB_PACKED_STRUCT support for Keil MDK-ARM toolchain (issue 119)
|
||||
Give better messages about the .options file path. (issue 124)
|
||||
Improved tests
|
||||
|
||||
nanopb-0.2.8 (2014-05-20)
|
||||
Fix security issue with PB_ENABLE_MALLOC. (issue 117)
|
||||
Add option to not add timestamps to .pb.h and .pb.c preambles. (issue 115)
|
||||
Documentation updates
|
||||
Improved tests
|
||||
|
||||
nanopb-0.2.7 (2014-04-07)
|
||||
Fix bug with default values for extension fields (issue 111)
|
||||
Fix some MISRA-C warnings (issue 91)
|
||||
Implemented optional malloc() support (issue 80)
|
||||
Changed pointer-type bytes field datatype
|
||||
Add a "found" field to pb_extension_t (issue 112)
|
||||
Add convenience function pb_get_encoded_size() (issue 16)
|
||||
|
||||
nanopb-0.2.6 (2014-02-15)
|
||||
Fix generator error with bytes callback fields (issue 99)
|
||||
Fix warnings about large integer constants (issue 102)
|
||||
Add comments to where STATIC_ASSERT is used (issue 96)
|
||||
Add warning about unknown field names on .options (issue 105)
|
||||
Move descriptor.proto to google/protobuf subdirectory (issue 104)
|
||||
Improved tests
|
||||
|
||||
nanopb-0.2.5 (2014-01-01)
|
||||
Fix a bug with encoding negative values in int32 fields (issue 97)
|
||||
Create binary packages of the generator + dependencies (issue 47)
|
||||
Add support for pointer-type fields to the encoder (part of issue 80)
|
||||
Fixed path in FindNanopb.cmake (issue 94)
|
||||
Improved tests
|
||||
|
||||
nanopb-0.2.4 (2013-11-07)
|
||||
Remove the deprecated NANOPB_INTERNALS functions from public API.
|
||||
Document the security model.
|
||||
Check array and bytes max sizes when encoding (issue 90)
|
||||
Add #defines for maximum encoded message size (issue 89)
|
||||
Add #define tags for extension fields (issue 93)
|
||||
Fix MISRA C violations (issue 91)
|
||||
Clean up pb_field_t definition with typedefs.
|
||||
|
||||
nanopb-0.2.3 (2013-09-18)
|
||||
Improve compatibility by removing ternary operator from initializations (issue 88)
|
||||
Fix build error on Visual C++ (issue 84, patch by Markus Schwarzenberg)
|
||||
Don't stop on unsupported extension fields (issue 83)
|
||||
Add an example pb_syshdr.h file for non-C99 compilers
|
||||
Reorganize tests and examples into subfolders (issue 63)
|
||||
Switch from Makefiles to scons for building the tests
|
||||
Make the tests buildable on Windows
|
||||
|
||||
nanopb-0.2.2 (2013-08-18)
|
||||
Add support for extension fields (issue 17)
|
||||
Fix unknown fields in empty message (issue 78)
|
||||
Include the field tags in the generated .pb.h file.
|
||||
Add pb_decode_delimited and pb_encode_delimited wrapper functions (issue 74)
|
||||
Add a section in top of pb.h for changing compilation settings (issue 76)
|
||||
Documentation improvements (issues 12, 77 and others)
|
||||
Improved tests
|
||||
|
||||
nanopb-0.2.1 (2013-04-14)
|
||||
NOTE: The default callback function signature has changed.
|
||||
If you don't want to update your code, define PB_OLD_CALLBACK_STYLE.
|
||||
|
||||
Change the callback function to use void** (issue 69)
|
||||
Add support for defining the nanopb options in a separate file (issue 12)
|
||||
Add support for packed structs in IAR and MSVC (in addition to GCC) (issue 66)
|
||||
Implement error message support for the encoder side (issue 7)
|
||||
Handle unterminated strings when encoding (issue 68)
|
||||
Fix bug with empty strings in repeated string callbacks (issue 73)
|
||||
Fix regression in 0.2.0 with optional callback fields (issue 70)
|
||||
Fix bugs with empty message types (issues 64, 65)
|
||||
Fix some compiler warnings on clang (issue 67)
|
||||
Some portability improvements (issues 60, 62)
|
||||
Various new generator options
|
||||
Improved tests
|
||||
|
||||
nanopb-0.2.0 (2013-03-02)
|
||||
NOTE: This release requires you to regenerate all .pb.c
|
||||
files. Files generated by older versions will not
|
||||
compile anymore.
|
||||
|
||||
Reformat generated .pb.c files using macros (issue 58)
|
||||
Rename PB_HTYPE_ARRAY -> PB_HTYPE_REPEATED
|
||||
Separate PB_HTYPE to PB_ATYPE and PB_HTYPE
|
||||
Move STATIC_ASSERTs to .pb.c file
|
||||
Added CMake file (by Pavel Ilin)
|
||||
Add option to give file extension to generator (by Michael Haberler)
|
||||
Documentation updates
|
||||
|
||||
nanopb-0.1.9 (2013-02-13)
|
||||
Fixed error message bugs (issues 52, 56)
|
||||
Sanitize #ifndef filename (issue 50)
|
||||
Performance improvements
|
||||
Add compile-time option PB_BUFFER_ONLY
|
||||
Add Java package name to nanopb.proto
|
||||
Check for sizeof(double) == 8 (issue 54)
|
||||
Added generator option to ignore some fields. (issue 51)
|
||||
Added generator option to make message structs packed. (issue 49)
|
||||
Add more test cases.
|
||||
|
||||
nanopb-0.1.8 (2012-12-13)
|
||||
Fix bugs in the enum short names introduced in 0.1.7 (issues 42, 43)
|
||||
Fix STATIC_ASSERT macro when using multiple .proto files. (issue 41)
|
||||
Fix missing initialization of istream.errmsg
|
||||
Make tests/Makefile work for non-gcc compilers (issue 40)
|
||||
|
||||
nanopb-0.1.7 (2012-11-11)
|
||||
Remove "skip" mode from pb_istream_t callbacks. Example implementation had a bug. (issue 37)
|
||||
Add option to use shorter names for enum values (issue 38)
|
||||
Improve options support in generator (issues 12, 30)
|
||||
Add nanopb version number to generated files (issue 36)
|
||||
Add extern "C" to generated headers (issue 35)
|
||||
Add names for structs to allow forward declaration (issue 39)
|
||||
Add buffer size check in example (issue 34)
|
||||
Fix build warnings on MS compilers (issue 33)
|
||||
|
||||
nanopb-0.1.6 (2012-09-02)
|
||||
Reorganize the field decoder interface (issue 2)
|
||||
Improve performance in submessage decoding (issue 28)
|
||||
Implement error messages in the decoder side (issue 7)
|
||||
Extended testcases (alltypes test is now complete).
|
||||
Fix some compiler warnings (issues 25, 26, 27, 32).
|
||||
|
||||
nanopb-0.1.5 (2012-08-04)
|
||||
Fix bug in decoder with packed arrays (issue 23).
|
||||
Extended testcases.
|
||||
Fix some compiler warnings.
|
||||
|
||||
nanopb-0.1.4 (2012-07-05)
|
||||
Add compile-time options for easy-to-use >255 field support.
|
||||
Improve the detection of missing required fields.
|
||||
Added example on how to handle union messages.
|
||||
Fix generator error with .proto without messages.
|
||||
Fix problems that stopped the code from compiling with some compilers.
|
||||
Fix some compiler warnings.
|
||||
|
||||
nanopb-0.1.3 (2012-06-12)
|
||||
Refactor the field encoder interface.
|
||||
Improve generator error messages (issue 5)
|
||||
Add descriptor.proto into the #include exclusion list
|
||||
Fix some compiler warnings.
|
||||
|
||||
nanopb-0.1.2 (2012-02-15)
|
||||
Make the generator to generate include for other .proto files (issue 4).
|
||||
Fixed generator not working on Windows (issue 3)
|
||||
|
||||
nanopb-0.1.1 (2012-01-14)
|
||||
Fixed bug in encoder with 'bytes' fields (issue 1).
|
||||
Fixed a bug in the generator that caused a compiler error on sfixed32 and sfixed64 fields.
|
||||
Extended testcases.
|
||||
|
||||
nanopb-0.1.0 (2012-01-06)
|
||||
First stable release.
|
119
extra/nanopb/CMakeLists.txt
Normal file
119
extra/nanopb/CMakeLists.txt
Normal file
|
@ -0,0 +1,119 @@
|
|||
cmake_minimum_required(VERSION 2.8.12)
|
||||
|
||||
project(nanopb C)
|
||||
|
||||
set(nanopb_VERSION_STRING nanopb-0.3.9.3)
|
||||
set(nanopb_SOVERSION 0)
|
||||
|
||||
string(REPLACE "nanopb-" "" nanopb_VERSION ${nanopb_VERSION_STRING})
|
||||
|
||||
option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
|
||||
option(BUILD_STATIC_LIBS "Build static libraries" ON)
|
||||
|
||||
option(nanopb_BUILD_RUNTIME "Build the headers and libraries needed at runtime" ON)
|
||||
option(nanopb_BUILD_GENERATOR "Build the protoc plugin for code generation" ON)
|
||||
option(nanopb_MSVC_STATIC_RUNTIME "Link static runtime libraries" ON)
|
||||
|
||||
if(NOT DEFINED nanopb_PROTOC_PATH)
|
||||
set(nanopb_PROTOC_PATH "protoc")
|
||||
endif()
|
||||
|
||||
if(NOT DEFINED CMAKE_DEBUG_POSTFIX)
|
||||
set(CMAKE_DEBUG_POSTFIX "d")
|
||||
endif()
|
||||
|
||||
include(GNUInstallDirs)
|
||||
|
||||
if(MSVC AND nanopb_MSVC_STATIC_RUNTIME)
|
||||
foreach(flag_var
|
||||
CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
|
||||
CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
|
||||
if(${flag_var} MATCHES "/MD")
|
||||
string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
|
||||
endif(${flag_var} MATCHES "/MD")
|
||||
endforeach(flag_var)
|
||||
endif()
|
||||
|
||||
if(NOT DEFINED CMAKE_INSTALL_CMAKEDIR)
|
||||
set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/nanopb")
|
||||
endif()
|
||||
|
||||
if(nanopb_BUILD_GENERATOR)
|
||||
set(generator_protos nanopb plugin)
|
||||
|
||||
find_package(PythonInterp 2.7 REQUIRED)
|
||||
execute_process(
|
||||
COMMAND ${PYTHON_EXECUTABLE} -c
|
||||
"from distutils import sysconfig; print(sysconfig.get_python_lib(prefix=''))"
|
||||
OUTPUT_VARIABLE PYTHON_INSTDIR
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
)
|
||||
|
||||
foreach(generator_proto IN LISTS generator_protos)
|
||||
string(REGEX REPLACE "([^;]+)" "${PROJECT_SOURCE_DIR}/generator/proto/\\1.proto" generator_proto_file "${generator_proto}")
|
||||
string(REGEX REPLACE "([^;]+)" "\\1_pb2.py" generator_proto_py_file "${generator_proto}")
|
||||
add_custom_command(
|
||||
OUTPUT ${generator_proto_py_file}
|
||||
COMMAND ${nanopb_PROTOC_PATH} --python_out=${PROJECT_BINARY_DIR} -I${PROJECT_SOURCE_DIR}/generator/proto ${generator_proto_file}
|
||||
DEPENDS ${generator_proto_file}
|
||||
)
|
||||
add_custom_target("generate_${generator_proto_py_file}" ALL DEPENDS ${generator_proto_py_file})
|
||||
install(
|
||||
FILES ${PROJECT_BINARY_DIR}/${generator_proto_py_file}
|
||||
DESTINATION ${PYTHON_INSTDIR}
|
||||
)
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
if(nanopb_BUILD_RUNTIME)
|
||||
if(BUILD_SHARED_LIBS)
|
||||
add_library(protobuf-nanopb SHARED
|
||||
pb.h
|
||||
pb_common.h
|
||||
pb_common.c
|
||||
pb_encode.h
|
||||
pb_encode.c
|
||||
pb_decode.h
|
||||
pb_decode.c)
|
||||
set_target_properties(protobuf-nanopb PROPERTIES
|
||||
SOVERSION ${nanopb_SOVERSION})
|
||||
install(TARGETS protobuf-nanopb EXPORT nanopb-targets
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
target_include_directories(protobuf-nanopb INTERFACE
|
||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
||||
)
|
||||
endif()
|
||||
|
||||
if(BUILD_STATIC_LIBS)
|
||||
add_library(protobuf-nanopb-static STATIC
|
||||
pb.h
|
||||
pb_common.h
|
||||
pb_common.c
|
||||
pb_encode.h
|
||||
pb_encode.c
|
||||
pb_decode.h
|
||||
pb_decode.c)
|
||||
set_target_properties(protobuf-nanopb-static PROPERTIES
|
||||
OUTPUT_NAME protobuf-nanopb)
|
||||
install(TARGETS protobuf-nanopb-static EXPORT nanopb-targets
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
target_include_directories(protobuf-nanopb-static INTERFACE
|
||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
||||
)
|
||||
endif()
|
||||
|
||||
configure_file(extra/nanopb-config-version.cmake.in
|
||||
nanopb-config-version.cmake @ONLY)
|
||||
|
||||
install(EXPORT nanopb-targets
|
||||
DESTINATION ${CMAKE_INSTALL_CMAKEDIR}
|
||||
NAMESPACE nanopb::)
|
||||
|
||||
install(FILES extra/nanopb-config.cmake
|
||||
${CMAKE_CURRENT_BINARY_DIR}/nanopb-config-version.cmake
|
||||
DESTINATION ${CMAKE_INSTALL_CMAKEDIR})
|
||||
|
||||
install(FILES pb.h pb_common.h pb_encode.h pb_decode.h
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
endif()
|
32
extra/nanopb/CONTRIBUTING.md
Normal file
32
extra/nanopb/CONTRIBUTING.md
Normal file
|
@ -0,0 +1,32 @@
|
|||
Contributing to Nanopb development
|
||||
==================================
|
||||
|
||||
Reporting issues and requesting features
|
||||
----------------------------------------
|
||||
|
||||
Feel free to report any issues you see or features you would like
|
||||
to see in the future to the Github issue tracker. Using the templates
|
||||
below is preferred:
|
||||
|
||||
* [Report a bug](https://github.com/nanopb/nanopb/issues/new?body=**Steps%20to%20reproduce%20the%20issue**%0a%0a1.%0a2.%0a3.%0a%0a**What%20happens?**%0A%0A**What%20should%20happen?**&labels=Type-Defect)
|
||||
* [Request a feature](https://github.com/nanopb/nanopb/issues/new?body=**What%20should%20the%20feature%20do?**%0A%0A**In%20what%20situation%20would%20the%20feature%20be%20useful?**&labels=Type-Enhancement)
|
||||
|
||||
Requesting help
|
||||
---------------
|
||||
|
||||
If there is something strange going on, but you do not know if
|
||||
it is actually a bug in nanopb, try asking first on the
|
||||
[discussion forum](https://groups.google.com/forum/#!forum/nanopb).
|
||||
|
||||
Pull requests
|
||||
-------------
|
||||
|
||||
Pull requests are welcome!
|
||||
|
||||
If it is not obvious from the commit message, please indicate the
|
||||
same information as you would for an issue report:
|
||||
|
||||
* What functionality it fixes/adds.
|
||||
* How can the problem be reproduced / when would the feature be useful.
|
||||
|
||||
|
20
extra/nanopb/LICENSE.txt
Normal file
20
extra/nanopb/LICENSE.txt
Normal file
|
@ -0,0 +1,20 @@
|
|||
Copyright (c) 2011 Petteri Aimonen <jpa at nanopb.mail.kapsi.fi>
|
||||
|
||||
This software is provided 'as-is', without any express or
|
||||
implied warranty. In no event will the authors be held liable
|
||||
for any damages arising from the use of this software.
|
||||
|
||||
Permission is granted to anyone to use this software for any
|
||||
purpose, including commercial applications, and to alter it and
|
||||
redistribute it freely, subject to the following restrictions:
|
||||
|
||||
1. The origin of this software must not be misrepresented; you
|
||||
must not claim that you wrote the original software. If you use
|
||||
this software in a product, an acknowledgment in the product
|
||||
documentation would be appreciated but is not required.
|
||||
|
||||
2. Altered source versions must be plainly marked as such, and
|
||||
must not be misrepresented as being the original software.
|
||||
|
||||
3. This notice may not be removed or altered from any source
|
||||
distribution.
|
71
extra/nanopb/README.md
Normal file
71
extra/nanopb/README.md
Normal file
|
@ -0,0 +1,71 @@
|
|||
Nanopb - Protocol Buffers for Embedded Systems
|
||||
==============================================
|
||||
|
||||
[![Build Status](https://travis-ci.org/nanopb/nanopb.svg?branch=master)](https://travis-ci.org/nanopb/nanopb)
|
||||
|
||||
Nanopb is a small code-size Protocol Buffers implementation in ansi C. It is
|
||||
especially suitable for use in microcontrollers, but fits any memory
|
||||
restricted system.
|
||||
|
||||
* **Homepage:** https://jpa.kapsi.fi/nanopb/
|
||||
* **Documentation:** https://jpa.kapsi.fi/nanopb/docs/
|
||||
* **Downloads:** https://jpa.kapsi.fi/nanopb/download/
|
||||
* **Forum:** https://groups.google.com/forum/#!forum/nanopb
|
||||
|
||||
|
||||
|
||||
Using the nanopb library
|
||||
------------------------
|
||||
To use the nanopb library, you need to do two things:
|
||||
|
||||
1. Compile your .proto files for nanopb, using `protoc`.
|
||||
2. Include *pb_encode.c*, *pb_decode.c* and *pb_common.c* in your project.
|
||||
|
||||
The easiest way to get started is to study the project in "examples/simple".
|
||||
It contains a Makefile, which should work directly under most Linux systems.
|
||||
However, for any other kind of build system, see the manual steps in
|
||||
README.txt in that folder.
|
||||
|
||||
|
||||
|
||||
Using the Protocol Buffers compiler (protoc)
|
||||
--------------------------------------------
|
||||
The nanopb generator is implemented as a plugin for the Google's own `protoc`
|
||||
compiler. This has the advantage that there is no need to reimplement the
|
||||
basic parsing of .proto files. However, it does mean that you need the
|
||||
Google's protobuf library in order to run the generator.
|
||||
|
||||
If you have downloaded a binary package for nanopb (either Windows, Linux or
|
||||
Mac OS X version), the `protoc` binary is included in the 'generator-bin'
|
||||
folder. In this case, you are ready to go. Simply run this command:
|
||||
|
||||
generator-bin/protoc --nanopb_out=. myprotocol.proto
|
||||
|
||||
However, if you are using a git checkout or a plain source distribution, you
|
||||
need to provide your own version of `protoc` and the Google's protobuf library.
|
||||
On Linux, the necessary packages are `protobuf-compiler` and `python-protobuf`.
|
||||
On Windows, you can either build Google's protobuf library from source or use
|
||||
one of the binary distributions of it. In either case, if you use a separate
|
||||
`protoc`, you need to manually give the path to nanopb generator:
|
||||
|
||||
protoc --plugin=protoc-gen-nanopb=nanopb/generator/protoc-gen-nanopb ...
|
||||
|
||||
|
||||
|
||||
Running the tests
|
||||
-----------------
|
||||
If you want to perform further development of the nanopb core, or to verify
|
||||
its functionality using your compiler and platform, you'll want to run the
|
||||
test suite. The build rules for the test suite are implemented using Scons,
|
||||
so you need to have that installed (ex: `sudo apt install scons` on Ubuntu). To run the tests:
|
||||
|
||||
cd tests
|
||||
scons
|
||||
|
||||
This will show the progress of various test cases. If the output does not
|
||||
end in an error, the test cases were successful.
|
||||
|
||||
Note: Mac OS X by default aliases 'clang' as 'gcc', while not actually
|
||||
supporting the same command line options as gcc does. To run tests on
|
||||
Mac OS X, use: "scons CC=clang CXX=clang". Same way can be used to run
|
||||
tests with different compilers on any platform.
|
1
extra/nanopb/WORKSPACE
Normal file
1
extra/nanopb/WORKSPACE
Normal file
|
@ -0,0 +1 @@
|
|||
workspace(name="com_github_nanopb_nanopb")
|
9
extra/nanopb/docs/Makefile
Normal file
9
extra/nanopb/docs/Makefile
Normal file
|
@ -0,0 +1,9 @@
|
|||
all: index.html concepts.html reference.html security.html migration.html \
|
||||
generator_flow.png
|
||||
|
||||
%.png: %.svg
|
||||
rsvg $< $@
|
||||
|
||||
%.html: %.rst
|
||||
rst2html --stylesheet=lsr.css --link-stylesheet $< $@
|
||||
sed -i 's!</head>!<link href="favicon.ico" type="image/x-icon" rel="shortcut icon" />\n</head>!' $@
|
422
extra/nanopb/docs/concepts.rst
Normal file
422
extra/nanopb/docs/concepts.rst
Normal file
|
@ -0,0 +1,422 @@
|
|||
======================
|
||||
Nanopb: Basic concepts
|
||||
======================
|
||||
|
||||
.. include :: menu.rst
|
||||
|
||||
The things outlined here are the underlying concepts of the nanopb design.
|
||||
|
||||
.. contents::
|
||||
|
||||
Proto files
|
||||
===========
|
||||
All Protocol Buffers implementations use .proto files to describe the message
|
||||
format. The point of these files is to be a portable interface description
|
||||
language.
|
||||
|
||||
Compiling .proto files for nanopb
|
||||
---------------------------------
|
||||
Nanopb uses the Google's protoc compiler to parse the .proto file, and then a
|
||||
python script to generate the C header and source code from it::
|
||||
|
||||
user@host:~$ protoc -omessage.pb message.proto
|
||||
user@host:~$ python ../generator/nanopb_generator.py message.pb
|
||||
Writing to message.h and message.c
|
||||
user@host:~$
|
||||
|
||||
Modifying generator behaviour
|
||||
-----------------------------
|
||||
Using generator options, you can set maximum sizes for fields in order to
|
||||
allocate them statically. The preferred way to do this is to create an .options
|
||||
file with the same name as your .proto file::
|
||||
|
||||
# Foo.proto
|
||||
message Foo {
|
||||
required string name = 1;
|
||||
}
|
||||
|
||||
::
|
||||
|
||||
# Foo.options
|
||||
Foo.name max_size:16
|
||||
|
||||
For more information on this, see the `Proto file options`_ section in the
|
||||
reference manual.
|
||||
|
||||
.. _`Proto file options`: reference.html#proto-file-options
|
||||
|
||||
Streams
|
||||
=======
|
||||
|
||||
Nanopb uses streams for accessing the data in encoded format.
|
||||
The stream abstraction is very lightweight, and consists of a structure (*pb_ostream_t* or *pb_istream_t*) which contains a pointer to a callback function.
|
||||
|
||||
There are a few generic rules for callback functions:
|
||||
|
||||
#) Return false on IO errors. The encoding or decoding process will abort immediately.
|
||||
#) Use state to store your own data, such as a file descriptor.
|
||||
#) *bytes_written* and *bytes_left* are updated by pb_write and pb_read.
|
||||
#) Your callback may be used with substreams. In this case *bytes_left*, *bytes_written* and *max_size* have smaller values than the original stream. Don't use these values to calculate pointers.
|
||||
#) Always read or write the full requested length of data. For example, POSIX *recv()* needs the *MSG_WAITALL* parameter to accomplish this.
|
||||
|
||||
Output streams
|
||||
--------------
|
||||
|
||||
::
|
||||
|
||||
struct _pb_ostream_t
|
||||
{
|
||||
bool (*callback)(pb_ostream_t *stream, const uint8_t *buf, size_t count);
|
||||
void *state;
|
||||
size_t max_size;
|
||||
size_t bytes_written;
|
||||
};
|
||||
|
||||
The *callback* for output stream may be NULL, in which case the stream simply counts the number of bytes written. In this case, *max_size* is ignored.
|
||||
|
||||
Otherwise, if *bytes_written* + bytes_to_be_written is larger than *max_size*, pb_write returns false before doing anything else. If you don't want to limit the size of the stream, pass SIZE_MAX.
|
||||
|
||||
**Example 1:**
|
||||
|
||||
This is the way to get the size of the message without storing it anywhere::
|
||||
|
||||
Person myperson = ...;
|
||||
pb_ostream_t sizestream = {0};
|
||||
pb_encode(&sizestream, Person_fields, &myperson);
|
||||
printf("Encoded size is %d\n", sizestream.bytes_written);
|
||||
|
||||
**Example 2:**
|
||||
|
||||
Writing to stdout::
|
||||
|
||||
bool callback(pb_ostream_t *stream, const uint8_t *buf, size_t count)
|
||||
{
|
||||
FILE *file = (FILE*) stream->state;
|
||||
return fwrite(buf, 1, count, file) == count;
|
||||
}
|
||||
|
||||
pb_ostream_t stdoutstream = {&callback, stdout, SIZE_MAX, 0};
|
||||
|
||||
Input streams
|
||||
-------------
|
||||
For input streams, there is one extra rule:
|
||||
|
||||
#) You don't need to know the length of the message in advance. After getting EOF error when reading, set bytes_left to 0 and return false. Pb_decode will detect this and if the EOF was in a proper position, it will return true.
|
||||
|
||||
Here is the structure::
|
||||
|
||||
struct _pb_istream_t
|
||||
{
|
||||
bool (*callback)(pb_istream_t *stream, uint8_t *buf, size_t count);
|
||||
void *state;
|
||||
size_t bytes_left;
|
||||
};
|
||||
|
||||
The *callback* must always be a function pointer. *Bytes_left* is an upper limit on the number of bytes that will be read. You can use SIZE_MAX if your callback handles EOF as described above.
|
||||
|
||||
**Example:**
|
||||
|
||||
This function binds an input stream to stdin:
|
||||
|
||||
::
|
||||
|
||||
bool callback(pb_istream_t *stream, uint8_t *buf, size_t count)
|
||||
{
|
||||
FILE *file = (FILE*)stream->state;
|
||||
bool status;
|
||||
|
||||
if (buf == NULL)
|
||||
{
|
||||
while (count-- && fgetc(file) != EOF);
|
||||
return count == 0;
|
||||
}
|
||||
|
||||
status = (fread(buf, 1, count, file) == count);
|
||||
|
||||
if (feof(file))
|
||||
stream->bytes_left = 0;
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
pb_istream_t stdinstream = {&callback, stdin, SIZE_MAX};
|
||||
|
||||
Data types
|
||||
==========
|
||||
|
||||
Most Protocol Buffers datatypes have directly corresponding C datatypes, such as int32 is int32_t, float is float and bool is bool. However, the variable-length datatypes are more complex:
|
||||
|
||||
1) Strings, bytes and repeated fields of any type map to callback functions by default.
|
||||
2) If there is a special option *(nanopb).max_size* specified in the .proto file, string maps to null-terminated char array and bytes map to a structure containing a char array and a size field.
|
||||
3) If *(nanopb).fixed_length* is set to *true* and *(nanopb).max_size* is also set, then bytes map to an inline byte array of fixed size.
|
||||
4) If there is a special option *(nanopb).max_count* specified on a repeated field, it maps to an array of whatever type is being repeated. Another field will be created for the actual number of entries stored.
|
||||
5) If *(nanopb).fixed_count* is set to *true* and *(nanopb).max_count* is also set, the field for the actual number of entries will not by created as the count is always assumed to be max count.
|
||||
|
||||
=============================================================================== =======================
|
||||
field in .proto autogenerated in .h
|
||||
=============================================================================== =======================
|
||||
required string name = 1; pb_callback_t name;
|
||||
required string name = 1 [(nanopb).max_size = 40]; char name[40];
|
||||
repeated string name = 1 [(nanopb).max_size = 40]; pb_callback_t name;
|
||||
repeated string name = 1 [(nanopb).max_size = 40, (nanopb).max_count = 5]; | size_t name_count;
|
||||
| char name[5][40];
|
||||
required bytes data = 1 [(nanopb).max_size = 40]; | typedef struct {
|
||||
| size_t size;
|
||||
| pb_byte_t bytes[40];
|
||||
| } Person_data_t;
|
||||
| Person_data_t data;
|
||||
required bytes data = 1 [(nanopb).max_size = 40, (nanopb).fixed_length = true]; | pb_byte_t data[40];
|
||||
repeated int32 data = 1 [(nanopb).max_count = 5, (nanopb).fixed_count true]; | int32_t data[5];
|
||||
=============================================================================== =======================
|
||||
|
||||
The maximum lengths are checked in runtime. If string/bytes/array exceeds the allocated length, *pb_decode* will return false.
|
||||
|
||||
Note: For the *bytes* datatype, the field length checking may not be exact.
|
||||
The compiler may add some padding to the *pb_bytes_t* structure, and the nanopb runtime doesn't know how much of the structure size is padding. Therefore it uses the whole length of the structure for storing data, which is not very smart but shouldn't cause problems. In practise, this means that if you specify *(nanopb).max_size=5* on a *bytes* field, you may be able to store 6 bytes there. For the *string* field type, the length limit is exact.
|
||||
|
||||
Note: When using the *fixed_count* option, the decoder assumes the repeated elements are
|
||||
received sequentially or that repeated elements for a non-packed field will not be interleaved with
|
||||
another *fixed_count* non-packed field.
|
||||
|
||||
Field callbacks
|
||||
===============
|
||||
When a field has dynamic length, nanopb cannot statically allocate storage for it. Instead, it allows you to handle the field in whatever way you want, using a callback function.
|
||||
|
||||
The `pb_callback_t`_ structure contains a function pointer and a *void* pointer called *arg* you can use for passing data to the callback. If the function pointer is NULL, the field will be skipped. A pointer to the *arg* is passed to the function, so that it can modify it and retrieve the value.
|
||||
|
||||
The actual behavior of the callback function is different in encoding and decoding modes. In encoding mode, the callback is called once and should write out everything, including field tags. In decoding mode, the callback is called repeatedly for every data item.
|
||||
|
||||
.. _`pb_callback_t`: reference.html#pb-callback-t
|
||||
|
||||
Encoding callbacks
|
||||
------------------
|
||||
::
|
||||
|
||||
bool (*encode)(pb_ostream_t *stream, const pb_field_t *field, void * const *arg);
|
||||
|
||||
When encoding, the callback should write out complete fields, including the wire type and field number tag. It can write as many or as few fields as it likes. For example, if you want to write out an array as *repeated* field, you should do it all in a single call.
|
||||
|
||||
Usually you can use `pb_encode_tag_for_field`_ to encode the wire type and tag number of the field. However, if you want to encode a repeated field as a packed array, you must call `pb_encode_tag`_ instead to specify a wire type of *PB_WT_STRING*.
|
||||
|
||||
If the callback is used in a submessage, it will be called multiple times during a single call to `pb_encode`_. In this case, it must produce the same amount of data every time. If the callback is directly in the main message, it is called only once.
|
||||
|
||||
.. _`pb_encode`: reference.html#pb-encode
|
||||
.. _`pb_encode_tag_for_field`: reference.html#pb-encode-tag-for-field
|
||||
.. _`pb_encode_tag`: reference.html#pb-encode-tag
|
||||
|
||||
This callback writes out a dynamically sized string::
|
||||
|
||||
bool write_string(pb_ostream_t *stream, const pb_field_t *field, void * const *arg)
|
||||
{
|
||||
char *str = get_string_from_somewhere();
|
||||
if (!pb_encode_tag_for_field(stream, field))
|
||||
return false;
|
||||
|
||||
return pb_encode_string(stream, (uint8_t*)str, strlen(str));
|
||||
}
|
||||
|
||||
Decoding callbacks
|
||||
------------------
|
||||
::
|
||||
|
||||
bool (*decode)(pb_istream_t *stream, const pb_field_t *field, void **arg);
|
||||
|
||||
When decoding, the callback receives a length-limited substring that reads the contents of a single field. The field tag has already been read. For *string* and *bytes*, the length value has already been parsed, and is available at *stream->bytes_left*.
|
||||
|
||||
The callback will be called multiple times for repeated fields. For packed fields, you can either read multiple values until the stream ends, or leave it to `pb_decode`_ to call your function over and over until all values have been read.
|
||||
|
||||
.. _`pb_decode`: reference.html#pb-decode
|
||||
|
||||
This callback reads multiple integers and prints them::
|
||||
|
||||
bool read_ints(pb_istream_t *stream, const pb_field_t *field, void **arg)
|
||||
{
|
||||
while (stream->bytes_left)
|
||||
{
|
||||
uint64_t value;
|
||||
if (!pb_decode_varint(stream, &value))
|
||||
return false;
|
||||
printf("%lld\n", value);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
Field description array
|
||||
=======================
|
||||
|
||||
For using the *pb_encode* and *pb_decode* functions, you need an array of pb_field_t constants describing the structure you wish to encode. This description is usually autogenerated from .proto file.
|
||||
|
||||
For example this submessage in the Person.proto file::
|
||||
|
||||
message Person {
|
||||
message PhoneNumber {
|
||||
required string number = 1 [(nanopb).max_size = 40];
|
||||
optional PhoneType type = 2 [default = HOME];
|
||||
}
|
||||
}
|
||||
|
||||
generates this field description array for the structure *Person_PhoneNumber*::
|
||||
|
||||
const pb_field_t Person_PhoneNumber_fields[3] = {
|
||||
PB_FIELD( 1, STRING , REQUIRED, STATIC, Person_PhoneNumber, number, number, 0),
|
||||
PB_FIELD( 2, ENUM , OPTIONAL, STATIC, Person_PhoneNumber, type, number, &Person_PhoneNumber_type_default),
|
||||
PB_LAST_FIELD
|
||||
};
|
||||
|
||||
Oneof
|
||||
=====
|
||||
Protocol Buffers supports `oneof`_ sections. Here is an example of ``oneof`` usage::
|
||||
|
||||
message MsgType1 {
|
||||
required int32 value = 1;
|
||||
}
|
||||
|
||||
message MsgType2 {
|
||||
required bool value = 1;
|
||||
}
|
||||
|
||||
message MsgType3 {
|
||||
required int32 value1 = 1;
|
||||
required int32 value2 = 2;
|
||||
}
|
||||
|
||||
message MyMessage {
|
||||
required uint32 uid = 1;
|
||||
required uint32 pid = 2;
|
||||
required uint32 utime = 3;
|
||||
|
||||
oneof payload {
|
||||
MsgType1 msg1 = 4;
|
||||
MsgType2 msg2 = 5;
|
||||
MsgType3 msg3 = 6;
|
||||
}
|
||||
}
|
||||
|
||||
Nanopb will generate ``payload`` as a C union and add an additional field ``which_payload``::
|
||||
|
||||
typedef struct _MyMessage {
|
||||
uint32_t uid;
|
||||
uint32_t pid;
|
||||
uint32_t utime;
|
||||
pb_size_t which_payload;
|
||||
union {
|
||||
MsgType1 msg1;
|
||||
MsgType2 msg2;
|
||||
MsgType3 msg3;
|
||||
} payload;
|
||||
/* @@protoc_insertion_point(struct:MyMessage) */
|
||||
} MyMessage;
|
||||
|
||||
``which_payload`` indicates which of the ``oneof`` fields is actually set.
|
||||
The user is expected to set the filed manually using the correct field tag::
|
||||
|
||||
MyMessage msg = MyMessage_init_zero;
|
||||
msg.payload.msg2.value = true;
|
||||
msg.which_payload = MyMessage_msg2_tag;
|
||||
|
||||
Notice that neither ``which_payload`` field nor the unused fileds in ``payload``
|
||||
will consume any space in the resulting encoded message.
|
||||
|
||||
When a C union is used to represent a ``oneof`` section, the union cannot have
|
||||
callback fields or nested callback fields. Otherwise, the decoding process may
|
||||
fail. If callbacks must be used inside a ``oneof`` section, the generator
|
||||
option *no_unions* should be set to *true* for that section.
|
||||
|
||||
.. _`oneof`: https://developers.google.com/protocol-buffers/docs/reference/proto2-spec#oneof_and_oneof_field
|
||||
|
||||
Extension fields
|
||||
================
|
||||
Protocol Buffers supports a concept of `extension fields`_, which are
|
||||
additional fields to a message, but defined outside the actual message.
|
||||
The definition can even be in a completely separate .proto file.
|
||||
|
||||
The base message is declared as extensible by keyword *extensions* in
|
||||
the .proto file::
|
||||
|
||||
message MyMessage {
|
||||
.. fields ..
|
||||
extensions 100 to 199;
|
||||
}
|
||||
|
||||
For each extensible message, *nanopb_generator.py* declares an additional
|
||||
callback field called *extensions*. The field and associated datatype
|
||||
*pb_extension_t* forms a linked list of handlers. When an unknown field is
|
||||
encountered, the decoder calls each handler in turn until either one of them
|
||||
handles the field, or the list is exhausted.
|
||||
|
||||
The actual extensions are declared using the *extend* keyword in the .proto,
|
||||
and are in the global namespace::
|
||||
|
||||
extend MyMessage {
|
||||
optional int32 myextension = 100;
|
||||
}
|
||||
|
||||
For each extension, *nanopb_generator.py* creates a constant of type
|
||||
*pb_extension_type_t*. To link together the base message and the extension,
|
||||
you have to:
|
||||
|
||||
1. Allocate storage for your field, matching the datatype in the .proto.
|
||||
For example, for a *int32* field, you need a *int32_t* variable to store
|
||||
the value.
|
||||
2. Create a *pb_extension_t* constant, with pointers to your variable and
|
||||
to the generated *pb_extension_type_t*.
|
||||
3. Set the *message.extensions* pointer to point to the *pb_extension_t*.
|
||||
|
||||
An example of this is available in *tests/test_encode_extensions.c* and
|
||||
*tests/test_decode_extensions.c*.
|
||||
|
||||
.. _`extension fields`: https://developers.google.com/protocol-buffers/docs/proto#extensions
|
||||
|
||||
Default values
|
||||
==============
|
||||
Protobuf has two syntax variants, proto2 and proto3. Of these proto2 has user
|
||||
definable default values that can be given in .proto file::
|
||||
|
||||
message MyMessage {
|
||||
optional bytes foo = 1 [default = "ABC\x01\x02\x03"];
|
||||
optional string bar = 2 [default = "åäö"];
|
||||
}
|
||||
|
||||
Nanopb will generate both static and runtime initialization for the default
|
||||
values. In `myproto.pb.h` there will be a `#define MyMessage_init_default` that
|
||||
can be used to initialize whole message into default values::
|
||||
|
||||
MyMessage msg = MyMessage_init_default;
|
||||
|
||||
In addition to this, `pb_decode()` will initialize message fields to defaults
|
||||
at runtime. If this is not desired, `pb_decode_noinit()` can be used instead.
|
||||
|
||||
Message framing
|
||||
===============
|
||||
Protocol Buffers does not specify a method of framing the messages for transmission.
|
||||
This is something that must be provided by the library user, as there is no one-size-fits-all
|
||||
solution. Typical needs for a framing format are to:
|
||||
|
||||
1. Encode the message length.
|
||||
2. Encode the message type.
|
||||
3. Perform any synchronization and error checking that may be needed depending on application.
|
||||
|
||||
For example UDP packets already fullfill all the requirements, and TCP streams typically only
|
||||
need a way to identify the message length and type. Lower level interfaces such as serial ports
|
||||
may need a more robust frame format, such as HDLC (high-level data link control).
|
||||
|
||||
Nanopb provides a few helpers to facilitate implementing framing formats:
|
||||
|
||||
1. Functions *pb_encode_delimited* and *pb_decode_delimited* prefix the message data with a varint-encoded length.
|
||||
2. Union messages and oneofs are supported in order to implement top-level container messages.
|
||||
3. Message IDs can be specified using the *(nanopb_msgopt).msgid* option and can then be accessed from the header.
|
||||
|
||||
Return values and error handling
|
||||
================================
|
||||
|
||||
Most functions in nanopb return bool: *true* means success, *false* means failure. There is also some support for error messages for debugging purposes: the error messages go in *stream->errmsg*.
|
||||
|
||||
The error messages help in guessing what is the underlying cause of the error. The most common error conditions are:
|
||||
|
||||
1) Running out of memory, i.e. stack overflow.
|
||||
2) Invalid field descriptors (would usually mean a bug in the generator).
|
||||
3) IO errors in your own stream callbacks.
|
||||
4) Errors that happen in your callback functions.
|
||||
5) Exceeding the max_size or bytes_left of a stream.
|
||||
6) Exceeding the max_size/max_count of a string or array field
|
||||
7) Invalid protocol buffers binary message.
|
2869
extra/nanopb/docs/generator_flow.svg
Normal file
2869
extra/nanopb/docs/generator_flow.svg
Normal file
File diff suppressed because it is too large
Load diff
After Width: | Height: | Size: 112 KiB |
127
extra/nanopb/docs/index.rst
Normal file
127
extra/nanopb/docs/index.rst
Normal file
|
@ -0,0 +1,127 @@
|
|||
=============================================
|
||||
Nanopb: Protocol Buffers with small code size
|
||||
=============================================
|
||||
|
||||
.. include :: menu.rst
|
||||
|
||||
Nanopb is an ANSI-C library for encoding and decoding messages in Google's `Protocol Buffers`__ format with minimal requirements for RAM and code space.
|
||||
It is primarily suitable for 32-bit microcontrollers.
|
||||
|
||||
__ https://developers.google.com/protocol-buffers/docs/reference/overview
|
||||
|
||||
Overall structure
|
||||
=================
|
||||
|
||||
For the runtime program, you always need *pb.h* for type declarations.
|
||||
Depending on whether you want to encode, decode, or both, you also need *pb_encode.h/c* or *pb_decode.h/c*.
|
||||
|
||||
The high-level encoding and decoding functions take an array of *pb_field_t* structures, which describes the fields of a message structure. Usually you want these autogenerated from a *.proto* file. The tool script *nanopb_generator.py* accomplishes this.
|
||||
|
||||
.. image:: generator_flow.png
|
||||
|
||||
So a typical project might include these files:
|
||||
|
||||
1) Nanopb runtime library:
|
||||
- pb.h
|
||||
- pb_common.h and pb_common.c (always needed)
|
||||
- pb_decode.h and pb_decode.c (needed for decoding messages)
|
||||
- pb_encode.h and pb_encode.c (needed for encoding messages)
|
||||
2) Protocol description (you can have many):
|
||||
- person.proto (just an example)
|
||||
- person.pb.c (autogenerated, contains initializers for const arrays)
|
||||
- person.pb.h (autogenerated, contains type declarations)
|
||||
|
||||
Features and limitations
|
||||
========================
|
||||
|
||||
**Features**
|
||||
|
||||
#) Pure C runtime
|
||||
#) Small code size (2–10 kB depending on processor, plus any message definitions)
|
||||
#) Small ram usage (typically ~300 bytes, plus any message structs)
|
||||
#) Allows specifying maximum size for strings and arrays, so that they can be allocated statically.
|
||||
#) No malloc needed: everything can be allocated statically or on the stack. Optional malloc support available.
|
||||
#) You can use either encoder or decoder alone to cut the code size in half.
|
||||
#) Support for most protobuf features, including: all data types, nested submessages, default values, repeated and optional fields, oneofs, packed arrays, extension fields.
|
||||
#) Callback mechanism for handling messages larger than can fit in available RAM.
|
||||
#) Extensive set of tests.
|
||||
|
||||
**Limitations**
|
||||
|
||||
#) Some speed has been sacrificed for code size.
|
||||
#) Encoding is focused on writing to streams. For memory buffers only it could be made more efficient.
|
||||
#) The deprecated Protocol Buffers feature called "groups" is not supported.
|
||||
#) Fields in the generated structs are ordered by the tag number, instead of the natural ordering in .proto file.
|
||||
#) Unknown fields are not preserved when decoding and re-encoding a message.
|
||||
#) Reflection (runtime introspection) is not supported. E.g. you can't request a field by giving its name in a string.
|
||||
#) Numeric arrays are always encoded as packed, even if not marked as packed in .proto.
|
||||
#) Cyclic references between messages are supported only in callback and malloc mode.
|
||||
|
||||
Getting started
|
||||
===============
|
||||
|
||||
For starters, consider this simple message::
|
||||
|
||||
message Example {
|
||||
required int32 value = 1;
|
||||
}
|
||||
|
||||
Save this in *message.proto* and compile it::
|
||||
|
||||
user@host:~$ protoc -omessage.pb message.proto
|
||||
user@host:~$ python nanopb/generator/nanopb_generator.py message.pb
|
||||
|
||||
You should now have in *message.pb.h*::
|
||||
|
||||
typedef struct {
|
||||
int32_t value;
|
||||
} Example;
|
||||
|
||||
extern const pb_field_t Example_fields[2];
|
||||
|
||||
Now in your main program do this to encode a message::
|
||||
|
||||
Example mymessage = {42};
|
||||
uint8_t buffer[10];
|
||||
pb_ostream_t stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
|
||||
pb_encode(&stream, Example_fields, &mymessage);
|
||||
|
||||
After that, buffer will contain the encoded message.
|
||||
The number of bytes in the message is stored in *stream.bytes_written*.
|
||||
You can feed the message to *protoc --decode=Example message.proto* to verify its validity.
|
||||
|
||||
For a complete example of the simple case, see *example/simple.c*.
|
||||
For a more complex example with network interface, see the *example/network_server* subdirectory.
|
||||
|
||||
Compiler requirements
|
||||
=====================
|
||||
Nanopb should compile with most ansi-C compatible compilers. It however
|
||||
requires a few header files to be available:
|
||||
|
||||
#) *string.h*, with these functions: *strlen*, *memcpy*, *memset*
|
||||
#) *stdint.h*, for definitions of *int32_t* etc.
|
||||
#) *stddef.h*, for definition of *size_t*
|
||||
#) *stdbool.h*, for definition of *bool*
|
||||
|
||||
If these header files do not come with your compiler, you can use the
|
||||
file *extra/pb_syshdr.h* instead. It contains an example of how to provide
|
||||
the dependencies. You may have to edit it a bit to suit your custom platform.
|
||||
|
||||
To use the pb_syshdr.h, define *PB_SYSTEM_HEADER* as *"pb_syshdr.h"* (including the quotes).
|
||||
Similarly, you can provide a custom include file, which should provide all the dependencies
|
||||
listed above.
|
||||
|
||||
Running the test cases
|
||||
======================
|
||||
Extensive unittests and test cases are included under the *tests* folder.
|
||||
|
||||
To build the tests, you will need the `scons`__ build system. The tests should
|
||||
be runnable on most platforms. Windows and Linux builds are regularly tested.
|
||||
|
||||
__ http://www.scons.org/
|
||||
|
||||
In addition to the build system, you will also need a working Google Protocol
|
||||
Buffers *protoc* compiler, and the Python bindings for Protocol Buffers. On
|
||||
Debian-based systems, install the following packages: *protobuf-compiler*,
|
||||
*python-protobuf* and *libprotobuf-dev*.
|
||||
|
BIN
extra/nanopb/docs/logo/logo.png
Normal file
BIN
extra/nanopb/docs/logo/logo.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 15 KiB |
1470
extra/nanopb/docs/logo/logo.svg
Normal file
1470
extra/nanopb/docs/logo/logo.svg
Normal file
File diff suppressed because one or more lines are too long
After Width: | Height: | Size: 102 KiB |
BIN
extra/nanopb/docs/logo/logo16px.png
Normal file
BIN
extra/nanopb/docs/logo/logo16px.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 854 B |
BIN
extra/nanopb/docs/logo/logo48px.png
Normal file
BIN
extra/nanopb/docs/logo/logo48px.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.5 KiB |
240
extra/nanopb/docs/lsr.css
Normal file
240
extra/nanopb/docs/lsr.css
Normal file
|
@ -0,0 +1,240 @@
|
|||
/*
|
||||
Author: Peter Parente
|
||||
Date: 2008/01/22
|
||||
Version: 1.0 (modified)
|
||||
Copyright: This stylesheet has been placed in the public domain - free to edit and use for all uses.
|
||||
*/
|
||||
|
||||
body {
|
||||
font: 100% sans-serif;
|
||||
background: #ffffff;
|
||||
color: black;
|
||||
margin: 2em;
|
||||
padding: 0em 2em;
|
||||
}
|
||||
|
||||
p.topic-title {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
table.docinfo {
|
||||
text-align: left;
|
||||
margin: 2em 0em;
|
||||
}
|
||||
|
||||
a[href] {
|
||||
color: #436976;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
a.toc-backref {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
h1 a[href] {
|
||||
color: #003a6b;
|
||||
text-decoration: none;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
a.strong {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
img {
|
||||
margin: 0;
|
||||
border: 0;
|
||||
}
|
||||
|
||||
p {
|
||||
margin: 0.5em 0 1em 0;
|
||||
line-height: 1.5em;
|
||||
}
|
||||
|
||||
p a:visited {
|
||||
color: purple;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
p a:active {
|
||||
color: red;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
a:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
p img {
|
||||
border: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
p.rubric {
|
||||
font-weight: bold;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
em {
|
||||
font-style: normal;
|
||||
font-family: monospace;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
pre {
|
||||
border-left: 3px double #aaa;
|
||||
padding: 5px 10px;
|
||||
background-color: #f6f6f6;
|
||||
}
|
||||
|
||||
h1.title {
|
||||
color: #003a6b;
|
||||
font-size: 180%;
|
||||
margin-bottom: 0em;
|
||||
}
|
||||
|
||||
h2.subtitle {
|
||||
color: #003a6b;
|
||||
border-bottom: 0px;
|
||||
}
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
color: #555;
|
||||
background-color: transparent;
|
||||
margin: 0em;
|
||||
padding-top: 0.5em;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 150%;
|
||||
margin-bottom: 0.5em;
|
||||
border-bottom: 2px solid #aaa;
|
||||
}
|
||||
|
||||
h2 {
|
||||
font-size: 130%;
|
||||
margin-bottom: 0.5em;
|
||||
border-bottom: 1px solid #aaa;
|
||||
}
|
||||
|
||||
h3 {
|
||||
font-size: 120%;
|
||||
margin-bottom: 0.5em;
|
||||
}
|
||||
|
||||
h4 {
|
||||
font-size: 110%;
|
||||
font-weight: bold;
|
||||
margin-bottom: 0.5em;
|
||||
}
|
||||
|
||||
h5 {
|
||||
font-size: 105%;
|
||||
font-weight: bold;
|
||||
margin-bottom: 0.5em;
|
||||
}
|
||||
|
||||
h6 {
|
||||
font-size: 100%;
|
||||
font-weight: bold;
|
||||
margin-bottom: 0.5em;
|
||||
}
|
||||
|
||||
dt {
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
dd {
|
||||
margin-bottom: 1.5em;
|
||||
}
|
||||
|
||||
div.admonition, div.note, div.tip, div.caution, div.important {
|
||||
margin: 2em 2em;
|
||||
padding: 0em 1em;
|
||||
border-top: 1px solid #aaa;
|
||||
border-left: 1px solid #aaa;
|
||||
border-bottom: 2px solid #555;
|
||||
border-right: 2px solid #555;
|
||||
}
|
||||
|
||||
div.important {
|
||||
background: transparent url('../images/important.png') 10px 2px no-repeat;
|
||||
}
|
||||
|
||||
div.caution {
|
||||
background: transparent url('../images/caution.png') 10px 2px no-repeat;
|
||||
}
|
||||
|
||||
div.note {
|
||||
background: transparent url('../images/note.png') 10px 2px no-repeat;
|
||||
}
|
||||
|
||||
div.tip {
|
||||
background: transparent url('../images/tip.png') 10px 2px no-repeat;
|
||||
}
|
||||
|
||||
div.admonition-example {
|
||||
background: transparent url('../images/tip.png') 10px 2px no-repeat;
|
||||
}
|
||||
|
||||
div.admonition-critical-example {
|
||||
background: transparent url('../images/important.png') 10px 2px no-repeat;
|
||||
}
|
||||
|
||||
p.admonition-title {
|
||||
font-weight: bold;
|
||||
border-bottom: 1px solid #aaa;
|
||||
padding-left: 30px;
|
||||
}
|
||||
|
||||
table.docutils {
|
||||
text-align: left;
|
||||
border: 1px solid gray;
|
||||
border-collapse: collapse;
|
||||
margin: 1.5em 0em;
|
||||
}
|
||||
|
||||
table.docutils caption {
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
table.docutils td, table.docutils th {
|
||||
padding: 0.25em 0.5em;
|
||||
}
|
||||
|
||||
th.field-name {
|
||||
text-align: right;
|
||||
width: 15em;
|
||||
}
|
||||
|
||||
table.docutils th {
|
||||
font-family: monospace;
|
||||
background-color: #f6f6f6;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
table.field-list {
|
||||
border: none;
|
||||
}
|
||||
|
||||
div.sidebar {
|
||||
margin: 2em 2em 2em 0em;
|
||||
padding: 0em 1em;
|
||||
border-top: 1px solid #aaa;
|
||||
border-left: 1px solid #aaa;
|
||||
border-bottom: 2px solid #555;
|
||||
border-right: 2px solid #555;
|
||||
}
|
||||
|
||||
p.sidebar-title {
|
||||
margin-bottom: 0em;
|
||||
color: #003a6b;
|
||||
border-bottom: 1px solid #aaa;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
p.sidebar-subtitle {
|
||||
margin-top: 0em;
|
||||
font-style: italic;
|
||||
color: #003a6b;
|
||||
}
|
13
extra/nanopb/docs/menu.rst
Normal file
13
extra/nanopb/docs/menu.rst
Normal file
|
@ -0,0 +1,13 @@
|
|||
.. sidebar :: Documentation index
|
||||
|
||||
1) `Overview`_
|
||||
2) `Concepts`_
|
||||
3) `API reference`_
|
||||
4) `Security model`_
|
||||
5) `Migration from older versions`_
|
||||
|
||||
.. _`Overview`: index.html
|
||||
.. _`Concepts`: concepts.html
|
||||
.. _`API reference`: reference.html
|
||||
.. _`Security model`: security.html
|
||||
.. _`Migration from older versions`: migration.html
|
320
extra/nanopb/docs/migration.rst
Normal file
320
extra/nanopb/docs/migration.rst
Normal file
|
@ -0,0 +1,320 @@
|
|||
=====================================
|
||||
Nanopb: Migration from older versions
|
||||
=====================================
|
||||
|
||||
.. include :: menu.rst
|
||||
|
||||
This document details all the breaking changes that have been made to nanopb
|
||||
since its initial release. For each change, the rationale and required
|
||||
modifications of user applications are explained. Also any error indications
|
||||
are included, in order to make it easier to find this document.
|
||||
|
||||
.. contents ::
|
||||
|
||||
Nanopb-0.3.9.1, 0.4.0 (2018-xx-xx)
|
||||
==================================
|
||||
|
||||
Fix handling of string and bytes default values
|
||||
-----------------------------------------------
|
||||
|
||||
**Rationale:** Previously nanopb didn't properly decode special character
|
||||
escapes like \\200 emitted by protoc. This caused these escapes to end up
|
||||
verbatim in the default values in .pb.c file.
|
||||
|
||||
**Changes:** Escapes are now decoded, and e.g. "\\200" or "\\x80" results in
|
||||
{0x80} for bytes field and "\\x80" for string field.
|
||||
|
||||
**Required actions:** If code has previously relied on '\\' in default value
|
||||
being passed through verbatim, it must now be changed to '\\\\'.
|
||||
|
||||
Nanopb-0.3.8 (2017-03-05)
|
||||
=========================
|
||||
|
||||
Fully drain substreams before closing
|
||||
-------------------------------------
|
||||
|
||||
**Rationale:** If the substream functions were called directly and the caller
|
||||
did not completely empty the substring before closing it, the parent stream
|
||||
would be put into an incorrect state.
|
||||
|
||||
**Changes:** *pb_close_string_substream* can now error and returns a boolean.
|
||||
|
||||
**Required actions:** Add error checking onto any call to
|
||||
*pb_close_string_substream*.
|
||||
|
||||
Change oneof format in .pb.c files
|
||||
----------------------------------
|
||||
|
||||
**Rationale:** Previously two oneofs in a single message would be erroneously
|
||||
handled as part of the same union.
|
||||
|
||||
**Changes:** Oneofs fields now use special *PB_DATAOFFSET_UNION* offset type
|
||||
in generated .pb.c files to distinguish whether they are the first or following
|
||||
field inside an union.
|
||||
|
||||
**Required actions:** Regenerate *.pb.c/.pb.h* files with new nanopb version if
|
||||
oneofs are used.
|
||||
|
||||
Nanopb-0.3.5 (2016-02-13)
|
||||
=========================
|
||||
|
||||
Add support for platforms without uint8_t
|
||||
-----------------------------------------
|
||||
**Rationale:** Some platforms cannot access 8-bit sized values directly, and
|
||||
do not define *uint8_t*. Nanopb previously didn't support these platforms.
|
||||
|
||||
**Changes:** References to *uint8_t* were replaced with several alternatives,
|
||||
one of them being a new *pb_byte_t* typedef. This in turn uses *uint_least8_t*
|
||||
which means the smallest available type.
|
||||
|
||||
**Required actions:** If your platform does not have a standards-compliant
|
||||
*stdint.h*, it may lack the definition for *[u]int_least8_t*. This must be
|
||||
added manually, example can be found in *extra/pb_syshdr.h*.
|
||||
|
||||
**Error indications:** Compiler error: "unknown type name 'uint_least8_t'".
|
||||
|
||||
Nanopb-0.3.2 (2015-01-24)
|
||||
=========================
|
||||
|
||||
Add support for OneOfs
|
||||
----------------------
|
||||
**Rationale:** Previously nanopb did not support the *oneof* construct in
|
||||
*.proto* files. Those fields were generated as regular *optional* fields.
|
||||
|
||||
**Changes:** OneOfs are now generated as C unions. Callback fields are not
|
||||
supported inside oneof and generator gives an error.
|
||||
|
||||
**Required actions:** The generator option *no_unions* can be used to restore old
|
||||
behaviour and to allow callbacks to be used. To use unions, one change is
|
||||
needed: use *which_xxxx* field to detect which field is present, instead
|
||||
of *has_xxxx*. Compare the value against *MyStruct_myfield_tag*.
|
||||
|
||||
**Error indications:** Generator error: "Callback fields inside of oneof are
|
||||
not supported". Compiler error: "Message" has no member named "has_xxxx".
|
||||
|
||||
Nanopb-0.3.0 (2014-08-26)
|
||||
=========================
|
||||
|
||||
Separate field iterator logic to pb_common.c
|
||||
--------------------------------------------
|
||||
**Rationale:** Originally, the field iteration logic was simple enough to be
|
||||
duplicated in *pb_decode.c* and *pb_encode.c*. New field types have made the
|
||||
logic more complex, which required the creation of a new file to contain the
|
||||
common functionality.
|
||||
|
||||
**Changes:** There is a new file, *pb_common.c*, which must be included in
|
||||
builds.
|
||||
|
||||
**Required actions:** Add *pb_common.c* to build rules. This file is always
|
||||
required. Either *pb_decode.c* or *pb_encode.c* can still be left out if some
|
||||
functionality is not needed.
|
||||
|
||||
**Error indications:** Linker error: undefined reference to
|
||||
*pb_field_iter_begin*, *pb_field_iter_next* or similar.
|
||||
|
||||
Change data type of field counts to pb_size_t
|
||||
---------------------------------------------
|
||||
**Rationale:** Often nanopb is used with small arrays, such as 255 items or
|
||||
less. Using a full *size_t* field to store the array count wastes memory if
|
||||
there are many arrays. There already exists parameters *PB_FIELD_16BIT* and
|
||||
*PB_FIELD_32BIT* which tell nanopb what is the maximum size of arrays in use.
|
||||
|
||||
**Changes:** Generator will now use *pb_size_t* for the array *_count* fields.
|
||||
The size of the type will be controlled by the *PB_FIELD_16BIT* and
|
||||
*PB_FIELD_32BIT* compilation time options.
|
||||
|
||||
**Required actions:** Regenerate all *.pb.h* files. In some cases casts to the
|
||||
*pb_size_t* type may need to be added in the user code when accessing the
|
||||
*_count* fields.
|
||||
|
||||
**Error indications:** Incorrect data at runtime, crashes. But note that other
|
||||
changes in the same version already require regenerating the files and have
|
||||
better indications of errors, so this is only an issue for development
|
||||
versions.
|
||||
|
||||
Renamed some macros and identifiers
|
||||
-----------------------------------
|
||||
**Rationale:** Some names in nanopb core were badly chosen and conflicted with
|
||||
ISO C99 reserved names or lacked a prefix. While they haven't caused trouble
|
||||
so far, it is reasonable to switch to non-conflicting names as these are rarely
|
||||
used from user code.
|
||||
|
||||
**Changes:** The following identifier names have changed:
|
||||
|
||||
* Macros:
|
||||
|
||||
* STATIC_ASSERT(x) -> PB_STATIC_ASSERT(x)
|
||||
* UNUSED(x) -> PB_UNUSED(x)
|
||||
|
||||
* Include guards:
|
||||
|
||||
* _PB_filename_ -> PB_filename_INCLUDED
|
||||
|
||||
* Structure forward declaration tags:
|
||||
|
||||
* _pb_field_t -> pb_field_s
|
||||
* _pb_bytes_array_t -> pb_bytes_array_s
|
||||
* _pb_callback_t -> pb_callback_s
|
||||
* _pb_extension_type_t -> pb_extension_type_s
|
||||
* _pb_extension_t -> pb_extension_s
|
||||
* _pb_istream_t -> pb_istream_s
|
||||
* _pb_ostream_t -> pb_ostream_s
|
||||
|
||||
**Required actions:** Regenerate all *.pb.c* files. If you use any of the above
|
||||
identifiers in your application code, perform search-replace to the new name.
|
||||
|
||||
**Error indications:** Compiler errors on lines with the macro/type names.
|
||||
|
||||
Nanopb-0.2.9 (2014-08-09)
|
||||
=========================
|
||||
|
||||
Change semantics of generator -e option
|
||||
---------------------------------------
|
||||
**Rationale:** Some compilers do not accept filenames with two dots (like
|
||||
in default extension .pb.c). The *-e* option to the generator allowed changing
|
||||
the extension, but not skipping the extra dot.
|
||||
|
||||
**Changes:** The *-e* option in generator will no longer add the prepending
|
||||
dot. The default value has been adjusted accordingly to *.pb.c* to keep the
|
||||
default behaviour the same as before.
|
||||
|
||||
**Required actions:** Only if using the generator -e option. Add dot before
|
||||
the parameter value on the command line.
|
||||
|
||||
**Error indications:** File not found when trying to compile generated files.
|
||||
|
||||
Nanopb-0.2.7 (2014-04-07)
|
||||
=========================
|
||||
|
||||
Changed pointer-type bytes field datatype
|
||||
-----------------------------------------
|
||||
**Rationale:** In the initial pointer encoding support since nanopb-0.2.5,
|
||||
the bytes type used a separate *pb_bytes_ptr_t* type to represent *bytes*
|
||||
fields. This made it easy to encode data from a separate, user-allocated
|
||||
buffer. However, it made the internal logic more complex and was inconsistent
|
||||
with the other types.
|
||||
|
||||
**Changes:** Dynamically allocated bytes fields now have the *pb_bytes_array_t*
|
||||
type, just like statically allocated ones.
|
||||
|
||||
**Required actions:** Only if using pointer-type fields with the bytes datatype.
|
||||
Change any access to *msg->field.size* to *msg->field->size*. Change any
|
||||
allocation to reserve space of amount *PB_BYTES_ARRAY_T_ALLOCSIZE(n)*. If the
|
||||
data pointer was begin assigned from external source, implement the field using
|
||||
a callback function instead.
|
||||
|
||||
**Error indications:** Compiler error: unknown type name *pb_bytes_ptr_t*.
|
||||
|
||||
Nanopb-0.2.4 (2013-11-07)
|
||||
=========================
|
||||
|
||||
Remove the NANOPB_INTERNALS compilation option
|
||||
----------------------------------------------
|
||||
**Rationale:** Having the option in the headers required the functions to
|
||||
be non-static, even if the option is not used. This caused errors on some
|
||||
static analysis tools.
|
||||
|
||||
**Changes:** The *#ifdef* and associated functions were removed from the
|
||||
header.
|
||||
|
||||
**Required actions:** Only if the *NANOPB_INTERNALS* option was previously
|
||||
used. Actions are as listed under nanopb-0.1.3 and nanopb-0.1.6.
|
||||
|
||||
**Error indications:** Compiler warning: implicit declaration of function
|
||||
*pb_dec_string*, *pb_enc_string*, or similar.
|
||||
|
||||
Nanopb-0.2.1 (2013-04-14)
|
||||
=========================
|
||||
|
||||
Callback function signature
|
||||
---------------------------
|
||||
**Rationale:** Previously the auxilary data to field callbacks was passed
|
||||
as *void\**. This allowed passing of any data, but made it unnecessarily
|
||||
complex to return a pointer from callback.
|
||||
|
||||
**Changes:** The callback function parameter was changed to *void\*\**.
|
||||
|
||||
**Required actions:** You can continue using the old callback style by
|
||||
defining *PB_OLD_CALLBACK_STYLE*. Recommended action is to:
|
||||
|
||||
* Change the callback signatures to contain *void\*\** for decoders and
|
||||
*void \* const \** for encoders.
|
||||
* Change the callback function body to use *\*arg* instead of *arg*.
|
||||
|
||||
**Error indications:** Compiler warning: assignment from incompatible
|
||||
pointer type, when initializing *funcs.encode* or *funcs.decode*.
|
||||
|
||||
Nanopb-0.2.0 (2013-03-02)
|
||||
=========================
|
||||
|
||||
Reformatted generated .pb.c file using macros
|
||||
---------------------------------------------
|
||||
**Rationale:** Previously the generator made a list of C *pb_field_t*
|
||||
initializers in the .pb.c file. This led to a need to regenerate all .pb.c
|
||||
files after even small changes to the *pb_field_t* definition.
|
||||
|
||||
**Changes:** Macros were added to pb.h which allow for cleaner definition
|
||||
of the .pb.c contents. By changing the macro definitions, changes to the
|
||||
field structure are possible without breaking compatibility with old .pb.c
|
||||
files.
|
||||
|
||||
**Required actions:** Regenerate all .pb.c files from the .proto sources.
|
||||
|
||||
**Error indications:** Compiler warning: implicit declaration of function
|
||||
*pb_delta_end*.
|
||||
|
||||
Changed pb_type_t definitions
|
||||
-----------------------------
|
||||
**Rationale:** The *pb_type_t* was previously an enumeration type. This
|
||||
caused warnings on some compilers when using bitwise operations to set flags
|
||||
inside the values.
|
||||
|
||||
**Changes:** The *pb_type_t* was changed to *typedef uint8_t*. The values
|
||||
were changed to *#define*. Some value names were changed for consistency.
|
||||
|
||||
**Required actions:** Only if you directly access the `pb_field_t` contents
|
||||
in your own code, something which is not usually done. Needed changes:
|
||||
|
||||
* Change *PB_HTYPE_ARRAY* to *PB_HTYPE_REPEATED*.
|
||||
* Change *PB_HTYPE_CALLBACK* to *PB_ATYPE()* and *PB_ATYPE_CALLBACK*.
|
||||
|
||||
**Error indications:** Compiler error: *PB_HTYPE_ARRAY* or *PB_HTYPE_CALLBACK*
|
||||
undeclared.
|
||||
|
||||
Nanopb-0.1.6 (2012-09-02)
|
||||
=========================
|
||||
|
||||
Refactored field decoder interface
|
||||
----------------------------------
|
||||
**Rationale:** Similarly to field encoders in nanopb-0.1.3.
|
||||
|
||||
**Changes:** New functions with names *pb_decode_\** were added.
|
||||
|
||||
**Required actions:** By defining NANOPB_INTERNALS, you can still keep using
|
||||
the old functions. Recommended action is to replace any calls with the newer
|
||||
*pb_decode_\** equivalents.
|
||||
|
||||
**Error indications:** Compiler warning: implicit declaration of function
|
||||
*pb_dec_string*, *pb_dec_varint*, *pb_dec_submessage* or similar.
|
||||
|
||||
Nanopb-0.1.3 (2012-06-12)
|
||||
=========================
|
||||
|
||||
Refactored field encoder interface
|
||||
----------------------------------
|
||||
**Rationale:** The old *pb_enc_\** functions were designed mostly for the
|
||||
internal use by the core. Because they are internally accessed through
|
||||
function pointers, their signatures had to be common. This led to a confusing
|
||||
interface for external users.
|
||||
|
||||
**Changes:** New functions with names *pb_encode_\** were added. These have
|
||||
easier to use interfaces. The old functions are now only thin wrappers for
|
||||
the new interface.
|
||||
|
||||
**Required actions:** By defining NANOPB_INTERNALS, you can still keep using
|
||||
the old functions. Recommended action is to replace any calls with the newer
|
||||
*pb_encode_\** equivalents.
|
||||
|
||||
**Error indications:** Compiler warning: implicit declaration of function
|
||||
*pb_enc_string*, *pb_enc_varint, *pb_enc_submessage* or similar.
|
||||
|
780
extra/nanopb/docs/reference.rst
Normal file
780
extra/nanopb/docs/reference.rst
Normal file
|
@ -0,0 +1,780 @@
|
|||
=====================
|
||||
Nanopb: API reference
|
||||
=====================
|
||||
|
||||
.. include :: menu.rst
|
||||
|
||||
.. contents ::
|
||||
|
||||
|
||||
|
||||
|
||||
Compilation options
|
||||
===================
|
||||
The following options can be specified in one of two ways:
|
||||
|
||||
1. Using the -D switch on the C compiler command line.
|
||||
2. By #defining them at the top of pb.h.
|
||||
|
||||
You must have the same settings for the nanopb library and all code that
|
||||
includes pb.h.
|
||||
|
||||
============================ ================================================
|
||||
PB_NO_PACKED_STRUCTS Disable packed structs. Increases RAM usage but
|
||||
is necessary on some platforms that do not
|
||||
support unaligned memory access.
|
||||
PB_ENABLE_MALLOC Set this to enable dynamic allocation support
|
||||
in the decoder.
|
||||
PB_MAX_REQUIRED_FIELDS Maximum number of required fields to check for
|
||||
presence. Default value is 64. Increases stack
|
||||
usage 1 byte per every 8 fields. Compiler
|
||||
warning will tell if you need this.
|
||||
PB_FIELD_16BIT Add support for tag numbers > 255 and fields
|
||||
larger than 255 bytes or 255 array entries.
|
||||
Increases code size 3 bytes per each field.
|
||||
Compiler error will tell if you need this.
|
||||
PB_FIELD_32BIT Add support for tag numbers > 65535 and fields
|
||||
larger than 65535 bytes or 65535 array entries.
|
||||
Increases code size 9 bytes per each field.
|
||||
Compiler error will tell if you need this.
|
||||
PB_NO_ERRMSG Disables the support for error messages; only
|
||||
error information is the true/false return
|
||||
value. Decreases the code size by a few hundred
|
||||
bytes.
|
||||
PB_BUFFER_ONLY Disables the support for custom streams. Only
|
||||
supports encoding and decoding with memory
|
||||
buffers. Speeds up execution and decreases code
|
||||
size slightly.
|
||||
PB_OLD_CALLBACK_STYLE Use the old function signature (void\* instead
|
||||
of void\*\*) for callback fields. This was the
|
||||
default until nanopb-0.2.1.
|
||||
PB_SYSTEM_HEADER Replace the standard header files with a single
|
||||
header file. It should define all the required
|
||||
functions and typedefs listed on the
|
||||
`overview page`_. Value must include quotes,
|
||||
for example *#define PB_SYSTEM_HEADER "foo.h"*.
|
||||
PB_WITHOUT_64BIT Disable 64-bit support, for old compilers or
|
||||
for a slight speedup on 8-bit platforms.
|
||||
============================ ================================================
|
||||
|
||||
The PB_MAX_REQUIRED_FIELDS, PB_FIELD_16BIT and PB_FIELD_32BIT settings allow
|
||||
raising some datatype limits to suit larger messages. Their need is recognized
|
||||
automatically by C-preprocessor #if-directives in the generated .pb.h files.
|
||||
The default setting is to use the smallest datatypes (least resources used).
|
||||
|
||||
.. _`overview page`: index.html#compiler-requirements
|
||||
|
||||
|
||||
Proto file options
|
||||
==================
|
||||
The generator behaviour can be adjusted using these options, defined in the
|
||||
'nanopb.proto' file in the generator folder:
|
||||
|
||||
============================ ================================================
|
||||
max_size Allocated size for *bytes* and *string* fields.
|
||||
max_count Allocated number of entries in arrays
|
||||
(*repeated* fields).
|
||||
int_size Override the integer type of a field.
|
||||
(To use e.g. uint8_t to save RAM.)
|
||||
type Type of the generated field. Default value
|
||||
is *FT_DEFAULT*, which selects automatically.
|
||||
You can use *FT_CALLBACK*, *FT_POINTER*,
|
||||
*FT_STATIC* or *FT_IGNORE* to
|
||||
force a callback field, a dynamically
|
||||
allocated field, a static field or to
|
||||
completely ignore the field.
|
||||
long_names Prefix the enum name to the enum value in
|
||||
definitions, i.e. *EnumName_EnumValue*. Enabled
|
||||
by default.
|
||||
packed_struct Make the generated structures packed.
|
||||
NOTE: This cannot be used on CPUs that break
|
||||
on unaligned accesses to variables.
|
||||
skip_message Skip the whole message from generation.
|
||||
no_unions Generate 'oneof' fields as optional fields
|
||||
instead of C unions.
|
||||
msgid Specifies a unique id for this message type.
|
||||
Can be used by user code as an identifier.
|
||||
anonymous_oneof Generate 'oneof' fields as anonymous unions.
|
||||
fixed_length Generate 'bytes' fields with constant length
|
||||
(max_size must also be defined).
|
||||
fixed_count Generate arrays with constant length
|
||||
(max_count must also be defined).
|
||||
============================ ================================================
|
||||
|
||||
These options can be defined for the .proto files before they are converted
|
||||
using the nanopb-generatory.py. There are three ways to define the options:
|
||||
|
||||
1. Using a separate .options file.
|
||||
This is the preferred way as of nanopb-0.2.1, because it has the best
|
||||
compatibility with other protobuf libraries.
|
||||
2. Defining the options on the command line of nanopb_generator.py.
|
||||
This only makes sense for settings that apply to a whole file.
|
||||
3. Defining the options in the .proto file using the nanopb extensions.
|
||||
This is the way used in nanopb-0.1, and will remain supported in the
|
||||
future. It however sometimes causes trouble when using the .proto file
|
||||
with other protobuf libraries.
|
||||
|
||||
The effect of the options is the same no matter how they are given. The most
|
||||
common purpose is to define maximum size for string fields in order to
|
||||
statically allocate them.
|
||||
|
||||
Defining the options in a .options file
|
||||
---------------------------------------
|
||||
The preferred way to define options is to have a separate file
|
||||
'myproto.options' in the same directory as the 'myproto.proto'. ::
|
||||
|
||||
# myproto.proto
|
||||
message MyMessage {
|
||||
required string name = 1;
|
||||
repeated int32 ids = 4;
|
||||
}
|
||||
|
||||
::
|
||||
|
||||
# myproto.options
|
||||
MyMessage.name max_size:40
|
||||
MyMessage.ids max_count:5
|
||||
|
||||
The generator will automatically search for this file and read the
|
||||
options from it. The file format is as follows:
|
||||
|
||||
* Lines starting with '#' or '//' are regarded as comments.
|
||||
* Blank lines are ignored.
|
||||
* All other lines should start with a field name pattern, followed by one or
|
||||
more options. For example: *"MyMessage.myfield max_size:5 max_count:10"*.
|
||||
* The field name pattern is matched against a string of form *'Message.field'*.
|
||||
For nested messages, the string is *'Message.SubMessage.field'*.
|
||||
* The field name pattern may use the notation recognized by Python fnmatch():
|
||||
|
||||
- *\** matches any part of string, like 'Message.\*' for all fields
|
||||
- *\?* matches any single character
|
||||
- *[seq]* matches any of characters 's', 'e' and 'q'
|
||||
- *[!seq]* matches any other character
|
||||
|
||||
* The options are written as *'option_name:option_value'* and several options
|
||||
can be defined on same line, separated by whitespace.
|
||||
* Options defined later in the file override the ones specified earlier, so
|
||||
it makes sense to define wildcard options first in the file and more specific
|
||||
ones later.
|
||||
|
||||
To debug problems in applying the options, you can use the *-v* option for the
|
||||
plugin. Plugin options are specified in front of the output path:
|
||||
|
||||
protoc ... --nanopb_out=-v:. message.proto
|
||||
|
||||
Protoc doesn't currently pass include path into plugins. Therefore if your
|
||||
*.proto* is in a subdirectory, nanopb may have trouble finding the associated
|
||||
*.options* file. A workaround is to specify include path separately to the
|
||||
nanopb plugin, like:
|
||||
|
||||
protoc -Isubdir --nanopb_out=-Isubdir:. message.proto
|
||||
|
||||
If preferred, the name of the options file can be set using plugin argument
|
||||
*-f*.
|
||||
|
||||
Defining the options on command line
|
||||
------------------------------------
|
||||
The nanopb_generator.py has a simple command line option *-s OPTION:VALUE*.
|
||||
The setting applies to the whole file that is being processed.
|
||||
|
||||
Defining the options in the .proto file
|
||||
---------------------------------------
|
||||
The .proto file format allows defining custom options for the fields.
|
||||
The nanopb library comes with *nanopb.proto* which does exactly that, allowing
|
||||
you do define the options directly in the .proto file::
|
||||
|
||||
import "nanopb.proto";
|
||||
|
||||
message MyMessage {
|
||||
required string name = 1 [(nanopb).max_size = 40];
|
||||
repeated int32 ids = 4 [(nanopb).max_count = 5];
|
||||
}
|
||||
|
||||
A small complication is that you have to set the include path of protoc so that
|
||||
nanopb.proto can be found. This file, in turn, requires the file
|
||||
*google/protobuf/descriptor.proto*. This is usually installed under
|
||||
*/usr/include*. Therefore, to compile a .proto file which uses options, use a
|
||||
protoc command similar to::
|
||||
|
||||
protoc -I/usr/include -Inanopb/generator -I. --nanopb_out=. message.proto
|
||||
|
||||
The options can be defined in file, message and field scopes::
|
||||
|
||||
option (nanopb_fileopt).max_size = 20; // File scope
|
||||
message Message
|
||||
{
|
||||
option (nanopb_msgopt).max_size = 30; // Message scope
|
||||
required string fieldsize = 1 [(nanopb).max_size = 40]; // Field scope
|
||||
}
|
||||
|
||||
|
||||
pb.h
|
||||
====
|
||||
|
||||
pb_byte_t
|
||||
---------
|
||||
Type used for storing byte-sized data, such as raw binary input and bytes-type fields. ::
|
||||
|
||||
typedef uint_least8_t pb_byte_t;
|
||||
|
||||
For most platforms this is equivalent to `uint8_t`. Some platforms however do not support
|
||||
8-bit variables, and on those platforms 16 or 32 bits need to be used for each byte.
|
||||
|
||||
pb_type_t
|
||||
---------
|
||||
Type used to store the type of each field, to control the encoder/decoder behaviour. ::
|
||||
|
||||
typedef uint_least8_t pb_type_t;
|
||||
|
||||
The low-order nibble of the enumeration values defines the function that can be used for encoding and decoding the field data:
|
||||
|
||||
=========================== ===== ================================================
|
||||
LTYPE identifier Value Storage format
|
||||
=========================== ===== ================================================
|
||||
PB_LTYPE_VARINT 0x00 Integer.
|
||||
PB_LTYPE_UVARINT 0x01 Unsigned integer.
|
||||
PB_LTYPE_SVARINT 0x02 Integer, zigzag encoded.
|
||||
PB_LTYPE_FIXED32 0x03 32-bit integer or floating point.
|
||||
PB_LTYPE_FIXED64 0x04 64-bit integer or floating point.
|
||||
PB_LTYPE_BYTES 0x05 Structure with *size_t* field and byte array.
|
||||
PB_LTYPE_STRING 0x06 Null-terminated string.
|
||||
PB_LTYPE_SUBMESSAGE 0x07 Submessage structure.
|
||||
PB_LTYPE_EXTENSION 0x08 Point to *pb_extension_t*.
|
||||
PB_LTYPE_FIXED_LENGTH_BYTES 0x09 Inline *pb_byte_t* array of fixed size.
|
||||
=========================== ===== ================================================
|
||||
|
||||
The bits 4-5 define whether the field is required, optional or repeated:
|
||||
|
||||
==================== ===== ================================================
|
||||
HTYPE identifier Value Field handling
|
||||
==================== ===== ================================================
|
||||
PB_HTYPE_REQUIRED 0x00 Verify that field exists in decoded message.
|
||||
PB_HTYPE_OPTIONAL 0x10 Use separate *has_<field>* boolean to specify
|
||||
whether the field is present.
|
||||
(Unless it is a callback)
|
||||
PB_HTYPE_REPEATED 0x20 A repeated field with preallocated array.
|
||||
Separate *<field>_count* for number of items.
|
||||
(Unless it is a callback)
|
||||
==================== ===== ================================================
|
||||
|
||||
The bits 6-7 define the how the storage for the field is allocated:
|
||||
|
||||
==================== ===== ================================================
|
||||
ATYPE identifier Value Allocation method
|
||||
==================== ===== ================================================
|
||||
PB_ATYPE_STATIC 0x00 Statically allocated storage in the structure.
|
||||
PB_ATYPE_CALLBACK 0x40 A field with dynamic storage size. Struct field
|
||||
actually contains a pointer to a callback
|
||||
function.
|
||||
==================== ===== ================================================
|
||||
|
||||
|
||||
pb_field_t
|
||||
----------
|
||||
Describes a single structure field with memory position in relation to others. The descriptions are usually autogenerated. ::
|
||||
|
||||
typedef struct pb_field_s pb_field_t;
|
||||
struct pb_field_s {
|
||||
pb_size_t tag;
|
||||
pb_type_t type;
|
||||
pb_size_t data_offset;
|
||||
pb_ssize_t size_offset;
|
||||
pb_size_t data_size;
|
||||
pb_size_t array_size;
|
||||
const void *ptr;
|
||||
} pb_packed;
|
||||
|
||||
:tag: Tag number of the field or 0 to terminate a list of fields.
|
||||
:type: LTYPE, HTYPE and ATYPE of the field.
|
||||
:data_offset: Offset of field data, relative to the end of the previous field.
|
||||
:size_offset: Offset of *bool* flag for optional fields or *size_t* count for arrays, relative to field data.
|
||||
:data_size: Size of a single data entry, in bytes. For PB_LTYPE_BYTES, the size of the byte array inside the containing structure. For PB_HTYPE_CALLBACK, size of the C data type if known.
|
||||
:array_size: Maximum number of entries in an array, if it is an array type.
|
||||
:ptr: Pointer to default value for optional fields, or to submessage description for PB_LTYPE_SUBMESSAGE.
|
||||
|
||||
The *uint8_t* datatypes limit the maximum size of a single item to 255 bytes and arrays to 255 items. Compiler will give error if the values are too large. The types can be changed to larger ones by defining *PB_FIELD_16BIT*.
|
||||
|
||||
pb_bytes_array_t
|
||||
----------------
|
||||
An byte array with a field for storing the length::
|
||||
|
||||
typedef struct {
|
||||
pb_size_t size;
|
||||
pb_byte_t bytes[1];
|
||||
} pb_bytes_array_t;
|
||||
|
||||
In an actual array, the length of *bytes* may be different.
|
||||
|
||||
pb_callback_t
|
||||
-------------
|
||||
Part of a message structure, for fields with type PB_HTYPE_CALLBACK::
|
||||
|
||||
typedef struct _pb_callback_t pb_callback_t;
|
||||
struct _pb_callback_t {
|
||||
union {
|
||||
bool (*decode)(pb_istream_t *stream, const pb_field_t *field, void **arg);
|
||||
bool (*encode)(pb_ostream_t *stream, const pb_field_t *field, void * const *arg);
|
||||
} funcs;
|
||||
|
||||
void *arg;
|
||||
};
|
||||
|
||||
A pointer to the *arg* is passed to the callback when calling. It can be used to store any information that the callback might need.
|
||||
|
||||
Previously the function received just the value of *arg* instead of a pointer to it. This old behaviour can be enabled by defining *PB_OLD_CALLBACK_STYLE*.
|
||||
|
||||
When calling `pb_encode`_, *funcs.encode* is used, and similarly when calling `pb_decode`_, *funcs.decode* is used. The function pointers are stored in the same memory location but are of incompatible types. You can set the function pointer to NULL to skip the field.
|
||||
|
||||
pb_wire_type_t
|
||||
--------------
|
||||
Protocol Buffers wire types. These are used with `pb_encode_tag`_. ::
|
||||
|
||||
typedef enum {
|
||||
PB_WT_VARINT = 0,
|
||||
PB_WT_64BIT = 1,
|
||||
PB_WT_STRING = 2,
|
||||
PB_WT_32BIT = 5
|
||||
} pb_wire_type_t;
|
||||
|
||||
pb_extension_type_t
|
||||
-------------------
|
||||
Defines the handler functions and auxiliary data for a field that extends
|
||||
another message. Usually autogenerated by *nanopb_generator.py*::
|
||||
|
||||
typedef struct {
|
||||
bool (*decode)(pb_istream_t *stream, pb_extension_t *extension,
|
||||
uint32_t tag, pb_wire_type_t wire_type);
|
||||
bool (*encode)(pb_ostream_t *stream, const pb_extension_t *extension);
|
||||
const void *arg;
|
||||
} pb_extension_type_t;
|
||||
|
||||
In the normal case, the function pointers are *NULL* and the decoder and
|
||||
encoder use their internal implementations. The internal implementations
|
||||
assume that *arg* points to a *pb_field_t* that describes the field in question.
|
||||
|
||||
To implement custom processing of unknown fields, you can provide pointers
|
||||
to your own functions. Their functionality is mostly the same as for normal
|
||||
callback fields, except that they get called for any unknown field when decoding.
|
||||
|
||||
pb_extension_t
|
||||
--------------
|
||||
Ties together the extension field type and the storage for the field value::
|
||||
|
||||
typedef struct {
|
||||
const pb_extension_type_t *type;
|
||||
void *dest;
|
||||
pb_extension_t *next;
|
||||
bool found;
|
||||
} pb_extension_t;
|
||||
|
||||
:type: Pointer to the structure that defines the callback functions.
|
||||
:dest: Pointer to the variable that stores the field value
|
||||
(as used by the default extension callback functions.)
|
||||
:next: Pointer to the next extension handler, or *NULL*.
|
||||
:found: Decoder sets this to true if the extension was found.
|
||||
|
||||
PB_GET_ERROR
|
||||
------------
|
||||
Get the current error message from a stream, or a placeholder string if
|
||||
there is no error message::
|
||||
|
||||
#define PB_GET_ERROR(stream) (string expression)
|
||||
|
||||
This should be used for printing errors, for example::
|
||||
|
||||
if (!pb_decode(...))
|
||||
{
|
||||
printf("Decode failed: %s\n", PB_GET_ERROR(stream));
|
||||
}
|
||||
|
||||
The macro only returns pointers to constant strings (in code memory),
|
||||
so that there is no need to release the returned pointer.
|
||||
|
||||
PB_RETURN_ERROR
|
||||
---------------
|
||||
Set the error message and return false::
|
||||
|
||||
#define PB_RETURN_ERROR(stream,msg) (sets error and returns false)
|
||||
|
||||
This should be used to handle error conditions inside nanopb functions
|
||||
and user callback functions::
|
||||
|
||||
if (error_condition)
|
||||
{
|
||||
PB_RETURN_ERROR(stream, "something went wrong");
|
||||
}
|
||||
|
||||
The *msg* parameter must be a constant string.
|
||||
|
||||
|
||||
|
||||
pb_encode.h
|
||||
===========
|
||||
|
||||
pb_ostream_from_buffer
|
||||
----------------------
|
||||
Constructs an output stream for writing into a memory buffer. This is just a helper function, it doesn't do anything you couldn't do yourself in a callback function. It uses an internal callback that stores the pointer in stream *state* field. ::
|
||||
|
||||
pb_ostream_t pb_ostream_from_buffer(pb_byte_t *buf, size_t bufsize);
|
||||
|
||||
:buf: Memory buffer to write into.
|
||||
:bufsize: Maximum number of bytes to write.
|
||||
:returns: An output stream.
|
||||
|
||||
After writing, you can check *stream.bytes_written* to find out how much valid data there is in the buffer.
|
||||
|
||||
pb_write
|
||||
--------
|
||||
Writes data to an output stream. Always use this function, instead of trying to call stream callback manually. ::
|
||||
|
||||
bool pb_write(pb_ostream_t *stream, const pb_byte_t *buf, size_t count);
|
||||
|
||||
:stream: Output stream to write to.
|
||||
:buf: Pointer to buffer with the data to be written.
|
||||
:count: Number of bytes to write.
|
||||
:returns: True on success, false if maximum length is exceeded or an IO error happens.
|
||||
|
||||
If an error happens, *bytes_written* is not incremented. Depending on the callback used, calling pb_write again after it has failed once may be dangerous. Nanopb itself never does this, instead it returns the error to user application. The builtin pb_ostream_from_buffer is safe to call again after failed write.
|
||||
|
||||
pb_encode
|
||||
---------
|
||||
Encodes the contents of a structure as a protocol buffers message and writes it to output stream. ::
|
||||
|
||||
bool pb_encode(pb_ostream_t *stream, const pb_field_t fields[], const void *src_struct);
|
||||
|
||||
:stream: Output stream to write to.
|
||||
:fields: A field description array, usually autogenerated.
|
||||
:src_struct: Pointer to the data that will be serialized.
|
||||
:returns: True on success, false on IO error, on detectable errors in field description, or if a field encoder returns false.
|
||||
|
||||
Normally pb_encode simply walks through the fields description array and serializes each field in turn. However, submessages must be serialized twice: first to calculate their size and then to actually write them to output. This causes some constraints for callback fields, which must return the same data on every call.
|
||||
|
||||
pb_encode_delimited
|
||||
-------------------
|
||||
Calculates the length of the message, encodes it as varint and then encodes the message. ::
|
||||
|
||||
bool pb_encode_delimited(pb_ostream_t *stream, const pb_field_t fields[], const void *src_struct);
|
||||
|
||||
(parameters are the same as for `pb_encode`_.)
|
||||
|
||||
A common way to indicate the message length in Protocol Buffers is to prefix it with a varint.
|
||||
This function does this, and it is compatible with *parseDelimitedFrom* in Google's protobuf library.
|
||||
|
||||
.. sidebar:: Encoding fields manually
|
||||
|
||||
The functions with names *pb_encode_\** are used when dealing with callback fields. The typical reason for using callbacks is to have an array of unlimited size. In that case, `pb_encode`_ will call your callback function, which in turn will call *pb_encode_\** functions repeatedly to write out values.
|
||||
|
||||
The tag of a field must be encoded separately with `pb_encode_tag_for_field`_. After that, you can call exactly one of the content-writing functions to encode the payload of the field. For repeated fields, you can repeat this process multiple times.
|
||||
|
||||
Writing packed arrays is a little bit more involved: you need to use `pb_encode_tag` and specify `PB_WT_STRING` as the wire type. Then you need to know exactly how much data you are going to write, and use `pb_encode_varint`_ to write out the number of bytes before writing the actual data. Substreams can be used to determine the number of bytes beforehand; see `pb_encode_submessage`_ source code for an example.
|
||||
|
||||
pb_get_encoded_size
|
||||
-------------------
|
||||
Calculates the length of the encoded message. ::
|
||||
|
||||
bool pb_get_encoded_size(size_t *size, const pb_field_t fields[], const void *src_struct);
|
||||
|
||||
:size: Calculated size of the encoded message.
|
||||
:fields: A field description array, usually autogenerated.
|
||||
:src_struct: Pointer to the data that will be serialized.
|
||||
:returns: True on success, false on detectable errors in field description or if a field encoder returns false.
|
||||
|
||||
pb_encode_tag
|
||||
-------------
|
||||
Starts a field in the Protocol Buffers binary format: encodes the field number and the wire type of the data. ::
|
||||
|
||||
bool pb_encode_tag(pb_ostream_t *stream, pb_wire_type_t wiretype, uint32_t field_number);
|
||||
|
||||
:stream: Output stream to write to. 1-5 bytes will be written.
|
||||
:wiretype: PB_WT_VARINT, PB_WT_64BIT, PB_WT_STRING or PB_WT_32BIT
|
||||
:field_number: Identifier for the field, defined in the .proto file. You can get it from field->tag.
|
||||
:returns: True on success, false on IO error.
|
||||
|
||||
pb_encode_tag_for_field
|
||||
-----------------------
|
||||
Same as `pb_encode_tag`_, except takes the parameters from a *pb_field_t* structure. ::
|
||||
|
||||
bool pb_encode_tag_for_field(pb_ostream_t *stream, const pb_field_t *field);
|
||||
|
||||
:stream: Output stream to write to. 1-5 bytes will be written.
|
||||
:field: Field description structure. Usually autogenerated.
|
||||
:returns: True on success, false on IO error or unknown field type.
|
||||
|
||||
This function only considers the LTYPE of the field. You can use it from your field callbacks, because the source generator writes correct LTYPE also for callback type fields.
|
||||
|
||||
Wire type mapping is as follows:
|
||||
|
||||
============================================= ============
|
||||
LTYPEs Wire type
|
||||
============================================= ============
|
||||
VARINT, UVARINT, SVARINT PB_WT_VARINT
|
||||
FIXED64 PB_WT_64BIT
|
||||
STRING, BYTES, SUBMESSAGE, FIXED_LENGTH_BYTES PB_WT_STRING
|
||||
FIXED32 PB_WT_32BIT
|
||||
============================================= ============
|
||||
|
||||
pb_encode_varint
|
||||
----------------
|
||||
Encodes a signed or unsigned integer in the varint_ format. Works for fields of type `bool`, `enum`, `int32`, `int64`, `uint32` and `uint64`::
|
||||
|
||||
bool pb_encode_varint(pb_ostream_t *stream, uint64_t value);
|
||||
|
||||
:stream: Output stream to write to. 1-10 bytes will be written.
|
||||
:value: Value to encode. Just cast e.g. int32_t directly to uint64_t.
|
||||
:returns: True on success, false on IO error.
|
||||
|
||||
.. _varint: http://code.google.com/apis/protocolbuffers/docs/encoding.html#varints
|
||||
|
||||
pb_encode_svarint
|
||||
-----------------
|
||||
Encodes a signed integer in the 'zig-zagged' format. Works for fields of type `sint32` and `sint64`::
|
||||
|
||||
bool pb_encode_svarint(pb_ostream_t *stream, int64_t value);
|
||||
|
||||
(parameters are the same as for `pb_encode_varint`_
|
||||
|
||||
pb_encode_string
|
||||
----------------
|
||||
Writes the length of a string as varint and then contents of the string. Works for fields of type `bytes` and `string`::
|
||||
|
||||
bool pb_encode_string(pb_ostream_t *stream, const pb_byte_t *buffer, size_t size);
|
||||
|
||||
:stream: Output stream to write to.
|
||||
:buffer: Pointer to string data.
|
||||
:size: Number of bytes in the string. Pass `strlen(s)` for strings.
|
||||
:returns: True on success, false on IO error.
|
||||
|
||||
pb_encode_fixed32
|
||||
-----------------
|
||||
Writes 4 bytes to stream and swaps bytes on big-endian architectures. Works for fields of type `fixed32`, `sfixed32` and `float`::
|
||||
|
||||
bool pb_encode_fixed32(pb_ostream_t *stream, const void *value);
|
||||
|
||||
:stream: Output stream to write to.
|
||||
:value: Pointer to a 4-bytes large C variable, for example `uint32_t foo;`.
|
||||
:returns: True on success, false on IO error.
|
||||
|
||||
pb_encode_fixed64
|
||||
-----------------
|
||||
Writes 8 bytes to stream and swaps bytes on big-endian architecture. Works for fields of type `fixed64`, `sfixed64` and `double`::
|
||||
|
||||
bool pb_encode_fixed64(pb_ostream_t *stream, const void *value);
|
||||
|
||||
:stream: Output stream to write to.
|
||||
:value: Pointer to a 8-bytes large C variable, for example `uint64_t foo;`.
|
||||
:returns: True on success, false on IO error.
|
||||
|
||||
pb_encode_submessage
|
||||
--------------------
|
||||
Encodes a submessage field, including the size header for it. Works for fields of any message type::
|
||||
|
||||
bool pb_encode_submessage(pb_ostream_t *stream, const pb_field_t fields[], const void *src_struct);
|
||||
|
||||
:stream: Output stream to write to.
|
||||
:fields: Pointer to the autogenerated field description array for the submessage type, e.g. `MyMessage_fields`.
|
||||
:src: Pointer to the structure where submessage data is.
|
||||
:returns: True on success, false on IO errors, pb_encode errors or if submessage size changes between calls.
|
||||
|
||||
In Protocol Buffers format, the submessage size must be written before the submessage contents. Therefore, this function has to encode the submessage twice in order to know the size beforehand.
|
||||
|
||||
If the submessage contains callback fields, the callback function might misbehave and write out a different amount of data on the second call. This situation is recognized and *false* is returned, but garbage will be written to the output before the problem is detected.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
pb_decode.h
|
||||
===========
|
||||
|
||||
pb_istream_from_buffer
|
||||
----------------------
|
||||
Helper function for creating an input stream that reads data from a memory buffer. ::
|
||||
|
||||
pb_istream_t pb_istream_from_buffer(const pb_byte_t *buf, size_t bufsize);
|
||||
|
||||
:buf: Pointer to byte array to read from.
|
||||
:bufsize: Size of the byte array.
|
||||
:returns: An input stream ready to use.
|
||||
|
||||
pb_read
|
||||
-------
|
||||
Read data from input stream. Always use this function, don't try to call the stream callback directly. ::
|
||||
|
||||
bool pb_read(pb_istream_t *stream, pb_byte_t *buf, size_t count);
|
||||
|
||||
:stream: Input stream to read from.
|
||||
:buf: Buffer to store the data to, or NULL to just read data without storing it anywhere.
|
||||
:count: Number of bytes to read.
|
||||
:returns: True on success, false if *stream->bytes_left* is less than *count* or if an IO error occurs.
|
||||
|
||||
End of file is signalled by *stream->bytes_left* being zero after pb_read returns false.
|
||||
|
||||
pb_decode
|
||||
---------
|
||||
Read and decode all fields of a structure. Reads until EOF on input stream. ::
|
||||
|
||||
bool pb_decode(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct);
|
||||
|
||||
:stream: Input stream to read from.
|
||||
:fields: A field description array. Usually autogenerated.
|
||||
:dest_struct: Pointer to structure where data will be stored.
|
||||
:returns: True on success, false on IO error, on detectable errors in field description, if a field encoder returns false or if a required field is missing.
|
||||
|
||||
In Protocol Buffers binary format, EOF is only allowed between fields. If it happens anywhere else, pb_decode will return *false*. If pb_decode returns false, you cannot trust any of the data in the structure.
|
||||
|
||||
In addition to EOF, the pb_decode implementation supports terminating a message with a 0 byte. This is compatible with the official Protocol Buffers because 0 is never a valid field tag.
|
||||
|
||||
For optional fields, this function applies the default value and sets *has_<field>* to false if the field is not present.
|
||||
|
||||
If *PB_ENABLE_MALLOC* is defined, this function may allocate storage for any pointer type fields.
|
||||
In this case, you have to call `pb_release`_ to release the memory after you are done with the message.
|
||||
On error return `pb_decode` will release the memory itself.
|
||||
|
||||
pb_decode_noinit
|
||||
----------------
|
||||
Same as `pb_decode`_, except does not apply the default values to fields. ::
|
||||
|
||||
bool pb_decode_noinit(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct);
|
||||
|
||||
(parameters are the same as for `pb_decode`_.)
|
||||
|
||||
The destination structure should be filled with zeros before calling this function. Doing a *memset* manually can be slightly faster than using `pb_decode`_ if you don't need any default values.
|
||||
|
||||
In addition to decoding a single message, this function can be used to merge two messages, so that
|
||||
values from previous message will remain if the new message does not contain a field.
|
||||
|
||||
This function *will not* release the message even on error return. If you use *PB_ENABLE_MALLOC*,
|
||||
you will need to call `pb_release`_ yourself.
|
||||
|
||||
pb_decode_delimited
|
||||
-------------------
|
||||
Same as `pb_decode`_, except that it first reads a varint with the length of the message. ::
|
||||
|
||||
bool pb_decode_delimited(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct);
|
||||
|
||||
(parameters are the same as for `pb_decode`_.)
|
||||
|
||||
A common method to indicate message size in Protocol Buffers is to prefix it with a varint.
|
||||
This function is compatible with *writeDelimitedTo* in the Google's Protocol Buffers library.
|
||||
|
||||
pb_release
|
||||
----------
|
||||
Releases any dynamically allocated fields::
|
||||
|
||||
void pb_release(const pb_field_t fields[], void *dest_struct);
|
||||
|
||||
:fields: A field description array. Usually autogenerated.
|
||||
:dest_struct: Pointer to structure where data is stored. If NULL, function does nothing.
|
||||
|
||||
This function is only available if *PB_ENABLE_MALLOC* is defined. It will release any
|
||||
pointer type fields in the structure and set the pointers to NULL.
|
||||
|
||||
pb_decode_tag
|
||||
-------------
|
||||
Decode the tag that comes before field in the protobuf encoding::
|
||||
|
||||
bool pb_decode_tag(pb_istream_t *stream, pb_wire_type_t *wire_type, uint32_t *tag, bool *eof);
|
||||
|
||||
:stream: Input stream to read from.
|
||||
:wire_type: Pointer to variable where to store the wire type of the field.
|
||||
:tag: Pointer to variable where to store the tag of the field.
|
||||
:eof: Pointer to variable where to store end-of-file status.
|
||||
:returns: True on success, false on error or EOF.
|
||||
|
||||
When the message (stream) ends, this function will return false and set *eof* to true. On other
|
||||
errors, *eof* will be set to false.
|
||||
|
||||
pb_skip_field
|
||||
-------------
|
||||
Remove the data for a field from the stream, without actually decoding it::
|
||||
|
||||
bool pb_skip_field(pb_istream_t *stream, pb_wire_type_t wire_type);
|
||||
|
||||
:stream: Input stream to read from.
|
||||
:wire_type: Type of field to skip.
|
||||
:returns: True on success, false on IO error.
|
||||
|
||||
.. sidebar:: Decoding fields manually
|
||||
|
||||
The functions with names beginning with *pb_decode_* are used when dealing with callback fields. The typical reason for using callbacks is to have an array of unlimited size. In that case, `pb_decode`_ will call your callback function repeatedly, which can then store the values into e.g. filesystem in the order received in.
|
||||
|
||||
For decoding numeric (including enumerated and boolean) values, use `pb_decode_varint`_, `pb_decode_svarint`_, `pb_decode_fixed32`_ and `pb_decode_fixed64`_. They take a pointer to a 32- or 64-bit C variable, which you may then cast to smaller datatype for storage.
|
||||
|
||||
For decoding strings and bytes fields, the length has already been decoded. You can therefore check the total length in *stream->bytes_left* and read the data using `pb_read`_.
|
||||
|
||||
Finally, for decoding submessages in a callback, simply use `pb_decode`_ and pass it the *SubMessage_fields* descriptor array.
|
||||
|
||||
pb_decode_varint
|
||||
----------------
|
||||
Read and decode a varint_ encoded integer. ::
|
||||
|
||||
bool pb_decode_varint(pb_istream_t *stream, uint64_t *dest);
|
||||
|
||||
:stream: Input stream to read from. 1-10 bytes will be read.
|
||||
:dest: Storage for the decoded integer. Value is undefined on error.
|
||||
:returns: True on success, false if value exceeds uint64_t range or an IO error happens.
|
||||
|
||||
pb_decode_svarint
|
||||
-----------------
|
||||
Similar to `pb_decode_varint`_, except that it performs zigzag-decoding on the value. This corresponds to the Protocol Buffers *sint32* and *sint64* datatypes. ::
|
||||
|
||||
bool pb_decode_svarint(pb_istream_t *stream, int64_t *dest);
|
||||
|
||||
(parameters are the same as `pb_decode_varint`_)
|
||||
|
||||
pb_decode_fixed32
|
||||
-----------------
|
||||
Decode a *fixed32*, *sfixed32* or *float* value. ::
|
||||
|
||||
bool pb_decode_fixed32(pb_istream_t *stream, void *dest);
|
||||
|
||||
:stream: Input stream to read from. 4 bytes will be read.
|
||||
:dest: Pointer to destination *int32_t*, *uint32_t* or *float*.
|
||||
:returns: True on success, false on IO errors.
|
||||
|
||||
This function reads 4 bytes from the input stream.
|
||||
On big endian architectures, it then reverses the order of the bytes.
|
||||
Finally, it writes the bytes to *dest*.
|
||||
|
||||
pb_decode_fixed64
|
||||
-----------------
|
||||
Decode a *fixed64*, *sfixed64* or *double* value. ::
|
||||
|
||||
bool pb_decode_fixed64(pb_istream_t *stream, void *dest);
|
||||
|
||||
:stream: Input stream to read from. 8 bytes will be read.
|
||||
:dest: Pointer to destination *int64_t*, *uint64_t* or *double*.
|
||||
:returns: True on success, false on IO errors.
|
||||
|
||||
Same as `pb_decode_fixed32`_, except this reads 8 bytes.
|
||||
|
||||
pb_make_string_substream
|
||||
------------------------
|
||||
Decode the length for a field with wire type *PB_WT_STRING* and create a substream for reading the data. ::
|
||||
|
||||
bool pb_make_string_substream(pb_istream_t *stream, pb_istream_t *substream);
|
||||
|
||||
:stream: Original input stream to read the length and data from.
|
||||
:substream: New substream that has limited length. Filled in by the function.
|
||||
:returns: True on success, false if reading the length fails.
|
||||
|
||||
This function uses `pb_decode_varint`_ to read an integer from the stream. This is interpreted as a number of bytes, and the substream is set up so that its `bytes_left` is initially the same as the length, and its callback function and state the same as the parent stream.
|
||||
|
||||
pb_close_string_substream
|
||||
-------------------------
|
||||
Close the substream created with `pb_make_string_substream`_. ::
|
||||
|
||||
void pb_close_string_substream(pb_istream_t *stream, pb_istream_t *substream);
|
||||
|
||||
:stream: Original input stream to read the length and data from.
|
||||
:substream: Substream to close
|
||||
|
||||
This function copies back the state from the substream to the parent stream.
|
||||
It must be called after done with the substream.
|
84
extra/nanopb/docs/security.rst
Normal file
84
extra/nanopb/docs/security.rst
Normal file
|
@ -0,0 +1,84 @@
|
|||
======================
|
||||
Nanopb: Security model
|
||||
======================
|
||||
|
||||
.. include :: menu.rst
|
||||
|
||||
.. contents ::
|
||||
|
||||
|
||||
|
||||
Importance of security in a Protocol Buffers library
|
||||
====================================================
|
||||
In the context of protocol buffers, security comes into play when decoding
|
||||
untrusted data. Naturally, if the attacker can modify the contents of a
|
||||
protocol buffers message, he can feed the application any values possible.
|
||||
Therefore the application itself must be prepared to receive untrusted values.
|
||||
|
||||
Where nanopb plays a part is preventing the attacker from running arbitrary
|
||||
code on the target system. Mostly this means that there must not be any
|
||||
possibility to cause buffer overruns, memory corruption or invalid pointers
|
||||
by the means of crafting a malicious message.
|
||||
|
||||
Division of trusted and untrusted data
|
||||
======================================
|
||||
The following data is regarded as **trusted**. It must be under the control of
|
||||
the application writer. Malicious data in these structures could cause
|
||||
security issues, such as execution of arbitrary code:
|
||||
|
||||
1. Callback, pointer and extension fields in message structures given to
|
||||
pb_encode() and pb_decode(). These fields are memory pointers, and are
|
||||
generated depending on the message definition in the .proto file.
|
||||
2. The automatically generated field definitions, i.e. *pb_field_t* lists.
|
||||
3. Contents of the *pb_istream_t* and *pb_ostream_t* structures (this does not
|
||||
mean the contents of the stream itself, just the stream definition).
|
||||
|
||||
The following data is regarded as **untrusted**. Invalid/malicious data in
|
||||
these will cause "garbage in, garbage out" behaviour. It will not cause
|
||||
buffer overflows, information disclosure or other security problems:
|
||||
|
||||
1. All data read from *pb_istream_t*.
|
||||
2. All fields in message structures, except:
|
||||
|
||||
- callbacks (*pb_callback_t* structures)
|
||||
- pointer fields (malloc support) and *_count* fields for pointers
|
||||
- extensions (*pb_extension_t* structures)
|
||||
|
||||
Invariants
|
||||
==========
|
||||
The following invariants are maintained during operation, even if the
|
||||
untrusted data has been maliciously crafted:
|
||||
|
||||
1. Nanopb will never read more than *bytes_left* bytes from *pb_istream_t*.
|
||||
2. Nanopb will never write more than *max_size* bytes to *pb_ostream_t*.
|
||||
3. Nanopb will never access memory out of bounds of the message structure.
|
||||
4. After pb_decode() returns successfully, the message structure will be
|
||||
internally consistent:
|
||||
|
||||
- The *count* fields of arrays will not exceed the array size.
|
||||
- The *size* field of bytes will not exceed the allocated size.
|
||||
- All string fields will have null terminator.
|
||||
|
||||
5. After pb_encode() returns successfully, the resulting message is a valid
|
||||
protocol buffers message. (Except if user-defined callbacks write incorrect
|
||||
data.)
|
||||
|
||||
Further considerations
|
||||
======================
|
||||
Even if the nanopb library is free of any security issues, there are still
|
||||
several possible attack vectors that the application author must consider.
|
||||
The following list is not comprehensive:
|
||||
|
||||
1. Stack usage may depend on the contents of the message. The message
|
||||
definition places an upper bound on how much stack will be used. Tests
|
||||
should be run with all fields present, to record the maximum possible
|
||||
stack usage.
|
||||
2. Callbacks can do anything. The code for the callbacks must be carefully
|
||||
checked if they are used with untrusted data.
|
||||
3. If using stream input, a maximum size should be set in *pb_istream_t* to
|
||||
stop a denial of service attack from using an infinite message.
|
||||
4. If using network sockets as streams, a timeout should be set to stop
|
||||
denial of service attacks.
|
||||
5. If using *malloc()* support, some method of limiting memory use should be
|
||||
employed. This can be done by defining custom *pb_realloc()* function.
|
||||
Nanopb will properly detect and handle failed memory allocations.
|
18
extra/nanopb/examples/cmake_relpath/CMakeLists.txt
Normal file
18
extra/nanopb/examples/cmake_relpath/CMakeLists.txt
Normal file
|
@ -0,0 +1,18 @@
|
|||
cmake_minimum_required(VERSION 2.8)
|
||||
project(NANOPB_CMAKE_SIMPLE C)
|
||||
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../extra)
|
||||
find_package(Nanopb REQUIRED)
|
||||
include_directories(${NANOPB_INCLUDE_DIRS})
|
||||
|
||||
nanopb_generate_cpp(PROTO_SRCS PROTO_HDRS RELPATH proto
|
||||
proto/simple.proto proto/sub/unlucky.proto)
|
||||
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
#add_custom_target(generate_proto_sources DEPENDS ${PROTO_SRCS} ${PROTO_HDRS})
|
||||
set_source_files_properties(${PROTO_SRCS} ${PROTO_HDRS}
|
||||
PROPERTIES GENERATED TRUE)
|
||||
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -g -O0")
|
||||
|
||||
add_executable(simple simple.c ${PROTO_SRCS} ${PROTO_HDRS})
|
18
extra/nanopb/examples/cmake_relpath/README.txt
Normal file
18
extra/nanopb/examples/cmake_relpath/README.txt
Normal file
|
@ -0,0 +1,18 @@
|
|||
Nanopb example "simple" using CMake
|
||||
=======================
|
||||
|
||||
This example is the same as the simple nanopb example but built using CMake.
|
||||
|
||||
Example usage
|
||||
-------------
|
||||
|
||||
On Linux, create a build directory and then call cmake:
|
||||
|
||||
nanopb/examples/cmake_simple$ mkdir build
|
||||
nanopb/examples/cmake_simple$ cd build/
|
||||
nanopb/examples/cmake_simple/build$ cmake ..
|
||||
nanopb/examples/cmake_simple/build$ make
|
||||
|
||||
After that, you can run it with the command: ./simple
|
||||
|
||||
On other platforms supported by CMake, refer to CMake instructions.
|
11
extra/nanopb/examples/cmake_relpath/proto/simple.proto
Normal file
11
extra/nanopb/examples/cmake_relpath/proto/simple.proto
Normal file
|
@ -0,0 +1,11 @@
|
|||
// A very simple protocol definition, consisting of only
|
||||
// one message.
|
||||
syntax = "proto2";
|
||||
|
||||
import "sub/unlucky.proto";
|
||||
|
||||
message SimpleMessage {
|
||||
required int32 lucky_number = 1;
|
||||
required UnluckyNumber unlucky = 2;
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
syntax = "proto2";
|
||||
|
||||
message UnluckyNumber {
|
||||
required uint32 number = 1;
|
||||
}
|
73
extra/nanopb/examples/cmake_relpath/simple.c
Normal file
73
extra/nanopb/examples/cmake_relpath/simple.c
Normal file
|
@ -0,0 +1,73 @@
|
|||
#include <stdio.h>
|
||||
#include <pb_encode.h>
|
||||
#include <pb_decode.h>
|
||||
#include "simple.pb.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
/* This is the buffer where we will store our message. */
|
||||
uint8_t buffer[128];
|
||||
size_t message_length;
|
||||
bool status;
|
||||
|
||||
/* Encode our message */
|
||||
{
|
||||
/* Allocate space on the stack to store the message data.
|
||||
*
|
||||
* Nanopb generates simple struct definitions for all the messages.
|
||||
* - check out the contents of simple.pb.h!
|
||||
* It is a good idea to always initialize your structures
|
||||
* so that you do not have garbage data from RAM in there.
|
||||
*/
|
||||
SimpleMessage message = SimpleMessage_init_zero;
|
||||
|
||||
/* Create a stream that will write to our buffer. */
|
||||
pb_ostream_t stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
|
||||
|
||||
/* Fill in the lucky number */
|
||||
message.lucky_number = 13;
|
||||
message.unlucky.number = 42;
|
||||
|
||||
/* Now we are ready to encode the message! */
|
||||
status = pb_encode(&stream, SimpleMessage_fields, &message);
|
||||
message_length = stream.bytes_written;
|
||||
|
||||
/* Then just check for any errors.. */
|
||||
if (!status)
|
||||
{
|
||||
printf("Encoding failed: %s\n", PB_GET_ERROR(&stream));
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Now we could transmit the message over network, store it in a file or
|
||||
* wrap it to a pigeon's leg.
|
||||
*/
|
||||
|
||||
/* But because we are lazy, we will just decode it immediately. */
|
||||
|
||||
{
|
||||
/* Allocate space for the decoded message. */
|
||||
SimpleMessage message = SimpleMessage_init_zero;
|
||||
|
||||
/* Create a stream that reads from the buffer. */
|
||||
pb_istream_t stream = pb_istream_from_buffer(buffer, message_length);
|
||||
|
||||
/* Now we are ready to decode the message. */
|
||||
status = pb_decode(&stream, SimpleMessage_fields, &message);
|
||||
|
||||
/* Check for errors... */
|
||||
if (!status)
|
||||
{
|
||||
printf("Decoding failed: %s\n", PB_GET_ERROR(&stream));
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Print the data contained in the message. */
|
||||
printf("Your lucky number was %d!\n", message.lucky_number);
|
||||
printf("Your unlucky number was %u!\n", message.unlucky.number);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
16
extra/nanopb/examples/cmake_simple/CMakeLists.txt
Normal file
16
extra/nanopb/examples/cmake_simple/CMakeLists.txt
Normal file
|
@ -0,0 +1,16 @@
|
|||
cmake_minimum_required(VERSION 2.8)
|
||||
project(NANOPB_CMAKE_SIMPLE C)
|
||||
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../extra)
|
||||
find_package(Nanopb REQUIRED)
|
||||
include_directories(${NANOPB_INCLUDE_DIRS})
|
||||
|
||||
nanopb_generate_cpp(PROTO_SRCS PROTO_HDRS simple.proto)
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
#add_custom_target(generate_proto_sources DEPENDS ${PROTO_SRCS} ${PROTO_HDRS})
|
||||
set_source_files_properties(${PROTO_SRCS} ${PROTO_HDRS}
|
||||
PROPERTIES GENERATED TRUE)
|
||||
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -g -O0")
|
||||
|
||||
add_executable(simple simple.c ${PROTO_SRCS} ${PROTO_HDRS})
|
18
extra/nanopb/examples/cmake_simple/README.txt
Normal file
18
extra/nanopb/examples/cmake_simple/README.txt
Normal file
|
@ -0,0 +1,18 @@
|
|||
Nanopb example "simple" using CMake
|
||||
=======================
|
||||
|
||||
This example is the same as the simple nanopb example but built using CMake.
|
||||
|
||||
Example usage
|
||||
-------------
|
||||
|
||||
On Linux, create a build directory and then call cmake:
|
||||
|
||||
nanopb/examples/cmake_simple$ mkdir build
|
||||
nanopb/examples/cmake_simple$ cd build/
|
||||
nanopb/examples/cmake_simple/build$ cmake ..
|
||||
nanopb/examples/cmake_simple/build$ make
|
||||
|
||||
After that, you can run it with the command: ./simple
|
||||
|
||||
On other platforms supported by CMake, refer to CMake instructions.
|
71
extra/nanopb/examples/cmake_simple/simple.c
Normal file
71
extra/nanopb/examples/cmake_simple/simple.c
Normal file
|
@ -0,0 +1,71 @@
|
|||
#include <stdio.h>
|
||||
#include <pb_encode.h>
|
||||
#include <pb_decode.h>
|
||||
#include "simple.pb.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
/* This is the buffer where we will store our message. */
|
||||
uint8_t buffer[128];
|
||||
size_t message_length;
|
||||
bool status;
|
||||
|
||||
/* Encode our message */
|
||||
{
|
||||
/* Allocate space on the stack to store the message data.
|
||||
*
|
||||
* Nanopb generates simple struct definitions for all the messages.
|
||||
* - check out the contents of simple.pb.h!
|
||||
* It is a good idea to always initialize your structures
|
||||
* so that you do not have garbage data from RAM in there.
|
||||
*/
|
||||
SimpleMessage message = SimpleMessage_init_zero;
|
||||
|
||||
/* Create a stream that will write to our buffer. */
|
||||
pb_ostream_t stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
|
||||
|
||||
/* Fill in the lucky number */
|
||||
message.lucky_number = 13;
|
||||
|
||||
/* Now we are ready to encode the message! */
|
||||
status = pb_encode(&stream, SimpleMessage_fields, &message);
|
||||
message_length = stream.bytes_written;
|
||||
|
||||
/* Then just check for any errors.. */
|
||||
if (!status)
|
||||
{
|
||||
printf("Encoding failed: %s\n", PB_GET_ERROR(&stream));
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Now we could transmit the message over network, store it in a file or
|
||||
* wrap it to a pigeon's leg.
|
||||
*/
|
||||
|
||||
/* But because we are lazy, we will just decode it immediately. */
|
||||
|
||||
{
|
||||
/* Allocate space for the decoded message. */
|
||||
SimpleMessage message = SimpleMessage_init_zero;
|
||||
|
||||
/* Create a stream that reads from the buffer. */
|
||||
pb_istream_t stream = pb_istream_from_buffer(buffer, message_length);
|
||||
|
||||
/* Now we are ready to decode the message. */
|
||||
status = pb_decode(&stream, SimpleMessage_fields, &message);
|
||||
|
||||
/* Check for errors... */
|
||||
if (!status)
|
||||
{
|
||||
printf("Decoding failed: %s\n", PB_GET_ERROR(&stream));
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Print the data contained in the message. */
|
||||
printf("Your lucky number was %d!\n", message.lucky_number);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
9
extra/nanopb/examples/cmake_simple/simple.proto
Normal file
9
extra/nanopb/examples/cmake_simple/simple.proto
Normal file
|
@ -0,0 +1,9 @@
|
|||
// A very simple protocol definition, consisting of only
|
||||
// one message.
|
||||
|
||||
syntax = "proto2";
|
||||
|
||||
message SimpleMessage {
|
||||
required int32 lucky_number = 1;
|
||||
}
|
||||
|
17
extra/nanopb/examples/network_server/Makefile
Normal file
17
extra/nanopb/examples/network_server/Makefile
Normal file
|
@ -0,0 +1,17 @@
|
|||
# Include the nanopb provided Makefile rules
|
||||
include ../../extra/nanopb.mk
|
||||
|
||||
# Compiler flags to enable all warnings & debug info
|
||||
CFLAGS = -ansi -Wall -Werror -g -O0
|
||||
CFLAGS += -I$(NANOPB_DIR)
|
||||
|
||||
all: server client
|
||||
|
||||
.SUFFIXES:
|
||||
|
||||
clean:
|
||||
rm -f server client fileproto.pb.c fileproto.pb.h
|
||||
|
||||
%: %.c common.c fileproto.pb.c
|
||||
$(CC) $(CFLAGS) -o $@ $^ $(NANOPB_CORE)
|
||||
|
60
extra/nanopb/examples/network_server/README.txt
Normal file
60
extra/nanopb/examples/network_server/README.txt
Normal file
|
@ -0,0 +1,60 @@
|
|||
Nanopb example "network_server"
|
||||
===============================
|
||||
|
||||
This example demonstrates the use of nanopb to communicate over network
|
||||
connections. It consists of a server that sends file listings, and of
|
||||
a client that requests the file list from the server.
|
||||
|
||||
Example usage
|
||||
-------------
|
||||
|
||||
user@host:~/nanopb/examples/network_server$ make # Build the example
|
||||
protoc -ofileproto.pb fileproto.proto
|
||||
python ../../generator/nanopb_generator.py fileproto.pb
|
||||
Writing to fileproto.pb.h and fileproto.pb.c
|
||||
cc -ansi -Wall -Werror -I .. -g -O0 -I../.. -o server server.c
|
||||
../../pb_decode.c ../../pb_encode.c fileproto.pb.c common.c
|
||||
cc -ansi -Wall -Werror -I .. -g -O0 -I../.. -o client client.c
|
||||
../../pb_decode.c ../../pb_encode.c fileproto.pb.c common.c
|
||||
|
||||
user@host:~/nanopb/examples/network_server$ ./server & # Start the server on background
|
||||
[1] 24462
|
||||
|
||||
petteri@oddish:~/nanopb/examples/network_server$ ./client /bin # Request the server to list /bin
|
||||
Got connection.
|
||||
Listing directory: /bin
|
||||
1327119 bzdiff
|
||||
1327126 bzless
|
||||
1327147 ps
|
||||
1327178 ntfsmove
|
||||
1327271 mv
|
||||
1327187 mount
|
||||
1327259 false
|
||||
1327266 tempfile
|
||||
1327285 zfgrep
|
||||
1327165 gzexe
|
||||
1327204 nc.openbsd
|
||||
1327260 uname
|
||||
|
||||
|
||||
Details of implementation
|
||||
-------------------------
|
||||
fileproto.proto contains the portable Google Protocol Buffers protocol definition.
|
||||
It could be used as-is to implement a server or a client in any other language, for
|
||||
example Python or Java.
|
||||
|
||||
fileproto.options contains the nanopb-specific options for the protocol file. This
|
||||
sets the amount of space allocated for file names when decoding messages.
|
||||
|
||||
common.c/h contains functions that allow nanopb to read and write directly from
|
||||
network socket. This way there is no need to allocate a separate buffer to store
|
||||
the message.
|
||||
|
||||
server.c contains the code to open a listening socket, to respond to clients and
|
||||
to list directory contents.
|
||||
|
||||
client.c contains the code to connect to a server, to send a request and to print
|
||||
the response message.
|
||||
|
||||
The code is implemented using the POSIX socket api, but it should be easy enough
|
||||
to port into any other socket api, such as lwip.
|
138
extra/nanopb/examples/network_server/client.c
Normal file
138
extra/nanopb/examples/network_server/client.c
Normal file
|
@ -0,0 +1,138 @@
|
|||
/* This is a simple TCP client that connects to port 1234 and prints a list
|
||||
* of files in a given directory.
|
||||
*
|
||||
* It directly deserializes and serializes messages from network, minimizing
|
||||
* memory use.
|
||||
*
|
||||
* For flexibility, this example is implemented using posix api.
|
||||
* In a real embedded system you would typically use some other kind of
|
||||
* a communication and filesystem layer.
|
||||
*/
|
||||
|
||||
#include <sys/socket.h>
|
||||
#include <sys/types.h>
|
||||
#include <netinet/in.h>
|
||||
#include <unistd.h>
|
||||
#include <dirent.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <pb_encode.h>
|
||||
#include <pb_decode.h>
|
||||
|
||||
#include "fileproto.pb.h"
|
||||
#include "common.h"
|
||||
|
||||
/* This callback function will be called once for each filename received
|
||||
* from the server. The filenames will be printed out immediately, so that
|
||||
* no memory has to be allocated for them.
|
||||
*/
|
||||
bool printfile_callback(pb_istream_t *stream, const pb_field_t *field, void **arg)
|
||||
{
|
||||
FileInfo fileinfo = {};
|
||||
|
||||
if (!pb_decode(stream, FileInfo_fields, &fileinfo))
|
||||
return false;
|
||||
|
||||
printf("%-10lld %s\n", (long long)fileinfo.inode, fileinfo.name);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/* This function sends a request to socket 'fd' to list the files in
|
||||
* directory given in 'path'. The results received from server will
|
||||
* be printed to stdout.
|
||||
*/
|
||||
bool listdir(int fd, char *path)
|
||||
{
|
||||
/* Construct and send the request to server */
|
||||
{
|
||||
ListFilesRequest request = {};
|
||||
pb_ostream_t output = pb_ostream_from_socket(fd);
|
||||
|
||||
/* In our protocol, path is optional. If it is not given,
|
||||
* the server will list the root directory. */
|
||||
if (path == NULL)
|
||||
{
|
||||
request.has_path = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
request.has_path = true;
|
||||
if (strlen(path) + 1 > sizeof(request.path))
|
||||
{
|
||||
fprintf(stderr, "Too long path.\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
strcpy(request.path, path);
|
||||
}
|
||||
|
||||
/* Encode the request. It is written to the socket immediately
|
||||
* through our custom stream. */
|
||||
if (!pb_encode_delimited(&output, ListFilesRequest_fields, &request))
|
||||
{
|
||||
fprintf(stderr, "Encoding failed: %s\n", PB_GET_ERROR(&output));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/* Read back the response from server */
|
||||
{
|
||||
ListFilesResponse response = {};
|
||||
pb_istream_t input = pb_istream_from_socket(fd);
|
||||
|
||||
/* Give a pointer to our callback function, which will handle the
|
||||
* filenames as they arrive. */
|
||||
response.file.funcs.decode = &printfile_callback;
|
||||
|
||||
if (!pb_decode_delimited(&input, ListFilesResponse_fields, &response))
|
||||
{
|
||||
fprintf(stderr, "Decode failed: %s\n", PB_GET_ERROR(&input));
|
||||
return false;
|
||||
}
|
||||
|
||||
/* If the message from server decodes properly, but directory was
|
||||
* not found on server side, we get path_error == true. */
|
||||
if (response.path_error)
|
||||
{
|
||||
fprintf(stderr, "Server reported error.\n");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int sockfd;
|
||||
struct sockaddr_in servaddr;
|
||||
char *path = NULL;
|
||||
|
||||
if (argc > 1)
|
||||
path = argv[1];
|
||||
|
||||
sockfd = socket(AF_INET, SOCK_STREAM, 0);
|
||||
|
||||
/* Connect to server running on localhost:1234 */
|
||||
memset(&servaddr, 0, sizeof(servaddr));
|
||||
servaddr.sin_family = AF_INET;
|
||||
servaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
|
||||
servaddr.sin_port = htons(1234);
|
||||
|
||||
if (connect(sockfd, (struct sockaddr *)&servaddr, sizeof(servaddr)) != 0)
|
||||
{
|
||||
perror("connect");
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Send the directory listing request */
|
||||
if (!listdir(sockfd, path))
|
||||
return 2;
|
||||
|
||||
/* Close connection */
|
||||
close(sockfd);
|
||||
|
||||
return 0;
|
||||
}
|
40
extra/nanopb/examples/network_server/common.c
Normal file
40
extra/nanopb/examples/network_server/common.c
Normal file
|
@ -0,0 +1,40 @@
|
|||
/* Simple binding of nanopb streams to TCP sockets.
|
||||
*/
|
||||
|
||||
#include <sys/socket.h>
|
||||
#include <sys/types.h>
|
||||
#include <pb_encode.h>
|
||||
#include <pb_decode.h>
|
||||
|
||||
#include "common.h"
|
||||
|
||||
static bool write_callback(pb_ostream_t *stream, const uint8_t *buf, size_t count)
|
||||
{
|
||||
int fd = (intptr_t)stream->state;
|
||||
return send(fd, buf, count, 0) == count;
|
||||
}
|
||||
|
||||
static bool read_callback(pb_istream_t *stream, uint8_t *buf, size_t count)
|
||||
{
|
||||
int fd = (intptr_t)stream->state;
|
||||
int result;
|
||||
|
||||
result = recv(fd, buf, count, MSG_WAITALL);
|
||||
|
||||
if (result == 0)
|
||||
stream->bytes_left = 0; /* EOF */
|
||||
|
||||
return result == count;
|
||||
}
|
||||
|
||||
pb_ostream_t pb_ostream_from_socket(int fd)
|
||||
{
|
||||
pb_ostream_t stream = {&write_callback, (void*)(intptr_t)fd, SIZE_MAX, 0};
|
||||
return stream;
|
||||
}
|
||||
|
||||
pb_istream_t pb_istream_from_socket(int fd)
|
||||
{
|
||||
pb_istream_t stream = {&read_callback, (void*)(intptr_t)fd, SIZE_MAX};
|
||||
return stream;
|
||||
}
|
9
extra/nanopb/examples/network_server/common.h
Normal file
9
extra/nanopb/examples/network_server/common.h
Normal file
|
@ -0,0 +1,9 @@
|
|||
#ifndef _PB_EXAMPLE_COMMON_H_
|
||||
#define _PB_EXAMPLE_COMMON_H_
|
||||
|
||||
#include <pb.h>
|
||||
|
||||
pb_ostream_t pb_ostream_from_socket(int fd);
|
||||
pb_istream_t pb_istream_from_socket(int fd);
|
||||
|
||||
#endif
|
13
extra/nanopb/examples/network_server/fileproto.options
Normal file
13
extra/nanopb/examples/network_server/fileproto.options
Normal file
|
@ -0,0 +1,13 @@
|
|||
# This file defines the nanopb-specific options for the messages defined
|
||||
# in fileproto.proto.
|
||||
#
|
||||
# If you come from high-level programming background, the hardcoded
|
||||
# maximum lengths may disgust you. However, if your microcontroller only
|
||||
# has a few kB of ram to begin with, setting reasonable limits for
|
||||
# filenames is ok.
|
||||
#
|
||||
# On the other hand, using the callback interface, it is not necessary
|
||||
# to set a limit on the number of files in the response.
|
||||
|
||||
ListFilesRequest.path max_size:128
|
||||
FileInfo.name max_size:128
|
20
extra/nanopb/examples/network_server/fileproto.proto
Normal file
20
extra/nanopb/examples/network_server/fileproto.proto
Normal file
|
@ -0,0 +1,20 @@
|
|||
// This defines protocol for a simple server that lists files.
|
||||
//
|
||||
// See also the nanopb-specific options in fileproto.options.
|
||||
|
||||
syntax = "proto2";
|
||||
|
||||
message ListFilesRequest {
|
||||
optional string path = 1 [default = "/"];
|
||||
}
|
||||
|
||||
message FileInfo {
|
||||
required uint64 inode = 1;
|
||||
required string name = 2;
|
||||
}
|
||||
|
||||
message ListFilesResponse {
|
||||
optional bool path_error = 1 [default = false];
|
||||
repeated FileInfo file = 2;
|
||||
}
|
||||
|
162
extra/nanopb/examples/network_server/server.c
Normal file
162
extra/nanopb/examples/network_server/server.c
Normal file
|
@ -0,0 +1,162 @@
|
|||
/* This is a simple TCP server that listens on port 1234 and provides lists
|
||||
* of files to clients, using a protocol defined in file_server.proto.
|
||||
*
|
||||
* It directly deserializes and serializes messages from network, minimizing
|
||||
* memory use.
|
||||
*
|
||||
* For flexibility, this example is implemented using posix api.
|
||||
* In a real embedded system you would typically use some other kind of
|
||||
* a communication and filesystem layer.
|
||||
*/
|
||||
|
||||
#include <sys/socket.h>
|
||||
#include <sys/types.h>
|
||||
#include <netinet/in.h>
|
||||
#include <unistd.h>
|
||||
#include <dirent.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <pb_encode.h>
|
||||
#include <pb_decode.h>
|
||||
|
||||
#include "fileproto.pb.h"
|
||||
#include "common.h"
|
||||
|
||||
/* This callback function will be called once during the encoding.
|
||||
* It will write out any number of FileInfo entries, without consuming unnecessary memory.
|
||||
* This is accomplished by fetching the filenames one at a time and encoding them
|
||||
* immediately.
|
||||
*/
|
||||
bool listdir_callback(pb_ostream_t *stream, const pb_field_t *field, void * const *arg)
|
||||
{
|
||||
DIR *dir = (DIR*) *arg;
|
||||
struct dirent *file;
|
||||
FileInfo fileinfo = {};
|
||||
|
||||
while ((file = readdir(dir)) != NULL)
|
||||
{
|
||||
fileinfo.inode = file->d_ino;
|
||||
strncpy(fileinfo.name, file->d_name, sizeof(fileinfo.name));
|
||||
fileinfo.name[sizeof(fileinfo.name) - 1] = '\0';
|
||||
|
||||
/* This encodes the header for the field, based on the constant info
|
||||
* from pb_field_t. */
|
||||
if (!pb_encode_tag_for_field(stream, field))
|
||||
return false;
|
||||
|
||||
/* This encodes the data for the field, based on our FileInfo structure. */
|
||||
if (!pb_encode_submessage(stream, FileInfo_fields, &fileinfo))
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Because the main program uses pb_encode_delimited(), this callback will be
|
||||
* called twice. Rewind the directory for the next call. */
|
||||
rewinddir(dir);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Handle one arriving client connection.
|
||||
* Clients are expected to send a ListFilesRequest, terminated by a '0'.
|
||||
* Server will respond with a ListFilesResponse message.
|
||||
*/
|
||||
void handle_connection(int connfd)
|
||||
{
|
||||
DIR *directory = NULL;
|
||||
|
||||
/* Decode the message from the client and open the requested directory. */
|
||||
{
|
||||
ListFilesRequest request = {};
|
||||
pb_istream_t input = pb_istream_from_socket(connfd);
|
||||
|
||||
if (!pb_decode_delimited(&input, ListFilesRequest_fields, &request))
|
||||
{
|
||||
printf("Decode failed: %s\n", PB_GET_ERROR(&input));
|
||||
return;
|
||||
}
|
||||
|
||||
directory = opendir(request.path);
|
||||
printf("Listing directory: %s\n", request.path);
|
||||
}
|
||||
|
||||
/* List the files in the directory and transmit the response to client */
|
||||
{
|
||||
ListFilesResponse response = {};
|
||||
pb_ostream_t output = pb_ostream_from_socket(connfd);
|
||||
|
||||
if (directory == NULL)
|
||||
{
|
||||
perror("opendir");
|
||||
|
||||
/* Directory was not found, transmit error status */
|
||||
response.has_path_error = true;
|
||||
response.path_error = true;
|
||||
response.file.funcs.encode = NULL;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Directory was found, transmit filenames */
|
||||
response.has_path_error = false;
|
||||
response.file.funcs.encode = &listdir_callback;
|
||||
response.file.arg = directory;
|
||||
}
|
||||
|
||||
if (!pb_encode_delimited(&output, ListFilesResponse_fields, &response))
|
||||
{
|
||||
printf("Encoding failed: %s\n", PB_GET_ERROR(&output));
|
||||
}
|
||||
}
|
||||
|
||||
if (directory != NULL)
|
||||
closedir(directory);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int listenfd, connfd;
|
||||
struct sockaddr_in servaddr;
|
||||
int reuse = 1;
|
||||
|
||||
/* Listen on localhost:1234 for TCP connections */
|
||||
listenfd = socket(AF_INET, SOCK_STREAM, 0);
|
||||
setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse));
|
||||
|
||||
memset(&servaddr, 0, sizeof(servaddr));
|
||||
servaddr.sin_family = AF_INET;
|
||||
servaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
|
||||
servaddr.sin_port = htons(1234);
|
||||
if (bind(listenfd, (struct sockaddr*)&servaddr, sizeof(servaddr)) != 0)
|
||||
{
|
||||
perror("bind");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (listen(listenfd, 5) != 0)
|
||||
{
|
||||
perror("listen");
|
||||
return 1;
|
||||
}
|
||||
|
||||
for(;;)
|
||||
{
|
||||
/* Wait for a client */
|
||||
connfd = accept(listenfd, NULL, NULL);
|
||||
|
||||
if (connfd < 0)
|
||||
{
|
||||
perror("accept");
|
||||
return 1;
|
||||
}
|
||||
|
||||
printf("Got connection.\n");
|
||||
|
||||
handle_connection(connfd);
|
||||
|
||||
printf("Closing connection.\n");
|
||||
|
||||
close(connfd);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
22
extra/nanopb/examples/simple/Makefile
Normal file
22
extra/nanopb/examples/simple/Makefile
Normal file
|
@ -0,0 +1,22 @@
|
|||
# Include the nanopb provided Makefile rules
|
||||
include ../../extra/nanopb.mk
|
||||
|
||||
# Compiler flags to enable all warnings & debug info
|
||||
CFLAGS = -Wall -Werror -g -O0
|
||||
CFLAGS += -I$(NANOPB_DIR)
|
||||
|
||||
# C source code files that are required
|
||||
CSRC = simple.c # The main program
|
||||
CSRC += simple.pb.c # The compiled protocol definition
|
||||
CSRC += $(NANOPB_DIR)/pb_encode.c # The nanopb encoder
|
||||
CSRC += $(NANOPB_DIR)/pb_decode.c # The nanopb decoder
|
||||
CSRC += $(NANOPB_DIR)/pb_common.c # The nanopb common parts
|
||||
|
||||
# Build rule for the main program
|
||||
simple: $(CSRC)
|
||||
$(CC) $(CFLAGS) -osimple $(CSRC)
|
||||
|
||||
# Build rule for the protocol
|
||||
simple.pb.c: simple.proto
|
||||
$(PROTOC) $(PROTOC_OPTS) --nanopb_out=. simple.proto
|
||||
|
29
extra/nanopb/examples/simple/README.txt
Normal file
29
extra/nanopb/examples/simple/README.txt
Normal file
|
@ -0,0 +1,29 @@
|
|||
Nanopb example "simple"
|
||||
=======================
|
||||
|
||||
This example demonstrates the very basic use of nanopb. It encodes and
|
||||
decodes a simple message.
|
||||
|
||||
The code uses four different API functions:
|
||||
|
||||
* pb_ostream_from_buffer() to declare the output buffer that is to be used
|
||||
* pb_encode() to encode a message
|
||||
* pb_istream_from_buffer() to declare the input buffer that is to be used
|
||||
* pb_decode() to decode a message
|
||||
|
||||
Example usage
|
||||
-------------
|
||||
|
||||
On Linux, simply type "make" to build the example. After that, you can
|
||||
run it with the command: ./simple
|
||||
|
||||
On other platforms, you first have to compile the protocol definition using
|
||||
the following command::
|
||||
|
||||
../../generator-bin/protoc --nanopb_out=. simple.proto
|
||||
|
||||
After that, add the following four files to your project and compile:
|
||||
|
||||
simple.c simple.pb.c pb_encode.c pb_decode.c
|
||||
|
||||
|
71
extra/nanopb/examples/simple/simple.c
Normal file
71
extra/nanopb/examples/simple/simple.c
Normal file
|
@ -0,0 +1,71 @@
|
|||
#include <stdio.h>
|
||||
#include <pb_encode.h>
|
||||
#include <pb_decode.h>
|
||||
#include "simple.pb.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
/* This is the buffer where we will store our message. */
|
||||
uint8_t buffer[128];
|
||||
size_t message_length;
|
||||
bool status;
|
||||
|
||||
/* Encode our message */
|
||||
{
|
||||
/* Allocate space on the stack to store the message data.
|
||||
*
|
||||
* Nanopb generates simple struct definitions for all the messages.
|
||||
* - check out the contents of simple.pb.h!
|
||||
* It is a good idea to always initialize your structures
|
||||
* so that you do not have garbage data from RAM in there.
|
||||
*/
|
||||
SimpleMessage message = SimpleMessage_init_zero;
|
||||
|
||||
/* Create a stream that will write to our buffer. */
|
||||
pb_ostream_t stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
|
||||
|
||||
/* Fill in the lucky number */
|
||||
message.lucky_number = 13;
|
||||
|
||||
/* Now we are ready to encode the message! */
|
||||
status = pb_encode(&stream, SimpleMessage_fields, &message);
|
||||
message_length = stream.bytes_written;
|
||||
|
||||
/* Then just check for any errors.. */
|
||||
if (!status)
|
||||
{
|
||||
printf("Encoding failed: %s\n", PB_GET_ERROR(&stream));
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Now we could transmit the message over network, store it in a file or
|
||||
* wrap it to a pigeon's leg.
|
||||
*/
|
||||
|
||||
/* But because we are lazy, we will just decode it immediately. */
|
||||
|
||||
{
|
||||
/* Allocate space for the decoded message. */
|
||||
SimpleMessage message = SimpleMessage_init_zero;
|
||||
|
||||
/* Create a stream that reads from the buffer. */
|
||||
pb_istream_t stream = pb_istream_from_buffer(buffer, message_length);
|
||||
|
||||
/* Now we are ready to decode the message. */
|
||||
status = pb_decode(&stream, SimpleMessage_fields, &message);
|
||||
|
||||
/* Check for errors... */
|
||||
if (!status)
|
||||
{
|
||||
printf("Decoding failed: %s\n", PB_GET_ERROR(&stream));
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Print the data contained in the message. */
|
||||
printf("Your lucky number was %d!\n", (int)message.lucky_number);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
9
extra/nanopb/examples/simple/simple.proto
Normal file
9
extra/nanopb/examples/simple/simple.proto
Normal file
|
@ -0,0 +1,9 @@
|
|||
// A very simple protocol definition, consisting of only
|
||||
// one message.
|
||||
|
||||
syntax = "proto2";
|
||||
|
||||
message SimpleMessage {
|
||||
required int32 lucky_number = 1;
|
||||
}
|
||||
|
24
extra/nanopb/examples/using_double_on_avr/Makefile
Normal file
24
extra/nanopb/examples/using_double_on_avr/Makefile
Normal file
|
@ -0,0 +1,24 @@
|
|||
# Include the nanopb provided Makefile rules
|
||||
include ../../extra/nanopb.mk
|
||||
|
||||
# Compiler flags to enable all warnings & debug info
|
||||
CFLAGS = -Wall -Werror -g -O0
|
||||
CFLAGS += -I$(NANOPB_DIR)
|
||||
|
||||
all: run_tests
|
||||
|
||||
.SUFFIXES:
|
||||
|
||||
clean:
|
||||
rm -f test_conversions encode_double decode_double doubleproto.pb.c doubleproto.pb.h
|
||||
|
||||
test_conversions: test_conversions.c double_conversion.c
|
||||
$(CC) $(CFLAGS) -o $@ $^
|
||||
|
||||
%: %.c double_conversion.c doubleproto.pb.c
|
||||
$(CC) $(CFLAGS) -o $@ $^ $(NANOPB_CORE)
|
||||
|
||||
run_tests: test_conversions encode_double decode_double
|
||||
./test_conversions
|
||||
./encode_double | ./decode_double
|
||||
|
25
extra/nanopb/examples/using_double_on_avr/README.txt
Normal file
25
extra/nanopb/examples/using_double_on_avr/README.txt
Normal file
|
@ -0,0 +1,25 @@
|
|||
Nanopb example "using_double_on_avr"
|
||||
====================================
|
||||
|
||||
Some processors/compilers, such as AVR-GCC, do not support the double
|
||||
datatype. Instead, they have sizeof(double) == 4. Because protocol
|
||||
binary format uses the double encoding directly, this causes trouble
|
||||
if the protocol in .proto requires double fields.
|
||||
|
||||
This directory contains a solution to this problem. It uses uint64_t
|
||||
to store the raw wire values, because its size is correct on all
|
||||
platforms. The file double_conversion.c provides functions that
|
||||
convert these values to/from floats, without relying on compiler
|
||||
support.
|
||||
|
||||
To use this method, you need to make some modifications to your code:
|
||||
|
||||
1) Change all 'double' fields into 'fixed64' in the .proto.
|
||||
|
||||
2) Whenever writing to a 'double' field, use float_to_double().
|
||||
|
||||
3) Whenever reading a 'double' field, use double_to_float().
|
||||
|
||||
The conversion routines are as accurate as the float datatype can
|
||||
be. Furthermore, they should handle all special values (NaN, inf, denormalized
|
||||
numbers) correctly. There are testcases in test_conversions.c.
|
33
extra/nanopb/examples/using_double_on_avr/decode_double.c
Normal file
33
extra/nanopb/examples/using_double_on_avr/decode_double.c
Normal file
|
@ -0,0 +1,33 @@
|
|||
/* Decodes a double value into a float variable.
|
||||
* Used to read double values with AVR code, which doesn't support double directly.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <pb_decode.h>
|
||||
#include "double_conversion.h"
|
||||
#include "doubleproto.pb.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
uint8_t buffer[32];
|
||||
size_t count = fread(buffer, 1, sizeof(buffer), stdin);
|
||||
pb_istream_t stream = pb_istream_from_buffer(buffer, count);
|
||||
|
||||
AVRDoubleMessage message;
|
||||
pb_decode(&stream, AVRDoubleMessage_fields, &message);
|
||||
|
||||
float v1 = double_to_float(message.field1);
|
||||
float v2 = double_to_float(message.field2);
|
||||
|
||||
printf("Values: %f %f\n", v1, v2);
|
||||
|
||||
if (v1 == 1234.5678f &&
|
||||
v2 == 0.00001f)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
}
|
123
extra/nanopb/examples/using_double_on_avr/double_conversion.c
Normal file
123
extra/nanopb/examples/using_double_on_avr/double_conversion.c
Normal file
|
@ -0,0 +1,123 @@
|
|||
/* Conversion routines for platforms that do not support 'double' directly. */
|
||||
|
||||
#include "double_conversion.h"
|
||||
#include <math.h>
|
||||
|
||||
typedef union {
|
||||
float f;
|
||||
uint32_t i;
|
||||
} conversion_t;
|
||||
|
||||
/* Note: IEE 754 standard specifies float formats as follows:
|
||||
* Single precision: sign, 8-bit exp, 23-bit frac.
|
||||
* Double precision: sign, 11-bit exp, 52-bit frac.
|
||||
*/
|
||||
|
||||
uint64_t float_to_double(float value)
|
||||
{
|
||||
conversion_t in;
|
||||
in.f = value;
|
||||
uint8_t sign;
|
||||
int16_t exponent;
|
||||
uint64_t mantissa;
|
||||
|
||||
/* Decompose input value */
|
||||
sign = (in.i >> 31) & 1;
|
||||
exponent = ((in.i >> 23) & 0xFF) - 127;
|
||||
mantissa = in.i & 0x7FFFFF;
|
||||
|
||||
if (exponent == 128)
|
||||
{
|
||||
/* Special value (NaN etc.) */
|
||||
exponent = 1024;
|
||||
}
|
||||
else if (exponent == -127)
|
||||
{
|
||||
if (!mantissa)
|
||||
{
|
||||
/* Zero */
|
||||
exponent = -1023;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Denormalized */
|
||||
mantissa <<= 1;
|
||||
while (!(mantissa & 0x800000))
|
||||
{
|
||||
mantissa <<= 1;
|
||||
exponent--;
|
||||
}
|
||||
mantissa &= 0x7FFFFF;
|
||||
}
|
||||
}
|
||||
|
||||
/* Combine fields */
|
||||
mantissa <<= 29;
|
||||
mantissa |= (uint64_t)(exponent + 1023) << 52;
|
||||
mantissa |= (uint64_t)sign << 63;
|
||||
|
||||
return mantissa;
|
||||
}
|
||||
|
||||
float double_to_float(uint64_t value)
|
||||
{
|
||||
uint8_t sign;
|
||||
int16_t exponent;
|
||||
uint32_t mantissa;
|
||||
conversion_t out;
|
||||
|
||||
/* Decompose input value */
|
||||
sign = (value >> 63) & 1;
|
||||
exponent = ((value >> 52) & 0x7FF) - 1023;
|
||||
mantissa = (value >> 28) & 0xFFFFFF; /* Highest 24 bits */
|
||||
|
||||
/* Figure if value is in range representable by floats. */
|
||||
if (exponent == 1024)
|
||||
{
|
||||
/* Special value */
|
||||
exponent = 128;
|
||||
}
|
||||
else if (exponent > 127)
|
||||
{
|
||||
/* Too large */
|
||||
if (sign)
|
||||
return -INFINITY;
|
||||
else
|
||||
return INFINITY;
|
||||
}
|
||||
else if (exponent < -150)
|
||||
{
|
||||
/* Too small */
|
||||
if (sign)
|
||||
return -0.0f;
|
||||
else
|
||||
return 0.0f;
|
||||
}
|
||||
else if (exponent < -126)
|
||||
{
|
||||
/* Denormalized */
|
||||
mantissa |= 0x1000000;
|
||||
mantissa >>= (-126 - exponent);
|
||||
exponent = -127;
|
||||
}
|
||||
|
||||
/* Round off mantissa */
|
||||
mantissa = (mantissa + 1) >> 1;
|
||||
|
||||
/* Check if mantissa went over 2.0 */
|
||||
if (mantissa & 0x800000)
|
||||
{
|
||||
exponent += 1;
|
||||
mantissa &= 0x7FFFFF;
|
||||
mantissa >>= 1;
|
||||
}
|
||||
|
||||
/* Combine fields */
|
||||
out.i = mantissa;
|
||||
out.i |= (uint32_t)(exponent + 127) << 23;
|
||||
out.i |= (uint32_t)sign << 31;
|
||||
|
||||
return out.f;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
/* AVR-GCC does not have real double datatype. Instead its double
|
||||
* is equal to float, i.e. 32 bit value. If you need to communicate
|
||||
* with other systems that use double in their .proto files, you
|
||||
* need to do some conversion.
|
||||
*
|
||||
* These functions use bitwise operations to mangle floats into doubles
|
||||
* and then store them in uint64_t datatype.
|
||||
*/
|
||||
|
||||
#ifndef DOUBLE_CONVERSION
|
||||
#define DOUBLE_CONVERSION
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
/* Convert native 4-byte float into a 8-byte double. */
|
||||
extern uint64_t float_to_double(float value);
|
||||
|
||||
/* Convert 8-byte double into native 4-byte float.
|
||||
* Values are rounded to nearest, 0.5 away from zero.
|
||||
* Overflowing values are converted to Inf or -Inf.
|
||||
*/
|
||||
extern float double_to_float(uint64_t value);
|
||||
|
||||
|
||||
#endif
|
||||
|
15
extra/nanopb/examples/using_double_on_avr/doubleproto.proto
Normal file
15
extra/nanopb/examples/using_double_on_avr/doubleproto.proto
Normal file
|
@ -0,0 +1,15 @@
|
|||
// A message containing doubles, as used by other applications.
|
||||
syntax = "proto2";
|
||||
|
||||
message DoubleMessage {
|
||||
required double field1 = 1;
|
||||
required double field2 = 2;
|
||||
}
|
||||
|
||||
// A message containing doubles, but redefined using uint64_t.
|
||||
// For use in AVR code.
|
||||
message AVRDoubleMessage {
|
||||
required fixed64 field1 = 1;
|
||||
required fixed64 field2 = 2;
|
||||
}
|
||||
|
25
extra/nanopb/examples/using_double_on_avr/encode_double.c
Normal file
25
extra/nanopb/examples/using_double_on_avr/encode_double.c
Normal file
|
@ -0,0 +1,25 @@
|
|||
/* Encodes a float value into a double on the wire.
|
||||
* Used to emit doubles from AVR code, which doesn't support double directly.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <pb_encode.h>
|
||||
#include "double_conversion.h"
|
||||
#include "doubleproto.pb.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
AVRDoubleMessage message = {
|
||||
float_to_double(1234.5678f),
|
||||
float_to_double(0.00001f)
|
||||
};
|
||||
|
||||
uint8_t buffer[32];
|
||||
pb_ostream_t stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
|
||||
|
||||
pb_encode(&stream, AVRDoubleMessage_fields, &message);
|
||||
fwrite(buffer, 1, stream.bytes_written, stdout);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
56
extra/nanopb/examples/using_double_on_avr/test_conversions.c
Normal file
56
extra/nanopb/examples/using_double_on_avr/test_conversions.c
Normal file
|
@ -0,0 +1,56 @@
|
|||
#include "double_conversion.h"
|
||||
#include <math.h>
|
||||
#include <stdio.h>
|
||||
|
||||
static const double testvalues[] = {
|
||||
0.0, -0.0, 0.1, -0.1,
|
||||
M_PI, -M_PI, 123456.789, -123456.789,
|
||||
INFINITY, -INFINITY, NAN, INFINITY - INFINITY,
|
||||
1e38, -1e38, 1e39, -1e39,
|
||||
1e-38, -1e-38, 1e-39, -1e-39,
|
||||
3.14159e-37,-3.14159e-37, 3.14159e-43, -3.14159e-43,
|
||||
1e-60, -1e-60, 1e-45, -1e-45,
|
||||
0.99999999999999, -0.99999999999999, 127.999999999999, -127.999999999999
|
||||
};
|
||||
|
||||
#define TESTVALUES_COUNT (sizeof(testvalues)/sizeof(testvalues[0]))
|
||||
|
||||
int main()
|
||||
{
|
||||
int status = 0;
|
||||
int i;
|
||||
for (i = 0; i < TESTVALUES_COUNT; i++)
|
||||
{
|
||||
double orig = testvalues[i];
|
||||
float expected_float = (float)orig;
|
||||
double expected_double = (double)expected_float;
|
||||
|
||||
float got_float = double_to_float(*(uint64_t*)&orig);
|
||||
uint64_t got_double = float_to_double(got_float);
|
||||
|
||||
uint32_t e1 = *(uint32_t*)&expected_float;
|
||||
uint32_t g1 = *(uint32_t*)&got_float;
|
||||
uint64_t e2 = *(uint64_t*)&expected_double;
|
||||
uint64_t g2 = got_double;
|
||||
|
||||
if (g1 != e1)
|
||||
{
|
||||
printf("%3d double_to_float fail: %08x != %08x\n", i, g1, e1);
|
||||
status = 1;
|
||||
}
|
||||
|
||||
if (g2 != e2)
|
||||
{
|
||||
printf("%3d float_to_double fail: %016llx != %016llx\n", i,
|
||||
(unsigned long long)g2,
|
||||
(unsigned long long)e2);
|
||||
status = 1;
|
||||
}
|
||||
}
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
20
extra/nanopb/examples/using_union_messages/Makefile
Normal file
20
extra/nanopb/examples/using_union_messages/Makefile
Normal file
|
@ -0,0 +1,20 @@
|
|||
# Include the nanopb provided Makefile rules
|
||||
include ../../extra/nanopb.mk
|
||||
|
||||
# Compiler flags to enable all warnings & debug info
|
||||
CFLAGS = -ansi -Wall -Werror -g -O0
|
||||
CFLAGS += -I$(NANOPB_DIR)
|
||||
|
||||
all: encode decode
|
||||
./encode 1 | ./decode
|
||||
./encode 2 | ./decode
|
||||
./encode 3 | ./decode
|
||||
|
||||
.SUFFIXES:
|
||||
|
||||
clean:
|
||||
rm -f encode unionproto.pb.h unionproto.pb.c
|
||||
|
||||
%: %.c unionproto.pb.c
|
||||
$(CC) $(CFLAGS) -o $@ $^ $(NANOPB_CORE)
|
||||
|
55
extra/nanopb/examples/using_union_messages/README.txt
Normal file
55
extra/nanopb/examples/using_union_messages/README.txt
Normal file
|
@ -0,0 +1,55 @@
|
|||
Nanopb example "using_union_messages"
|
||||
=====================================
|
||||
|
||||
Union messages is a common technique in Google Protocol Buffers used to
|
||||
represent a group of messages, only one of which is passed at a time.
|
||||
It is described in Google's documentation:
|
||||
https://developers.google.com/protocol-buffers/docs/techniques#union
|
||||
|
||||
This directory contains an example on how to encode and decode union messages
|
||||
with minimal memory usage. Usually, nanopb would allocate space to store
|
||||
all of the possible messages at the same time, even though at most one of
|
||||
them will be used at a time.
|
||||
|
||||
By using some of the lower level nanopb APIs, we can manually generate the
|
||||
top level message, so that we only need to allocate the one submessage that
|
||||
we actually want. Similarly when decoding, we can manually read the tag of
|
||||
the top level message, and only then allocate the memory for the submessage
|
||||
after we already know its type.
|
||||
|
||||
NOTE: There is a newer protobuf feature called `oneof` that is also supported
|
||||
by nanopb. It might be a better option for new code.
|
||||
|
||||
|
||||
Example usage
|
||||
-------------
|
||||
|
||||
Type `make` to run the example. It will build it and run commands like
|
||||
following:
|
||||
|
||||
./encode 1 | ./decode
|
||||
Got MsgType1: 42
|
||||
./encode 2 | ./decode
|
||||
Got MsgType2: true
|
||||
./encode 3 | ./decode
|
||||
Got MsgType3: 3 1415
|
||||
|
||||
This simply demonstrates that the "decode" program has correctly identified
|
||||
the type of the received message, and managed to decode it.
|
||||
|
||||
|
||||
Details of implementation
|
||||
-------------------------
|
||||
|
||||
unionproto.proto contains the protocol used in the example. It consists of
|
||||
three messages: MsgType1, MsgType2 and MsgType3, which are collected together
|
||||
into UnionMessage.
|
||||
|
||||
encode.c takes one command line argument, which should be a number 1-3. It
|
||||
then fills in and encodes the corresponding message, and writes it to stdout.
|
||||
|
||||
decode.c reads a UnionMessage from stdin. Then it calls the function
|
||||
decode_unionmessage_type() to determine the type of the message. After that,
|
||||
the corresponding message is decoded and the contents of it printed to the
|
||||
screen.
|
||||
|
96
extra/nanopb/examples/using_union_messages/decode.c
Normal file
96
extra/nanopb/examples/using_union_messages/decode.c
Normal file
|
@ -0,0 +1,96 @@
|
|||
/* This program reads a message from stdin, detects its type and decodes it.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <pb_decode.h>
|
||||
#include "unionproto.pb.h"
|
||||
|
||||
/* This function reads manually the first tag from the stream and finds the
|
||||
* corresponding message type. It doesn't yet decode the actual message.
|
||||
*
|
||||
* Returns a pointer to the MsgType_fields array, as an identifier for the
|
||||
* message type. Returns null if the tag is of unknown type or an error occurs.
|
||||
*/
|
||||
const pb_field_t* decode_unionmessage_type(pb_istream_t *stream)
|
||||
{
|
||||
pb_wire_type_t wire_type;
|
||||
uint32_t tag;
|
||||
bool eof;
|
||||
|
||||
while (pb_decode_tag(stream, &wire_type, &tag, &eof))
|
||||
{
|
||||
if (wire_type == PB_WT_STRING)
|
||||
{
|
||||
const pb_field_t *field;
|
||||
for (field = UnionMessage_fields; field->tag != 0; field++)
|
||||
{
|
||||
if (field->tag == tag && (field->type & PB_LTYPE_SUBMESSAGE))
|
||||
{
|
||||
/* Found our field. */
|
||||
return field->ptr;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Wasn't our field.. */
|
||||
pb_skip_field(stream, wire_type);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
bool decode_unionmessage_contents(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct)
|
||||
{
|
||||
pb_istream_t substream;
|
||||
bool status;
|
||||
if (!pb_make_string_substream(stream, &substream))
|
||||
return false;
|
||||
|
||||
status = pb_decode(&substream, fields, dest_struct);
|
||||
pb_close_string_substream(stream, &substream);
|
||||
return status;
|
||||
}
|
||||
|
||||
int main()
|
||||
{
|
||||
/* Read the data into buffer */
|
||||
uint8_t buffer[512];
|
||||
size_t count = fread(buffer, 1, sizeof(buffer), stdin);
|
||||
pb_istream_t stream = pb_istream_from_buffer(buffer, count);
|
||||
|
||||
const pb_field_t *type = decode_unionmessage_type(&stream);
|
||||
bool status = false;
|
||||
|
||||
if (type == MsgType1_fields)
|
||||
{
|
||||
MsgType1 msg = {};
|
||||
status = decode_unionmessage_contents(&stream, MsgType1_fields, &msg);
|
||||
printf("Got MsgType1: %d\n", msg.value);
|
||||
}
|
||||
else if (type == MsgType2_fields)
|
||||
{
|
||||
MsgType2 msg = {};
|
||||
status = decode_unionmessage_contents(&stream, MsgType2_fields, &msg);
|
||||
printf("Got MsgType2: %s\n", msg.value ? "true" : "false");
|
||||
}
|
||||
else if (type == MsgType3_fields)
|
||||
{
|
||||
MsgType3 msg = {};
|
||||
status = decode_unionmessage_contents(&stream, MsgType3_fields, &msg);
|
||||
printf("Got MsgType3: %d %d\n", msg.value1, msg.value2);
|
||||
}
|
||||
|
||||
if (!status)
|
||||
{
|
||||
printf("Decode failed: %s\n", PB_GET_ERROR(&stream));
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
85
extra/nanopb/examples/using_union_messages/encode.c
Normal file
85
extra/nanopb/examples/using_union_messages/encode.c
Normal file
|
@ -0,0 +1,85 @@
|
|||
/* This program takes a command line argument and encodes a message in
|
||||
* one of MsgType1, MsgType2 or MsgType3.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <pb_encode.h>
|
||||
#include "unionproto.pb.h"
|
||||
|
||||
/* This function is the core of the union encoding process. It handles
|
||||
* the top-level pb_field_t array manually, in order to encode a correct
|
||||
* field tag before the message. The pointer to MsgType_fields array is
|
||||
* used as an unique identifier for the message type.
|
||||
*/
|
||||
bool encode_unionmessage(pb_ostream_t *stream, const pb_field_t messagetype[], const void *message)
|
||||
{
|
||||
const pb_field_t *field;
|
||||
for (field = UnionMessage_fields; field->tag != 0; field++)
|
||||
{
|
||||
if (field->ptr == messagetype)
|
||||
{
|
||||
/* This is our field, encode the message using it. */
|
||||
if (!pb_encode_tag_for_field(stream, field))
|
||||
return false;
|
||||
|
||||
return pb_encode_submessage(stream, messagetype, message);
|
||||
}
|
||||
}
|
||||
|
||||
/* Didn't find the field for messagetype */
|
||||
return false;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
if (argc != 2)
|
||||
{
|
||||
fprintf(stderr, "Usage: %s (1|2|3)\n", argv[0]);
|
||||
return 1;
|
||||
}
|
||||
|
||||
uint8_t buffer[512];
|
||||
pb_ostream_t stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
|
||||
|
||||
bool status = false;
|
||||
int msgtype = atoi(argv[1]);
|
||||
if (msgtype == 1)
|
||||
{
|
||||
/* Send message of type 1 */
|
||||
MsgType1 msg = {42};
|
||||
status = encode_unionmessage(&stream, MsgType1_fields, &msg);
|
||||
}
|
||||
else if (msgtype == 2)
|
||||
{
|
||||
/* Send message of type 2 */
|
||||
MsgType2 msg = {true};
|
||||
status = encode_unionmessage(&stream, MsgType2_fields, &msg);
|
||||
}
|
||||
else if (msgtype == 3)
|
||||
{
|
||||
/* Send message of type 3 */
|
||||
MsgType3 msg = {3, 1415};
|
||||
status = encode_unionmessage(&stream, MsgType3_fields, &msg);
|
||||
}
|
||||
else
|
||||
{
|
||||
fprintf(stderr, "Unknown message type: %d\n", msgtype);
|
||||
return 2;
|
||||
}
|
||||
|
||||
if (!status)
|
||||
{
|
||||
fprintf(stderr, "Encoding failed!\n");
|
||||
return 3;
|
||||
}
|
||||
else
|
||||
{
|
||||
fwrite(buffer, 1, stream.bytes_written, stdout);
|
||||
return 0; /* Success */
|
||||
}
|
||||
}
|
||||
|
||||
|
32
extra/nanopb/examples/using_union_messages/unionproto.proto
Normal file
32
extra/nanopb/examples/using_union_messages/unionproto.proto
Normal file
|
@ -0,0 +1,32 @@
|
|||
// This is an example of how to handle 'union' style messages
|
||||
// with nanopb, without allocating memory for all the message types.
|
||||
//
|
||||
// There is no official type in Protocol Buffers for describing unions,
|
||||
// but they are commonly implemented by filling out exactly one of
|
||||
// several optional fields.
|
||||
|
||||
syntax = "proto2";
|
||||
|
||||
message MsgType1
|
||||
{
|
||||
required int32 value = 1;
|
||||
}
|
||||
|
||||
message MsgType2
|
||||
{
|
||||
required bool value = 1;
|
||||
}
|
||||
|
||||
message MsgType3
|
||||
{
|
||||
required int32 value1 = 1;
|
||||
required int32 value2 = 2;
|
||||
}
|
||||
|
||||
message UnionMessage
|
||||
{
|
||||
optional MsgType1 msg1 = 1;
|
||||
optional MsgType2 msg2 = 2;
|
||||
optional MsgType3 msg3 = 3;
|
||||
}
|
||||
|
344
extra/nanopb/extra/FindNanopb.cmake
Normal file
344
extra/nanopb/extra/FindNanopb.cmake
Normal file
|
@ -0,0 +1,344 @@
|
|||
# This is an example script for use with CMake projects for locating and configuring
|
||||
# the nanopb library.
|
||||
#
|
||||
# The following variables can be set and are optional:
|
||||
#
|
||||
#
|
||||
# PROTOBUF_SRC_ROOT_FOLDER - When compiling with MSVC, if this cache variable is set
|
||||
# the protobuf-default VS project build locations
|
||||
# (vsprojects/Debug & vsprojects/Release) will be searched
|
||||
# for libraries and binaries.
|
||||
#
|
||||
# NANOPB_IMPORT_DIRS - List of additional directories to be searched for
|
||||
# imported .proto files.
|
||||
#
|
||||
# NANOPB_OPTIONS - List of options passed to nanopb.
|
||||
#
|
||||
# NANOPB_DEPENDS - List of files to be used as dependencies
|
||||
# for the generated source and header files. These
|
||||
# files are not directly passed as options to
|
||||
# nanopb but rather their directories.
|
||||
#
|
||||
# NANOPB_GENERATE_CPP_APPEND_PATH - By default -I will be passed to protoc
|
||||
# for each directory where a proto file is referenced.
|
||||
# Set to FALSE if you want to disable this behaviour.
|
||||
#
|
||||
# Defines the following variables:
|
||||
#
|
||||
# NANOPB_FOUND - Found the nanopb library (source&header files, generator tool, protoc compiler tool)
|
||||
# NANOPB_INCLUDE_DIRS - Include directories for Google Protocol Buffers
|
||||
#
|
||||
# The following cache variables are also available to set or use:
|
||||
# PROTOBUF_PROTOC_EXECUTABLE - The protoc compiler
|
||||
# NANOPB_GENERATOR_SOURCE_DIR - The nanopb generator source
|
||||
#
|
||||
# ====================================================================
|
||||
#
|
||||
# NANOPB_GENERATE_CPP (public function)
|
||||
# NANOPB_GENERATE_CPP(SRCS HDRS [RELPATH <root-path-of-proto-files>]
|
||||
# <proto-files>...)
|
||||
# SRCS = Variable to define with autogenerated source files
|
||||
# HDRS = Variable to define with autogenerated header files
|
||||
# If you want to use relative paths in your import statements use the RELPATH
|
||||
# option. The argument to RELPATH should be the directory that all the
|
||||
# imports will be relative to.
|
||||
# When RELPATH is not specified then all proto files can be imported without
|
||||
# a path.
|
||||
#
|
||||
#
|
||||
# ====================================================================
|
||||
# Example:
|
||||
#
|
||||
# set(NANOPB_SRC_ROOT_FOLDER "/path/to/nanopb")
|
||||
# set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${NANOPB_SRC_ROOT_FOLDER}/extra)
|
||||
# find_package( Nanopb REQUIRED )
|
||||
# include_directories(${NANOPB_INCLUDE_DIRS})
|
||||
#
|
||||
# NANOPB_GENERATE_CPP(PROTO_SRCS PROTO_HDRS foo.proto)
|
||||
#
|
||||
# include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
# add_executable(bar bar.cc ${PROTO_SRCS} ${PROTO_HDRS})
|
||||
#
|
||||
# Example with RELPATH:
|
||||
# Assume we have a layout like:
|
||||
# .../CMakeLists.txt
|
||||
# .../bar.cc
|
||||
# .../proto/
|
||||
# .../proto/foo.proto (Which contains: import "sub/bar.proto"; )
|
||||
# .../proto/sub/bar.proto
|
||||
# Everything would be the same as the previous example, but the call to
|
||||
# NANOPB_GENERATE_CPP would change to:
|
||||
#
|
||||
# NANOPB_GENERATE_CPP(PROTO_SRCS PROTO_HDRS RELPATH proto
|
||||
# proto/foo.proto proto/sub/bar.proto)
|
||||
#
|
||||
# ====================================================================
|
||||
|
||||
#=============================================================================
|
||||
# Copyright 2009 Kitware, Inc.
|
||||
# Copyright 2009-2011 Philip Lowman <philip@yhbt.com>
|
||||
# Copyright 2008 Esben Mose Hansen, Ange Optimization ApS
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
#
|
||||
# * Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
#
|
||||
# * Neither the names of Kitware, Inc., the Insight Software Consortium,
|
||||
# nor the names of their contributors may be used to endorse or promote
|
||||
# products derived from this software without specific prior written
|
||||
# permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
#=============================================================================
|
||||
#
|
||||
# Changes
|
||||
# 2013.01.31 - Pavlo Ilin - used Modules/FindProtobuf.cmake from cmake 2.8.10 to
|
||||
# write FindNanopb.cmake
|
||||
#
|
||||
#=============================================================================
|
||||
|
||||
|
||||
function(NANOPB_GENERATE_CPP SRCS HDRS)
|
||||
cmake_parse_arguments(NANOPB_GENERATE_CPP "" "RELPATH" "" ${ARGN})
|
||||
if(NOT NANOPB_GENERATE_CPP_UNPARSED_ARGUMENTS)
|
||||
return()
|
||||
endif()
|
||||
|
||||
if(NANOPB_GENERATE_CPP_APPEND_PATH)
|
||||
# Create an include path for each file specified
|
||||
foreach(FIL ${NANOPB_GENERATE_CPP_UNPARSED_ARGUMENTS})
|
||||
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
||||
get_filename_component(ABS_PATH ${ABS_FIL} PATH)
|
||||
list(APPEND _nanopb_include_path "-I${ABS_PATH}")
|
||||
endforeach()
|
||||
else()
|
||||
set(_nanopb_include_path "-I${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
endif()
|
||||
|
||||
if(NANOPB_GENERATE_CPP_RELPATH)
|
||||
list(APPEND _nanopb_include_path "-I${NANOPB_GENERATE_CPP_RELPATH}")
|
||||
endif()
|
||||
|
||||
if(DEFINED NANOPB_IMPORT_DIRS)
|
||||
foreach(DIR ${NANOPB_IMPORT_DIRS})
|
||||
get_filename_component(ABS_PATH ${DIR} ABSOLUTE)
|
||||
list(APPEND _nanopb_include_path "-I${ABS_PATH}")
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
list(REMOVE_DUPLICATES _nanopb_include_path)
|
||||
|
||||
set(GENERATOR_PATH ${CMAKE_BINARY_DIR}/nanopb/generator)
|
||||
|
||||
set(NANOPB_GENERATOR_EXECUTABLE ${GENERATOR_PATH}/nanopb_generator.py)
|
||||
if (WIN32)
|
||||
set(NANOPB_GENERATOR_PLUGIN ${GENERATOR_PATH}/protoc-gen-nanopb.bat)
|
||||
else()
|
||||
set(NANOPB_GENERATOR_PLUGIN ${GENERATOR_PATH}/protoc-gen-nanopb)
|
||||
endif()
|
||||
|
||||
set(GENERATOR_CORE_DIR ${GENERATOR_PATH}/proto)
|
||||
set(GENERATOR_CORE_SRC
|
||||
${GENERATOR_CORE_DIR}/nanopb.proto
|
||||
${GENERATOR_CORE_DIR}/plugin.proto)
|
||||
|
||||
# Treat the source diretory as immutable.
|
||||
#
|
||||
# Copy the generator directory to the build directory before
|
||||
# compiling python and proto files. Fixes issues when using the
|
||||
# same build directory with different python/protobuf versions
|
||||
# as the binary build directory is discarded across builds.
|
||||
#
|
||||
add_custom_command(
|
||||
OUTPUT ${NANOPB_GENERATOR_EXECUTABLE} ${GENERATOR_CORE_SRC}
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_directory
|
||||
ARGS ${NANOPB_GENERATOR_SOURCE_DIR} ${GENERATOR_PATH}
|
||||
VERBATIM)
|
||||
|
||||
set(GENERATOR_CORE_PYTHON_SRC)
|
||||
foreach(FIL ${GENERATOR_CORE_SRC})
|
||||
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
||||
get_filename_component(FIL_WE ${FIL} NAME_WE)
|
||||
|
||||
set(output "${GENERATOR_CORE_DIR}/${FIL_WE}_pb2.py")
|
||||
set(GENERATOR_CORE_PYTHON_SRC ${GENERATOR_CORE_PYTHON_SRC} ${output})
|
||||
add_custom_command(
|
||||
OUTPUT ${output}
|
||||
COMMAND ${PROTOBUF_PROTOC_EXECUTABLE}
|
||||
ARGS -I${GENERATOR_PATH}/proto
|
||||
--python_out=${GENERATOR_CORE_DIR} ${ABS_FIL}
|
||||
DEPENDS ${ABS_FIL}
|
||||
VERBATIM)
|
||||
endforeach()
|
||||
|
||||
if(NANOPB_GENERATE_CPP_RELPATH)
|
||||
get_filename_component(ABS_ROOT ${NANOPB_GENERATE_CPP_RELPATH} ABSOLUTE)
|
||||
endif()
|
||||
foreach(FIL ${NANOPB_GENERATE_CPP_UNPARSED_ARGUMENTS})
|
||||
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
||||
get_filename_component(FIL_WE ${FIL} NAME_WE)
|
||||
get_filename_component(FIL_DIR ${FIL} PATH)
|
||||
set(FIL_PATH_REL)
|
||||
if(ABS_ROOT)
|
||||
# Check that the file is under the given "RELPATH"
|
||||
string(FIND ${ABS_FIL} ${ABS_ROOT} LOC)
|
||||
if (${LOC} EQUAL 0)
|
||||
string(REPLACE "${ABS_ROOT}/" "" FIL_REL ${ABS_FIL})
|
||||
get_filename_component(FIL_PATH_REL ${FIL_REL} PATH)
|
||||
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${FIL_PATH_REL})
|
||||
endif()
|
||||
endif()
|
||||
if(NOT FIL_PATH_REL)
|
||||
set(FIL_PATH_REL ".")
|
||||
endif()
|
||||
|
||||
list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_PATH_REL}/${FIL_WE}.pb.c")
|
||||
list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_PATH_REL}/${FIL_WE}.pb.h")
|
||||
|
||||
set(NANOPB_PLUGIN_OPTIONS)
|
||||
set(NANOPB_OPTIONS_DIRS)
|
||||
|
||||
# If there an options file in the same working directory, set it as a dependency
|
||||
set(NANOPB_OPTIONS_FILE ${FIL_DIR}/${FIL_WE}.options)
|
||||
if(EXISTS ${NANOPB_OPTIONS_FILE})
|
||||
# Get directory as lookups for dependency options fail if an options
|
||||
# file is used. The options is still set as a dependency of the
|
||||
# generated source and header.
|
||||
get_filename_component(options_dir ${NANOPB_OPTIONS_FILE} DIRECTORY)
|
||||
list(APPEND NANOPB_OPTIONS_DIRS ${options_dir})
|
||||
else()
|
||||
set(NANOPB_OPTIONS_FILE)
|
||||
endif()
|
||||
|
||||
# If the dependencies are options files, we need to pass the directories
|
||||
# as arguments to nanopb
|
||||
foreach(depends_file ${NANOPB_DEPENDS})
|
||||
get_filename_component(ext ${depends_file} EXT)
|
||||
if(ext STREQUAL ".options")
|
||||
get_filename_component(depends_dir ${depends_file} DIRECTORY)
|
||||
list(APPEND NANOPB_OPTIONS_DIRS ${depends_dir})
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
if(NANOPB_OPTIONS_DIRS)
|
||||
list(REMOVE_DUPLICATES NANOPB_OPTIONS_DIRS)
|
||||
endif()
|
||||
|
||||
foreach(options_path ${NANOPB_OPTIONS_DIRS})
|
||||
set(NANOPB_PLUGIN_OPTIONS "${NANOPB_PLUGIN_OPTIONS} -I${options_path}")
|
||||
endforeach()
|
||||
|
||||
if(NANOPB_OPTIONS)
|
||||
set(NANOPB_PLUGIN_OPTIONS "${NANOPB_PLUGIN_OPTIONS} ${NANOPB_OPTIONS}")
|
||||
endif()
|
||||
|
||||
add_custom_command(
|
||||
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_PATH_REL}/${FIL_WE}.pb.c"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_PATH_REL}/${FIL_WE}.pb.h"
|
||||
COMMAND ${PROTOBUF_PROTOC_EXECUTABLE}
|
||||
ARGS -I${GENERATOR_PATH} -I${GENERATOR_CORE_DIR}
|
||||
-I${CMAKE_CURRENT_BINARY_DIR} ${_nanopb_include_path}
|
||||
--plugin=protoc-gen-nanopb=${NANOPB_GENERATOR_PLUGIN}
|
||||
"--nanopb_out=${NANOPB_PLUGIN_OPTIONS}:${CMAKE_CURRENT_BINARY_DIR}" ${ABS_FIL}
|
||||
DEPENDS ${ABS_FIL} ${GENERATOR_CORE_PYTHON_SRC}
|
||||
${NANOPB_OPTIONS_FILE} ${NANOPB_DEPENDS}
|
||||
COMMENT "Running C++ protocol buffer compiler using nanopb plugin on ${FIL}"
|
||||
VERBATIM )
|
||||
|
||||
endforeach()
|
||||
|
||||
set_source_files_properties(${${SRCS}} ${${HDRS}} PROPERTIES GENERATED TRUE)
|
||||
set(${SRCS} ${${SRCS}} ${NANOPB_SRCS} PARENT_SCOPE)
|
||||
set(${HDRS} ${${HDRS}} ${NANOPB_HDRS} PARENT_SCOPE)
|
||||
|
||||
endfunction()
|
||||
|
||||
|
||||
|
||||
#
|
||||
# Main.
|
||||
#
|
||||
|
||||
# By default have NANOPB_GENERATE_CPP macro pass -I to protoc
|
||||
# for each directory where a proto file is referenced.
|
||||
if(NOT DEFINED NANOPB_GENERATE_CPP_APPEND_PATH)
|
||||
set(NANOPB_GENERATE_CPP_APPEND_PATH TRUE)
|
||||
endif()
|
||||
|
||||
# Make a really good guess regarding location of NANOPB_SRC_ROOT_FOLDER
|
||||
if(NOT DEFINED NANOPB_SRC_ROOT_FOLDER)
|
||||
get_filename_component(NANOPB_SRC_ROOT_FOLDER
|
||||
${CMAKE_CURRENT_LIST_DIR}/.. ABSOLUTE)
|
||||
endif()
|
||||
|
||||
# Find the include directory
|
||||
find_path(NANOPB_INCLUDE_DIRS
|
||||
pb.h
|
||||
PATHS ${NANOPB_SRC_ROOT_FOLDER}
|
||||
)
|
||||
mark_as_advanced(NANOPB_INCLUDE_DIRS)
|
||||
|
||||
# Find nanopb source files
|
||||
set(NANOPB_SRCS)
|
||||
set(NANOPB_HDRS)
|
||||
list(APPEND _nanopb_srcs pb_decode.c pb_encode.c pb_common.c)
|
||||
list(APPEND _nanopb_hdrs pb_decode.h pb_encode.h pb_common.h pb.h)
|
||||
|
||||
foreach(FIL ${_nanopb_srcs})
|
||||
find_file(${FIL}__nano_pb_file NAMES ${FIL} PATHS ${NANOPB_SRC_ROOT_FOLDER} ${NANOPB_INCLUDE_DIRS})
|
||||
list(APPEND NANOPB_SRCS "${${FIL}__nano_pb_file}")
|
||||
mark_as_advanced(${FIL}__nano_pb_file)
|
||||
endforeach()
|
||||
|
||||
foreach(FIL ${_nanopb_hdrs})
|
||||
find_file(${FIL}__nano_pb_file NAMES ${FIL} PATHS ${NANOPB_INCLUDE_DIRS})
|
||||
mark_as_advanced(${FIL}__nano_pb_file)
|
||||
list(APPEND NANOPB_HDRS "${${FIL}__nano_pb_file}")
|
||||
endforeach()
|
||||
|
||||
# Find the protoc Executable
|
||||
find_program(PROTOBUF_PROTOC_EXECUTABLE
|
||||
NAMES protoc
|
||||
DOC "The Google Protocol Buffers Compiler"
|
||||
PATHS
|
||||
${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/Release
|
||||
${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/Debug
|
||||
)
|
||||
mark_as_advanced(PROTOBUF_PROTOC_EXECUTABLE)
|
||||
|
||||
# Find nanopb generator source dir
|
||||
find_path(NANOPB_GENERATOR_SOURCE_DIR
|
||||
NAMES nanopb_generator.py
|
||||
DOC "nanopb generator source"
|
||||
PATHS
|
||||
${NANOPB_SRC_ROOT_FOLDER}/generator
|
||||
)
|
||||
mark_as_advanced(NANOPB_GENERATOR_SOURCE_DIR)
|
||||
|
||||
find_package(PythonInterp REQUIRED)
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(NANOPB DEFAULT_MSG
|
||||
NANOPB_INCLUDE_DIRS
|
||||
NANOPB_SRCS NANOPB_HDRS
|
||||
NANOPB_GENERATOR_SOURCE_DIR
|
||||
PROTOBUF_PROTOC_EXECUTABLE
|
||||
)
|
11
extra/nanopb/extra/nanopb-config-version.cmake.in
Normal file
11
extra/nanopb/extra/nanopb-config-version.cmake.in
Normal file
|
@ -0,0 +1,11 @@
|
|||
set(PACKAGE_VERSION "@nanopb_VERSION@")
|
||||
|
||||
# Check whether the requested PACKAGE_FIND_VERSION is compatible
|
||||
if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
|
||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||
else()
|
||||
set(PACKAGE_VERSION_COMPATIBLE TRUE)
|
||||
if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
|
||||
set(PACKAGE_VERSION_EXACT TRUE)
|
||||
endif()
|
||||
endif()
|
1
extra/nanopb/extra/nanopb-config.cmake
Normal file
1
extra/nanopb/extra/nanopb-config.cmake
Normal file
|
@ -0,0 +1 @@
|
|||
include(${CMAKE_CURRENT_LIST_DIR}/nanopb-targets.cmake)
|
37
extra/nanopb/extra/nanopb.mk
Normal file
37
extra/nanopb/extra/nanopb.mk
Normal file
|
@ -0,0 +1,37 @@
|
|||
# This is an include file for Makefiles. It provides rules for building
|
||||
# .pb.c and .pb.h files out of .proto, as well the path to nanopb core.
|
||||
|
||||
# Path to the nanopb root directory
|
||||
NANOPB_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../)
|
||||
|
||||
# Files for the nanopb core
|
||||
NANOPB_CORE = $(NANOPB_DIR)/pb_encode.c $(NANOPB_DIR)/pb_decode.c $(NANOPB_DIR)/pb_common.c
|
||||
|
||||
# Check if we are running on Windows
|
||||
ifdef windir
|
||||
WINDOWS = 1
|
||||
endif
|
||||
ifdef WINDIR
|
||||
WINDOWS = 1
|
||||
endif
|
||||
|
||||
# Check whether to use binary version of nanopb_generator or the
|
||||
# system-supplied python interpreter.
|
||||
ifneq "$(wildcard $(NANOPB_DIR)/generator-bin)" ""
|
||||
# Binary package
|
||||
PROTOC = $(NANOPB_DIR)/generator-bin/protoc
|
||||
PROTOC_OPTS =
|
||||
else
|
||||
# Source only or git checkout
|
||||
PROTOC = protoc
|
||||
ifdef WINDOWS
|
||||
PROTOC_OPTS = --plugin=protoc-gen-nanopb=$(NANOPB_DIR)/generator/protoc-gen-nanopb.bat
|
||||
else
|
||||
PROTOC_OPTS = --plugin=protoc-gen-nanopb=$(NANOPB_DIR)/generator/protoc-gen-nanopb
|
||||
endif
|
||||
endif
|
||||
|
||||
# Rule for building .pb.c and .pb.h
|
||||
%.pb.c %.pb.h: %.proto $(wildcard %.options)
|
||||
$(PROTOC) $(PROTOC_OPTS) --nanopb_out=. $<
|
||||
|
112
extra/nanopb/extra/pb_syshdr.h
Normal file
112
extra/nanopb/extra/pb_syshdr.h
Normal file
|
@ -0,0 +1,112 @@
|
|||
/* This is an example of a header file for platforms/compilers that do
|
||||
* not come with stdint.h/stddef.h/stdbool.h/string.h. To use it, define
|
||||
* PB_SYSTEM_HEADER as "pb_syshdr.h", including the quotes, and add the
|
||||
* extra folder to your include path.
|
||||
*
|
||||
* It is very likely that you will need to customize this file to suit
|
||||
* your platform. For any compiler that supports C99, this file should
|
||||
* not be necessary.
|
||||
*/
|
||||
|
||||
#ifndef _PB_SYSHDR_H_
|
||||
#define _PB_SYSHDR_H_
|
||||
|
||||
/* stdint.h subset */
|
||||
#ifdef HAVE_STDINT_H
|
||||
#include <stdint.h>
|
||||
#else
|
||||
/* You will need to modify these to match the word size of your platform. */
|
||||
typedef signed char int8_t;
|
||||
typedef unsigned char uint8_t;
|
||||
typedef signed short int16_t;
|
||||
typedef unsigned short uint16_t;
|
||||
typedef signed int int32_t;
|
||||
typedef unsigned int uint32_t;
|
||||
typedef signed long long int64_t;
|
||||
typedef unsigned long long uint64_t;
|
||||
|
||||
/* These are ok for most platforms, unless uint8_t is actually not available,
|
||||
* in which case you should give the smallest available type. */
|
||||
typedef int8_t int_least8_t;
|
||||
typedef uint8_t uint_least8_t;
|
||||
typedef uint8_t uint_fast8_t;
|
||||
typedef int16_t int_least16_t;
|
||||
typedef uint16_t uint_least16_t;
|
||||
#endif
|
||||
|
||||
/* stddef.h subset */
|
||||
#ifdef HAVE_STDDEF_H
|
||||
#include <stddef.h>
|
||||
#else
|
||||
|
||||
typedef uint32_t size_t;
|
||||
#define offsetof(st, m) ((size_t)(&((st *)0)->m))
|
||||
|
||||
#ifndef NULL
|
||||
#define NULL 0
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
/* stdbool.h subset */
|
||||
#ifdef HAVE_STDBOOL_H
|
||||
#include <stdbool.h>
|
||||
#else
|
||||
|
||||
#ifndef __cplusplus
|
||||
typedef int bool;
|
||||
#define false 0
|
||||
#define true 1
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
/* stdlib.h subset */
|
||||
#ifdef PB_ENABLE_MALLOC
|
||||
#ifdef HAVE_STDLIB_H
|
||||
#include <stdlib.h>
|
||||
#else
|
||||
void *realloc(void *ptr, size_t size);
|
||||
void free(void *ptr);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* string.h subset */
|
||||
#ifdef HAVE_STRING_H
|
||||
#include <string.h>
|
||||
#else
|
||||
|
||||
/* Implementations are from the Public Domain C Library (PDCLib). */
|
||||
static size_t strlen( const char * s )
|
||||
{
|
||||
size_t rc = 0;
|
||||
while ( s[rc] )
|
||||
{
|
||||
++rc;
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
|
||||
static void * memcpy( void *s1, const void *s2, size_t n )
|
||||
{
|
||||
char * dest = (char *) s1;
|
||||
const char * src = (const char *) s2;
|
||||
while ( n-- )
|
||||
{
|
||||
*dest++ = *src++;
|
||||
}
|
||||
return s1;
|
||||
}
|
||||
|
||||
static void * memset( void * s, int c, size_t n )
|
||||
{
|
||||
unsigned char * p = (unsigned char *) s;
|
||||
while ( n-- )
|
||||
{
|
||||
*p++ = (unsigned char) c;
|
||||
}
|
||||
return s;
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
BIN
extra/nanopb/generator-bin/MSVCP100.DLL
Normal file
BIN
extra/nanopb/generator-bin/MSVCP100.DLL
Normal file
Binary file not shown.
BIN
extra/nanopb/generator-bin/MSVCR100.DLL
Normal file
BIN
extra/nanopb/generator-bin/MSVCR100.DLL
Normal file
Binary file not shown.
BIN
extra/nanopb/generator-bin/MSVCR90.DLL
Normal file
BIN
extra/nanopb/generator-bin/MSVCR90.DLL
Normal file
Binary file not shown.
6
extra/nanopb/generator-bin/Microsoft.VC90.CRT.manifest
Normal file
6
extra/nanopb/generator-bin/Microsoft.VC90.CRT.manifest
Normal file
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||
<noInheritable></noInheritable>
|
||||
<assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.21022.8" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
|
||||
<file name="msvcr90.dll" hashalg="SHA1" hash="e0dcdcbfcb452747da530fae6b000d47c8674671"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>KSaO8M0iCtPF6YEr79P1dZsnomY=</dsig:DigestValue></asmv2:hash></file> <file name="msvcp90.dll" hashalg="SHA1" hash="81efe890e4ef2615c0bb4dda7b94bea177c86ebd"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>ojDmTgpYMFRKJYkPcM6ckpYkWUU=</dsig:DigestValue></asmv2:hash></file> <file name="msvcm90.dll" hashalg="SHA1" hash="5470081b336abd7b82c6387567a661a729483b04"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>tVogb8kezDre2mXShlIqpp8ErIg=</dsig:DigestValue></asmv2:hash></file>
|
||||
</assembly>
|
BIN
extra/nanopb/generator-bin/_hashlib.pyd
Normal file
BIN
extra/nanopb/generator-bin/_hashlib.pyd
Normal file
Binary file not shown.
BIN
extra/nanopb/generator-bin/_socket.pyd
Normal file
BIN
extra/nanopb/generator-bin/_socket.pyd
Normal file
Binary file not shown.
BIN
extra/nanopb/generator-bin/_ssl.pyd
Normal file
BIN
extra/nanopb/generator-bin/_ssl.pyd
Normal file
Binary file not shown.
BIN
extra/nanopb/generator-bin/bz2.pyd
Normal file
BIN
extra/nanopb/generator-bin/bz2.pyd
Normal file
Binary file not shown.
BIN
extra/nanopb/generator-bin/library.zip
Normal file
BIN
extra/nanopb/generator-bin/library.zip
Normal file
Binary file not shown.
BIN
extra/nanopb/generator-bin/nanopb_generator.exe
Normal file
BIN
extra/nanopb/generator-bin/nanopb_generator.exe
Normal file
Binary file not shown.
|
@ -0,0 +1,17 @@
|
|||
Metadata-Version: 1.1
|
||||
Name: protobuf
|
||||
Version: 3.6.1
|
||||
Summary: Protocol Buffers
|
||||
Home-page: https://developers.google.com/protocol-buffers/
|
||||
Author: protobuf@googlegroups.com
|
||||
Author-email: protobuf@googlegroups.com
|
||||
License: 3-Clause BSD License
|
||||
Download-URL: https://github.com/google/protobuf/releases
|
||||
Description: Protocol Buffers are Google's data interchange format
|
||||
Platform: UNKNOWN
|
||||
Classifier: Programming Language :: Python
|
||||
Classifier: Programming Language :: Python :: 2
|
||||
Classifier: Programming Language :: Python :: 2.7
|
||||
Classifier: Programming Language :: Python :: 3
|
||||
Classifier: Programming Language :: Python :: 3.3
|
||||
Classifier: Programming Language :: Python :: 3.4
|
|
@ -0,0 +1,68 @@
|
|||
MANIFEST.in
|
||||
setup.cfg
|
||||
setup.py
|
||||
google/__init__.py
|
||||
google/protobuf/__init__.py
|
||||
google/protobuf/descriptor.py
|
||||
google/protobuf/descriptor_database.py
|
||||
google/protobuf/descriptor_pool.py
|
||||
google/protobuf/json_format.py
|
||||
google/protobuf/message.py
|
||||
google/protobuf/message_factory.py
|
||||
google/protobuf/proto_builder.py
|
||||
google/protobuf/python_protobuf.h
|
||||
google/protobuf/reflection.py
|
||||
google/protobuf/service.py
|
||||
google/protobuf/service_reflection.py
|
||||
google/protobuf/symbol_database.py
|
||||
google/protobuf/text_encoding.py
|
||||
google/protobuf/text_format.py
|
||||
google/protobuf/compiler/__init__.py
|
||||
google/protobuf/internal/__init__.py
|
||||
google/protobuf/internal/_parameterized.py
|
||||
google/protobuf/internal/api_implementation.cc
|
||||
google/protobuf/internal/api_implementation.py
|
||||
google/protobuf/internal/containers.py
|
||||
google/protobuf/internal/decoder.py
|
||||
google/protobuf/internal/encoder.py
|
||||
google/protobuf/internal/enum_type_wrapper.py
|
||||
google/protobuf/internal/message_listener.py
|
||||
google/protobuf/internal/python_message.py
|
||||
google/protobuf/internal/python_protobuf.cc
|
||||
google/protobuf/internal/testing_refleaks.py
|
||||
google/protobuf/internal/type_checkers.py
|
||||
google/protobuf/internal/well_known_types.py
|
||||
google/protobuf/internal/wire_format.py
|
||||
google/protobuf/pyext/__init__.py
|
||||
google/protobuf/pyext/cpp_message.py
|
||||
google/protobuf/pyext/descriptor.cc
|
||||
google/protobuf/pyext/descriptor.h
|
||||
google/protobuf/pyext/descriptor_containers.cc
|
||||
google/protobuf/pyext/descriptor_containers.h
|
||||
google/protobuf/pyext/descriptor_database.cc
|
||||
google/protobuf/pyext/descriptor_database.h
|
||||
google/protobuf/pyext/descriptor_pool.cc
|
||||
google/protobuf/pyext/descriptor_pool.h
|
||||
google/protobuf/pyext/extension_dict.cc
|
||||
google/protobuf/pyext/extension_dict.h
|
||||
google/protobuf/pyext/map_container.cc
|
||||
google/protobuf/pyext/map_container.h
|
||||
google/protobuf/pyext/message.cc
|
||||
google/protobuf/pyext/message.h
|
||||
google/protobuf/pyext/message_factory.cc
|
||||
google/protobuf/pyext/message_factory.h
|
||||
google/protobuf/pyext/message_module.cc
|
||||
google/protobuf/pyext/repeated_composite_container.cc
|
||||
google/protobuf/pyext/repeated_composite_container.h
|
||||
google/protobuf/pyext/repeated_scalar_container.cc
|
||||
google/protobuf/pyext/repeated_scalar_container.h
|
||||
google/protobuf/pyext/safe_numerics.h
|
||||
google/protobuf/pyext/scoped_pyobject_ptr.h
|
||||
google/protobuf/pyext/thread_unsafe_shared_ptr.h
|
||||
google/protobuf/util/__init__.py
|
||||
protobuf.egg-info/PKG-INFO
|
||||
protobuf.egg-info/SOURCES.txt
|
||||
protobuf.egg-info/dependency_links.txt
|
||||
protobuf.egg-info/namespace_packages.txt
|
||||
protobuf.egg-info/requires.txt
|
||||
protobuf.egg-info/top_level.txt
|
|
@ -0,0 +1 @@
|
|||
|
|
@ -0,0 +1 @@
|
|||
google
|
|
@ -0,0 +1 @@
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
six>=1.9
|
||||
setuptools
|
|
@ -0,0 +1 @@
|
|||
google
|
BIN
extra/nanopb/generator-bin/protoc-gen-nanopb.exe
Normal file
BIN
extra/nanopb/generator-bin/protoc-gen-nanopb.exe
Normal file
Binary file not shown.
BIN
extra/nanopb/generator-bin/protoc.exe
Normal file
BIN
extra/nanopb/generator-bin/protoc.exe
Normal file
Binary file not shown.
BIN
extra/nanopb/generator-bin/py.exe
Normal file
BIN
extra/nanopb/generator-bin/py.exe
Normal file
Binary file not shown.
BIN
extra/nanopb/generator-bin/pyexpat.pyd
Normal file
BIN
extra/nanopb/generator-bin/pyexpat.pyd
Normal file
Binary file not shown.
BIN
extra/nanopb/generator-bin/python27.dll
Normal file
BIN
extra/nanopb/generator-bin/python27.dll
Normal file
Binary file not shown.
BIN
extra/nanopb/generator-bin/select.pyd
Normal file
BIN
extra/nanopb/generator-bin/select.pyd
Normal file
Binary file not shown.
BIN
extra/nanopb/generator-bin/setuptools-0.6c11-py2.7.egg
Normal file
BIN
extra/nanopb/generator-bin/setuptools-0.6c11-py2.7.egg
Normal file
Binary file not shown.
|
@ -0,0 +1,32 @@
|
|||
Metadata-Version: 1.1
|
||||
Name: six
|
||||
Version: 1.10.0
|
||||
Summary: Python 2 and 3 compatibility utilities
|
||||
Home-page: http://pypi.python.org/pypi/six/
|
||||
Author: Benjamin Peterson
|
||||
Author-email: benjamin@python.org
|
||||
License: MIT
|
||||
Description: Six is a Python 2 and 3 compatibility library. It provides utility functions
|
||||
for smoothing over the differences between the Python versions with the goal of
|
||||
writing Python code that is compatible on both Python versions. See the
|
||||
documentation for more information on what is provided.
|
||||
|
||||
Six supports every Python version since 2.6. It is contained in only one Python
|
||||
file, so it can be easily copied into your project. (The copyright and license
|
||||
notice must be retained.)
|
||||
|
||||
Online documentation is at https://pythonhosted.org/six/.
|
||||
|
||||
Bugs can be reported to https://bitbucket.org/gutworth/six. The code can also
|
||||
be found there.
|
||||
|
||||
For questions about six or porting in general, email the python-porting mailing
|
||||
list: https://mail.python.org/mailman/listinfo/python-porting
|
||||
|
||||
Platform: UNKNOWN
|
||||
Classifier: Programming Language :: Python :: 2
|
||||
Classifier: Programming Language :: Python :: 3
|
||||
Classifier: Intended Audience :: Developers
|
||||
Classifier: License :: OSI Approved :: MIT License
|
||||
Classifier: Topic :: Software Development :: Libraries
|
||||
Classifier: Topic :: Utilities
|
|
@ -0,0 +1,15 @@
|
|||
CHANGES
|
||||
LICENSE
|
||||
MANIFEST.in
|
||||
README
|
||||
setup.cfg
|
||||
setup.py
|
||||
six.py
|
||||
test_six.py
|
||||
documentation/Makefile
|
||||
documentation/conf.py
|
||||
documentation/index.rst
|
||||
six.egg-info/PKG-INFO
|
||||
six.egg-info/SOURCES.txt
|
||||
six.egg-info/dependency_links.txt
|
||||
six.egg-info/top_level.txt
|
|
@ -0,0 +1 @@
|
|||
|
|
@ -0,0 +1 @@
|
|||
|
|
@ -0,0 +1 @@
|
|||
six
|
BIN
extra/nanopb/generator-bin/unicodedata.pyd
Normal file
BIN
extra/nanopb/generator-bin/unicodedata.pyd
Normal file
Binary file not shown.
123
extra/nanopb/generator/nanopb/options.proto
Normal file
123
extra/nanopb/generator/nanopb/options.proto
Normal file
|
@ -0,0 +1,123 @@
|
|||
// This is a transitional file, to provide parallel support between the old
|
||||
// nanopb.proto and new options.proto files. Eventually nanopb.proto will
|
||||
// be left only for legacy code, but for now the generator is still also
|
||||
// using it. However, your new code can start using this file already now.
|
||||
// See pull request #241 for details:
|
||||
// https://github.com/nanopb/nanopb/pull/241
|
||||
|
||||
// Custom options for defining:
|
||||
// - Maximum size of string/bytes
|
||||
// - Maximum number of elements in array
|
||||
//
|
||||
// These are used by nanopb to generate statically allocable structures
|
||||
// for memory-limited environments.
|
||||
|
||||
syntax = "proto2";
|
||||
import "google/protobuf/descriptor.proto";
|
||||
|
||||
package nanopb;
|
||||
option java_package = "fi.kapsi.koti.jpa.nanopb";
|
||||
|
||||
enum FieldType {
|
||||
FT_DEFAULT = 0; // Automatically decide field type, generate static field if possible.
|
||||
FT_CALLBACK = 1; // Always generate a callback field.
|
||||
FT_POINTER = 4; // Always generate a dynamically allocated field.
|
||||
FT_STATIC = 2; // Generate a static field or raise an exception if not possible.
|
||||
FT_IGNORE = 3; // Ignore the field completely.
|
||||
FT_INLINE = 5; // Legacy option, use the separate 'fixed_length' option instead
|
||||
}
|
||||
|
||||
enum IntSize {
|
||||
IS_DEFAULT = 0; // Default, 32/64bit based on type in .proto
|
||||
IS_8 = 8;
|
||||
IS_16 = 16;
|
||||
IS_32 = 32;
|
||||
IS_64 = 64;
|
||||
}
|
||||
|
||||
// This is the inner options message, which basically defines options for
|
||||
// a field. When it is used in message or file scope, it applies to all
|
||||
// fields.
|
||||
message Options {
|
||||
// Allocated size for 'bytes' and 'string' fields.
|
||||
// For string fields, this should include the space for null terminator.
|
||||
optional int32 max_size = 1;
|
||||
|
||||
// Maximum length for 'string' fields. Setting this is equivalent
|
||||
// to setting max_size to a value of length+1.
|
||||
optional int32 max_length = 14;
|
||||
|
||||
// Allocated number of entries in arrays ('repeated' fields)
|
||||
optional int32 max_count = 2;
|
||||
|
||||
// Size of integer fields. Can save some memory if you don't need
|
||||
// full 32 bits for the value.
|
||||
optional IntSize int_size = 7 [default = IS_DEFAULT];
|
||||
|
||||
// Force type of field (callback or static allocation)
|
||||
optional FieldType type = 3 [default = FT_DEFAULT];
|
||||
|
||||
// Use long names for enums, i.e. EnumName_EnumValue.
|
||||
optional bool long_names = 4 [default = true];
|
||||
|
||||
// Add 'packed' attribute to generated structs.
|
||||
// Note: this cannot be used on CPUs that break on unaligned
|
||||
// accesses to variables.
|
||||
optional bool packed_struct = 5 [default = false];
|
||||
|
||||
// Add 'packed' attribute to generated enums.
|
||||
optional bool packed_enum = 10 [default = false];
|
||||
|
||||
// Skip this message
|
||||
optional bool skip_message = 6 [default = false];
|
||||
|
||||
// Generate oneof fields as normal optional fields instead of union.
|
||||
optional bool no_unions = 8 [default = false];
|
||||
|
||||
// integer type tag for a message
|
||||
optional uint32 msgid = 9;
|
||||
|
||||
// decode oneof as anonymous union
|
||||
optional bool anonymous_oneof = 11 [default = false];
|
||||
|
||||
// Proto3 singular field does not generate a "has_" flag
|
||||
optional bool proto3 = 12 [default = false];
|
||||
|
||||
// Generate an enum->string mapping function (can take up lots of space).
|
||||
optional bool enum_to_string = 13 [default = false];
|
||||
|
||||
// Generate bytes arrays with fixed length
|
||||
optional bool fixed_length = 15 [default = false];
|
||||
|
||||
// Generate repeated field with fixed count
|
||||
optional bool fixed_count = 16 [default = false];
|
||||
}
|
||||
|
||||
// Extensions to protoc 'Descriptor' type in order to define options
|
||||
// inside a .proto file.
|
||||
//
|
||||
// Protocol Buffers extension number registry
|
||||
// --------------------------------
|
||||
// Project: Nanopb
|
||||
// Contact: Petteri Aimonen <jpa@kapsi.fi>
|
||||
// Web site: http://kapsi.fi/~jpa/nanopb
|
||||
// Extensions: 1010 (all types)
|
||||
// --------------------------------
|
||||
|
||||
extend google.protobuf.FileOptions {
|
||||
optional Options fileopt = 1010;
|
||||
}
|
||||
|
||||
extend google.protobuf.MessageOptions {
|
||||
optional Options msgopt = 1010;
|
||||
}
|
||||
|
||||
extend google.protobuf.EnumOptions {
|
||||
optional Options enumopt = 1010;
|
||||
}
|
||||
|
||||
extend google.protobuf.FieldOptions {
|
||||
optional Options fieldopt = 1010;
|
||||
}
|
||||
|
||||
|
1815
extra/nanopb/generator/nanopb_generator.py
Normal file
1815
extra/nanopb/generator/nanopb_generator.py
Normal file
File diff suppressed because it is too large
Load diff
4
extra/nanopb/generator/proto/Makefile
Normal file
4
extra/nanopb/generator/proto/Makefile
Normal file
|
@ -0,0 +1,4 @@
|
|||
all: nanopb_pb2.py plugin_pb2.py
|
||||
|
||||
%_pb2.py: %.proto
|
||||
protoc --python_out=. $<
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue