From b9e1b4435a406a8a27c078ea05dee1240e51704a Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 2 May 2017 18:29:37 +0200 Subject: [PATCH] Added external libraries from openXC CMake files. Now libraries are cleanly included and built. Change-Id: Iaa85639578b55b2da8357bc438426403e2cca8de Signed-off-by: Romain Forlot --- CAN-binder/etc/config.cmake | 4 +- CAN-binder/libs/CMakeLists.txt | 11 +-- CAN-binder/libs/bitfield-c/CMakeLists.txt | 43 ++++++++++ CAN-binder/libs/ini-config/CMakeLists.txt | 38 +++++++++ CAN-binder/libs/isotp-c/CMakeLists.txt | 43 ++++++++++ CAN-binder/libs/nanopb/CMakeLists.txt | 90 --------------------- .../libs/openxc-message-format/CMakeLists.txt | 43 ++++++++++ CAN-binder/libs/openxc-message-format/libs/nanopb | 1 - .../libs}/nanopb/.gitignore | 0 .../libs}/nanopb/.travis.yml | 0 .../libs}/nanopb/AUTHORS | 0 .../{ => openxc-message-format/libs}/nanopb/BUILD | 0 .../libs}/nanopb/CHANGELOG.txt | 0 .../libs}/nanopb/CONTRIBUTING.md | 0 .../libs}/nanopb/LICENSE.txt | 0 .../libs}/nanopb/README.md | 0 .../libs}/nanopb/docs/Makefile | 0 .../libs}/nanopb/docs/concepts.rst | 0 .../libs}/nanopb/docs/generator_flow.svg | 0 .../libs}/nanopb/docs/index.rst | 0 .../libs}/nanopb/docs/logo/logo.png | Bin .../libs}/nanopb/docs/logo/logo.svg | 0 .../libs}/nanopb/docs/logo/logo16px.png | Bin .../libs}/nanopb/docs/logo/logo48px.png | Bin .../libs}/nanopb/docs/lsr.css | 0 .../libs}/nanopb/docs/menu.rst | 0 .../libs}/nanopb/docs/migration.rst | 0 .../libs}/nanopb/docs/reference.rst | 0 .../libs}/nanopb/docs/security.rst | 0 .../nanopb/examples/cmake_simple/CMakeLists.txt | 0 .../libs}/nanopb/examples/cmake_simple/README.txt | 0 .../libs}/nanopb/examples/cmake_simple/simple.c | 0 .../nanopb/examples/cmake_simple/simple.proto | 0 .../libs}/nanopb/examples/network_server/Makefile | 0 .../nanopb/examples/network_server/README.txt | 0 .../libs}/nanopb/examples/network_server/client.c | 0 .../libs}/nanopb/examples/network_server/common.c | 0 .../libs}/nanopb/examples/network_server/common.h | 0 .../examples/network_server/fileproto.options | 0 .../nanopb/examples/network_server/fileproto.proto | 0 .../libs}/nanopb/examples/network_server/server.c | 0 .../libs}/nanopb/examples/simple/Makefile | 0 .../libs}/nanopb/examples/simple/README.txt | 0 .../libs}/nanopb/examples/simple/simple.c | 0 .../libs}/nanopb/examples/simple/simple.proto | 0 .../nanopb/examples/using_double_on_avr/Makefile | 0 .../nanopb/examples/using_double_on_avr/README.txt | 0 .../examples/using_double_on_avr/decode_double.c | 0 .../using_double_on_avr/double_conversion.c | 0 .../using_double_on_avr/double_conversion.h | 0 .../examples/using_double_on_avr/doubleproto.proto | 0 .../examples/using_double_on_avr/encode_double.c | 0 .../using_double_on_avr/test_conversions.c | 0 .../nanopb/examples/using_union_messages/Makefile | 0 .../examples/using_union_messages/README.txt | 0 .../nanopb/examples/using_union_messages/decode.c | 0 .../nanopb/examples/using_union_messages/encode.c | 0 .../examples/using_union_messages/unionproto.proto | 0 .../libs}/nanopb/extra/FindNanopb.cmake | 0 .../nanopb/extra/nanopb-config-version.cmake.in | 0 .../libs}/nanopb/extra/nanopb-config.cmake | 0 .../libs}/nanopb/extra/nanopb.mk | 0 .../libs}/nanopb/extra/pb_syshdr.h | 0 .../libs}/nanopb/generator/nanopb/options.proto | 0 .../libs}/nanopb/generator/nanopb_generator.py | 0 .../libs}/nanopb/generator/proto/Makefile | 0 .../libs}/nanopb/generator/proto/__init__.py | 0 .../proto/google/protobuf/descriptor.proto | 0 .../libs}/nanopb/generator/proto/nanopb.proto | 0 .../libs}/nanopb/generator/proto/plugin.proto | 0 .../libs}/nanopb/generator/protoc-gen-nanopb | 0 .../libs}/nanopb/generator/protoc-gen-nanopb.bat | 0 .../libs}/nanopb/library.json | 0 .../{ => openxc-message-format/libs}/nanopb/pb.h | 0 .../libs}/nanopb/pb_common.c | 0 .../libs}/nanopb/pb_common.h | 0 .../libs}/nanopb/pb_decode.c | 0 .../libs}/nanopb/pb_decode.h | 0 .../libs}/nanopb/pb_encode.c | 0 .../libs}/nanopb/pb_encode.h | 0 .../libs}/nanopb/tests/Makefile | 0 .../libs}/nanopb/tests/SConstruct | 0 .../libs}/nanopb/tests/alltypes/SConscript | 0 .../libs}/nanopb/tests/alltypes/alltypes.options | 0 .../libs}/nanopb/tests/alltypes/alltypes.proto | 0 .../libs}/nanopb/tests/alltypes/decode_alltypes.c | 0 .../libs}/nanopb/tests/alltypes/encode_alltypes.c | 0 .../nanopb/tests/alltypes_callback/SConscript | 0 .../tests/alltypes_callback/alltypes.options | 0 .../alltypes_callback/decode_alltypes_callback.c | 0 .../alltypes_callback/encode_alltypes_callback.c | 0 .../libs}/nanopb/tests/alltypes_pointer/SConscript | 0 .../nanopb/tests/alltypes_pointer/alltypes.options | 0 .../alltypes_pointer/decode_alltypes_pointer.c | 0 .../alltypes_pointer/encode_alltypes_pointer.c | 0 .../libs}/nanopb/tests/alltypes_proto3/SConscript | 0 .../nanopb/tests/alltypes_proto3/alltypes.options | 0 .../nanopb/tests/alltypes_proto3/alltypes.proto | 0 .../nanopb/tests/alltypes_proto3/decode_alltypes.c | 0 .../nanopb/tests/alltypes_proto3/encode_alltypes.c | 0 .../tests/alltypes_proto3_callback/SConscript | 0 .../alltypes_proto3_callback/alltypes.options | 0 .../decode_alltypes_callback.c | 0 .../encode_alltypes_callback.c | 0 .../libs}/nanopb/tests/anonymous_oneof/SConscript | 0 .../nanopb/tests/anonymous_oneof/decode_oneof.c | 0 .../libs}/nanopb/tests/anonymous_oneof/oneof.proto | 0 .../tests/backwards_compatibility/SConscript | 0 .../backwards_compatibility/alltypes_legacy.c | 0 .../backwards_compatibility/alltypes_legacy.h | 0 .../alltypes_legacy.options | 0 .../backwards_compatibility/alltypes_legacy.proto | 0 .../tests/backwards_compatibility/decode_legacy.c | 0 .../tests/backwards_compatibility/encode_legacy.c | 0 .../libs}/nanopb/tests/basic_buffer/SConscript | 0 .../nanopb/tests/basic_buffer/decode_buffer.c | 0 .../nanopb/tests/basic_buffer/encode_buffer.c | 0 .../libs}/nanopb/tests/basic_stream/SConscript | 0 .../nanopb/tests/basic_stream/decode_stream.c | 0 .../nanopb/tests/basic_stream/encode_stream.c | 0 .../libs}/nanopb/tests/buffer_only/SConscript | 0 .../libs}/nanopb/tests/callbacks/SConscript | 0 .../libs}/nanopb/tests/callbacks/callbacks.proto | 0 .../nanopb/tests/callbacks/decode_callbacks.c | 0 .../nanopb/tests/callbacks/encode_callbacks.c | 0 .../libs}/nanopb/tests/common/SConscript | 0 .../libs}/nanopb/tests/common/malloc_wrappers.c | 0 .../libs}/nanopb/tests/common/malloc_wrappers.h | 0 .../nanopb/tests/common/malloc_wrappers_syshdr.h | 0 .../libs}/nanopb/tests/common/person.proto | 0 .../libs}/nanopb/tests/common/test_helpers.h | 0 .../libs}/nanopb/tests/common/unittestproto.proto | 0 .../libs}/nanopb/tests/common/unittests.h | 0 .../libs}/nanopb/tests/cxx_main_program/SConscript | 0 .../libs}/nanopb/tests/cyclic_messages/SConscript | 0 .../nanopb/tests/cyclic_messages/cyclic.proto | 0 .../tests/cyclic_messages/cyclic_callback.options | 0 .../tests/cyclic_messages/encode_cyclic_callback.c | 0 .../libs}/nanopb/tests/decode_unittests/SConscript | 0 .../tests/decode_unittests/decode_unittests.c | 0 .../libs}/nanopb/tests/encode_unittests/SConscript | 0 .../tests/encode_unittests/encode_unittests.c | 0 .../libs}/nanopb/tests/enum_sizes/SConscript | 0 .../libs}/nanopb/tests/enum_sizes/enumsizes.proto | 0 .../nanopb/tests/enum_sizes/enumsizes_unittests.c | 0 .../libs}/nanopb/tests/enum_to_string/SConscript | 0 .../libs}/nanopb/tests/enum_to_string/enum.proto | 0 .../nanopb/tests/enum_to_string/enum_to_string.c | 0 .../libs}/nanopb/tests/extensions/SConscript | 0 .../nanopb/tests/extensions/decode_extensions.c | 0 .../nanopb/tests/extensions/encode_extensions.c | 0 .../nanopb/tests/extensions/extensions.options | 0 .../libs}/nanopb/tests/extensions/extensions.proto | 0 .../libs}/nanopb/tests/extra_fields/SConscript | 0 .../extra_fields/alltypes_with_extra_fields.pb | Bin .../extra_fields/person_with_extra_field.expected | 0 .../tests/extra_fields/person_with_extra_field.pb | Bin .../libs}/nanopb/tests/field_size_16/SConscript | 0 .../nanopb/tests/field_size_16/alltypes.options | 0 .../nanopb/tests/field_size_16/alltypes.proto | 0 .../nanopb/tests/field_size_16_proto3/SConscript | 0 .../tests/field_size_16_proto3/alltypes.options | 0 .../tests/field_size_16_proto3/alltypes.proto | 0 .../tests/field_size_16_proto3/decode_alltypes.c | 0 .../tests/field_size_16_proto3/encode_alltypes.c | 0 .../libs}/nanopb/tests/field_size_32/SConscript | 0 .../nanopb/tests/field_size_32/alltypes.options | 0 .../nanopb/tests/field_size_32/alltypes.proto | 0 .../libs}/nanopb/tests/fuzztest/SConscript | 0 .../nanopb/tests/fuzztest/alltypes_pointer.options | 0 .../nanopb/tests/fuzztest/alltypes_static.options | 0 .../libs}/nanopb/tests/fuzztest/fuzzstub.c | 0 .../libs}/nanopb/tests/fuzztest/fuzztest.c | 0 .../libs}/nanopb/tests/fuzztest/generate_message.c | 0 .../libs}/nanopb/tests/fuzztest/run_radamsa.sh | 0 .../nanopb/tests/fuzztest/sample_data/sample1.pb | Bin .../nanopb/tests/fuzztest/sample_data/sample2.pb | Bin .../libs}/nanopb/tests/inline/SConscript | 0 .../libs}/nanopb/tests/inline/inline.expected | 0 .../libs}/nanopb/tests/inline/inline.proto | 0 .../libs}/nanopb/tests/inline/inline_unittests.c | 0 .../libs}/nanopb/tests/intsizes/SConscript | 0 .../libs}/nanopb/tests/intsizes/intsizes.proto | 0 .../nanopb/tests/intsizes/intsizes_unittests.c | 0 .../libs}/nanopb/tests/io_errors/SConscript | 0 .../libs}/nanopb/tests/io_errors/alltypes.options | 0 .../libs}/nanopb/tests/io_errors/io_errors.c | 0 .../nanopb/tests/io_errors_pointers/SConscript | 0 .../tests/io_errors_pointers/alltypes.options | 0 .../libs}/nanopb/tests/mem_release/SConscript | 0 .../libs}/nanopb/tests/mem_release/mem_release.c | 0 .../nanopb/tests/mem_release/mem_release.proto | 0 .../libs}/nanopb/tests/message_sizes/SConscript | 0 .../libs}/nanopb/tests/message_sizes/dummy.c | 0 .../nanopb/tests/message_sizes/messages1.proto | 0 .../nanopb/tests/message_sizes/messages2.proto | 0 .../libs}/nanopb/tests/missing_fields/SConscript | 0 .../nanopb/tests/missing_fields/missing_fields.c | 0 .../tests/missing_fields/missing_fields.proto | 0 .../libs}/nanopb/tests/multiple_files/SConscript | 0 .../nanopb/tests/multiple_files/multifile1.options | 0 .../nanopb/tests/multiple_files/multifile1.proto | 0 .../nanopb/tests/multiple_files/multifile2.proto | 0 .../tests/multiple_files/subdir/multifile2.proto | 0 .../tests/multiple_files/test_multiple_files.c | 0 .../libs}/nanopb/tests/no_errmsg/SConscript | 0 .../libs}/nanopb/tests/no_messages/SConscript | 0 .../nanopb/tests/no_messages/no_messages.proto | 0 .../libs}/nanopb/tests/oneof/SConscript | 0 .../libs}/nanopb/tests/oneof/decode_oneof.c | 0 .../libs}/nanopb/tests/oneof/encode_oneof.c | 0 .../libs}/nanopb/tests/oneof/oneof.proto | 0 .../libs}/nanopb/tests/options/SConscript | 0 .../libs}/nanopb/tests/options/options.expected | 0 .../libs}/nanopb/tests/options/options.proto | 0 .../nanopb/tests/options/proto3_options.expected | 0 .../nanopb/tests/options/proto3_options.proto | 0 .../libs}/nanopb/tests/package_name/SConscript | 0 .../nanopb/tests/regression/issue_118/SConscript | 0 .../tests/regression/issue_118/enumdef.proto | 0 .../tests/regression/issue_118/enumuse.proto | 0 .../nanopb/tests/regression/issue_125/SConscript | 0 .../regression/issue_125/extensionbug.expected | 0 .../regression/issue_125/extensionbug.options | 0 .../tests/regression/issue_125/extensionbug.proto | 0 .../nanopb/tests/regression/issue_141/SConscript | 0 .../tests/regression/issue_141/testproto.expected | 0 .../tests/regression/issue_141/testproto.proto | 0 .../nanopb/tests/regression/issue_145/SConscript | 0 .../tests/regression/issue_145/comments.expected | 0 .../tests/regression/issue_145/comments.options | 0 .../tests/regression/issue_145/comments.proto | 0 .../nanopb/tests/regression/issue_166/SConscript | 0 .../tests/regression/issue_166/enum_encoded_size.c | 0 .../nanopb/tests/regression/issue_166/enums.proto | 0 .../nanopb/tests/regression/issue_172/SConscript | 0 .../nanopb/tests/regression/issue_172/msg_size.c | 0 .../issue_172/submessage/submessage.options | 0 .../issue_172/submessage/submessage.proto | 0 .../nanopb/tests/regression/issue_172/test.proto | 0 .../nanopb/tests/regression/issue_188/SConscript | 0 .../nanopb/tests/regression/issue_188/oneof.proto | 0 .../nanopb/tests/regression/issue_195/SConscript | 0 .../tests/regression/issue_195/test.expected | 0 .../nanopb/tests/regression/issue_195/test.proto | 0 .../nanopb/tests/regression/issue_203/SConscript | 0 .../nanopb/tests/regression/issue_203/file1.proto | 0 .../nanopb/tests/regression/issue_203/file2.proto | 0 .../nanopb/tests/regression/issue_205/SConscript | 0 .../tests/regression/issue_205/size_corruption.c | 0 .../regression/issue_205/size_corruption.proto | 0 .../nanopb/tests/regression/issue_227/SConscript | 0 .../tests/regression/issue_227/unaligned_uint64.c | 0 .../regression/issue_227/unaligned_uint64.proto | 0 .../nanopb/tests/regression/issue_229/SConscript | 0 .../tests/regression/issue_229/multiple_oneof.c | 0 .../regression/issue_229/multiple_oneof.proto | 0 .../nanopb/tests/regression/issue_242/SConscript | 0 .../nanopb/tests/regression/issue_242/zero_value.c | 0 .../tests/regression/issue_242/zero_value.proto | 0 .../nanopb/tests/regression/issue_247/SConscript | 0 .../nanopb/tests/regression/issue_247/padding.c | 0 .../tests/regression/issue_247/padding.proto | 0 .../nanopb/tests/regression/issue_249/SConscript | 0 .../libs}/nanopb/tests/regression/issue_249/test.c | 0 .../nanopb/tests/regression/issue_249/test.proto | 0 .../nanopb/tests/regression/issue_253/SConscript | 0 .../tests/regression/issue_253/short_array.c | 0 .../tests/regression/issue_253/short_array.proto | 0 .../nanopb/tests/regression/issue_256/SConscript | 0 .../tests/regression/issue_256/submsg_array.c | 0 .../tests/regression/issue_256/submsg_array.proto | 0 .../libs}/nanopb/tests/site_scons/site_init.py | 0 .../nanopb/tests/site_scons/site_tools/nanopb.py | 0 .../nanopb/tests/special_characters/SConscript | 0 .../funny-proto+name has.characters.proto | 0 .../libs}/nanopb/tests/splint/SConscript | 0 .../libs}/nanopb/tests/splint/splint.rc | 0 .../libs}/nanopb/tools/make_linux_package.sh | 0 .../libs}/nanopb/tools/make_mac_package.sh | 0 .../libs}/nanopb/tools/make_windows_package.sh | 0 .../libs}/nanopb/tools/set_version.sh | 0 CAN-binder/libs/uds-c/CMakeLists.txt | 42 ++++++++++ CAN-binder/low-can-binding/CMakeLists.txt | 1 - 284 files changed, 211 insertions(+), 105 deletions(-) create mode 100644 CAN-binder/libs/bitfield-c/CMakeLists.txt create mode 100644 CAN-binder/libs/ini-config/CMakeLists.txt create mode 100644 CAN-binder/libs/isotp-c/CMakeLists.txt delete mode 100644 CAN-binder/libs/nanopb/CMakeLists.txt create mode 100644 CAN-binder/libs/openxc-message-format/CMakeLists.txt delete mode 160000 CAN-binder/libs/openxc-message-format/libs/nanopb rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/.gitignore (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/.travis.yml (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/AUTHORS (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/BUILD (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/CHANGELOG.txt (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/CONTRIBUTING.md (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/LICENSE.txt (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/README.md (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/docs/Makefile (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/docs/concepts.rst (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/docs/generator_flow.svg (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/docs/index.rst (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/docs/logo/logo.png (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/docs/logo/logo.svg (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/docs/logo/logo16px.png (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/docs/logo/logo48px.png (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/docs/lsr.css (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/docs/menu.rst (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/docs/migration.rst (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/docs/reference.rst (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/docs/security.rst (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/cmake_simple/CMakeLists.txt (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/cmake_simple/README.txt (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/cmake_simple/simple.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/cmake_simple/simple.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/network_server/Makefile (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/network_server/README.txt (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/network_server/client.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/network_server/common.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/network_server/common.h (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/network_server/fileproto.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/network_server/fileproto.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/network_server/server.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/simple/Makefile (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/simple/README.txt (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/simple/simple.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/simple/simple.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/using_double_on_avr/Makefile (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/using_double_on_avr/README.txt (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/using_double_on_avr/decode_double.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/using_double_on_avr/double_conversion.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/using_double_on_avr/double_conversion.h (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/using_double_on_avr/doubleproto.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/using_double_on_avr/encode_double.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/using_double_on_avr/test_conversions.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/using_union_messages/Makefile (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/using_union_messages/README.txt (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/using_union_messages/decode.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/using_union_messages/encode.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/examples/using_union_messages/unionproto.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/extra/FindNanopb.cmake (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/extra/nanopb-config-version.cmake.in (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/extra/nanopb-config.cmake (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/extra/nanopb.mk (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/extra/pb_syshdr.h (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/generator/nanopb/options.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/generator/nanopb_generator.py (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/generator/proto/Makefile (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/generator/proto/__init__.py (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/generator/proto/google/protobuf/descriptor.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/generator/proto/nanopb.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/generator/proto/plugin.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/generator/protoc-gen-nanopb (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/generator/protoc-gen-nanopb.bat (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/library.json (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/pb.h (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/pb_common.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/pb_common.h (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/pb_decode.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/pb_decode.h (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/pb_encode.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/pb_encode.h (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/Makefile (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/SConstruct (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes/alltypes.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes/alltypes.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes/decode_alltypes.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes/encode_alltypes.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes_callback/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes_callback/alltypes.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes_callback/decode_alltypes_callback.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes_callback/encode_alltypes_callback.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes_pointer/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes_pointer/alltypes.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes_pointer/decode_alltypes_pointer.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes_pointer/encode_alltypes_pointer.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes_proto3/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes_proto3/alltypes.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes_proto3/alltypes.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes_proto3/decode_alltypes.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes_proto3/encode_alltypes.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes_proto3_callback/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes_proto3_callback/alltypes.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes_proto3_callback/decode_alltypes_callback.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/alltypes_proto3_callback/encode_alltypes_callback.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/anonymous_oneof/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/anonymous_oneof/decode_oneof.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/anonymous_oneof/oneof.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/backwards_compatibility/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/backwards_compatibility/alltypes_legacy.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/backwards_compatibility/alltypes_legacy.h (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/backwards_compatibility/alltypes_legacy.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/backwards_compatibility/alltypes_legacy.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/backwards_compatibility/decode_legacy.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/backwards_compatibility/encode_legacy.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/basic_buffer/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/basic_buffer/decode_buffer.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/basic_buffer/encode_buffer.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/basic_stream/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/basic_stream/decode_stream.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/basic_stream/encode_stream.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/buffer_only/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/callbacks/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/callbacks/callbacks.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/callbacks/decode_callbacks.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/callbacks/encode_callbacks.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/common/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/common/malloc_wrappers.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/common/malloc_wrappers.h (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/common/malloc_wrappers_syshdr.h (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/common/person.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/common/test_helpers.h (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/common/unittestproto.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/common/unittests.h (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/cxx_main_program/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/cyclic_messages/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/cyclic_messages/cyclic.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/cyclic_messages/cyclic_callback.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/cyclic_messages/encode_cyclic_callback.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/decode_unittests/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/decode_unittests/decode_unittests.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/encode_unittests/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/encode_unittests/encode_unittests.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/enum_sizes/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/enum_sizes/enumsizes.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/enum_sizes/enumsizes_unittests.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/enum_to_string/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/enum_to_string/enum.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/enum_to_string/enum_to_string.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/extensions/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/extensions/decode_extensions.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/extensions/encode_extensions.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/extensions/extensions.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/extensions/extensions.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/extra_fields/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/extra_fields/alltypes_with_extra_fields.pb (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/extra_fields/person_with_extra_field.expected (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/extra_fields/person_with_extra_field.pb (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/field_size_16/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/field_size_16/alltypes.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/field_size_16/alltypes.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/field_size_16_proto3/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/field_size_16_proto3/alltypes.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/field_size_16_proto3/alltypes.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/field_size_16_proto3/decode_alltypes.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/field_size_16_proto3/encode_alltypes.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/field_size_32/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/field_size_32/alltypes.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/field_size_32/alltypes.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/fuzztest/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/fuzztest/alltypes_pointer.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/fuzztest/alltypes_static.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/fuzztest/fuzzstub.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/fuzztest/fuzztest.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/fuzztest/generate_message.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/fuzztest/run_radamsa.sh (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/fuzztest/sample_data/sample1.pb (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/fuzztest/sample_data/sample2.pb (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/inline/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/inline/inline.expected (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/inline/inline.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/inline/inline_unittests.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/intsizes/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/intsizes/intsizes.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/intsizes/intsizes_unittests.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/io_errors/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/io_errors/alltypes.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/io_errors/io_errors.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/io_errors_pointers/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/io_errors_pointers/alltypes.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/mem_release/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/mem_release/mem_release.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/mem_release/mem_release.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/message_sizes/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/message_sizes/dummy.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/message_sizes/messages1.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/message_sizes/messages2.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/missing_fields/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/missing_fields/missing_fields.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/missing_fields/missing_fields.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/multiple_files/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/multiple_files/multifile1.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/multiple_files/multifile1.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/multiple_files/multifile2.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/multiple_files/subdir/multifile2.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/multiple_files/test_multiple_files.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/no_errmsg/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/no_messages/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/no_messages/no_messages.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/oneof/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/oneof/decode_oneof.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/oneof/encode_oneof.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/oneof/oneof.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/options/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/options/options.expected (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/options/options.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/options/proto3_options.expected (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/options/proto3_options.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/package_name/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_118/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_118/enumdef.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_118/enumuse.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_125/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_125/extensionbug.expected (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_125/extensionbug.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_125/extensionbug.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_141/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_141/testproto.expected (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_141/testproto.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_145/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_145/comments.expected (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_145/comments.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_145/comments.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_166/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_166/enum_encoded_size.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_166/enums.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_172/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_172/msg_size.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_172/submessage/submessage.options (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_172/submessage/submessage.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_172/test.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_188/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_188/oneof.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_195/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_195/test.expected (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_195/test.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_203/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_203/file1.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_203/file2.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_205/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_205/size_corruption.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_205/size_corruption.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_227/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_227/unaligned_uint64.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_227/unaligned_uint64.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_229/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_229/multiple_oneof.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_229/multiple_oneof.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_242/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_242/zero_value.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_242/zero_value.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_247/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_247/padding.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_247/padding.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_249/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_249/test.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_249/test.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_253/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_253/short_array.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_253/short_array.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_256/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_256/submsg_array.c (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/regression/issue_256/submsg_array.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/site_scons/site_init.py (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/site_scons/site_tools/nanopb.py (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/special_characters/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/special_characters/funny-proto+name has.characters.proto (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/splint/SConscript (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tests/splint/splint.rc (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tools/make_linux_package.sh (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tools/make_mac_package.sh (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tools/make_windows_package.sh (100%) rename CAN-binder/libs/{ => openxc-message-format/libs}/nanopb/tools/set_version.sh (100%) create mode 100644 CAN-binder/libs/uds-c/CMakeLists.txt diff --git a/CAN-binder/etc/config.cmake b/CAN-binder/etc/config.cmake index 54f25da..d03a0ae 100644 --- a/CAN-binder/etc/config.cmake +++ b/CAN-binder/etc/config.cmake @@ -68,7 +68,7 @@ set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib) # Optional Extra global include path # ----------------------------------- -set(EXTRA_INCLUDE_DIRS libs/openxc-message-format/gen/cpp libs/nanopb libs/uds-c/src libs/isotp-c/src libs/bitfield-c/src libs/ini-config) +#set(EXTRA_INCLUDE_DIRS) # Optional extra libraries # ------------------------- @@ -82,5 +82,3 @@ set(BINDINGS_INSTALL_PREFIX /opt ) # Optional force binding Linking flag # ------------------------------------ # set(BINDINGS_LINK_FLAG LinkOptions ) - - diff --git a/CAN-binder/libs/CMakeLists.txt b/CAN-binder/libs/CMakeLists.txt index 38ccd2d..cc4af55 100644 --- a/CAN-binder/libs/CMakeLists.txt +++ b/CAN-binder/libs/CMakeLists.txt @@ -17,13 +17,4 @@ ########################################################################### # Add target to project dependency list -fill_include_dir(${CMAKE_CURRENT_SOURCE_DIR}) -file(GLOB filelist "${CMAKE_CURRENT_SOURCE_DIR}/*") -foreach(filename ${filelist}) - if(IS_DIRECTORY ${filename}) - STRING(REGEX REPLACE "^.*\/(.*)$" "\\1" shortname ${filename}) - find_source_files(${filename}) - PROJECT_TARGET_ADD(${shortname}) - add_library(${shortname} STATIC ${sources_files}) - endif(IS_DIRECTORY ${filename}) -endforeach() +search_targets() \ No newline at end of file diff --git a/CAN-binder/libs/bitfield-c/CMakeLists.txt b/CAN-binder/libs/bitfield-c/CMakeLists.txt new file mode 100644 index 0000000..d4c9112 --- /dev/null +++ b/CAN-binder/libs/bitfield-c/CMakeLists.txt @@ -0,0 +1,43 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: Fulup Ar Foll +# contrib: Romain Forlot +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + +# Add target to project dependency list +PROJECT_TARGET_ADD(bitfield-c) + + # Define project Target + add_library(${TARGET_NAME} STATIC + src/bitfield/8byte.c + src/bitfield/bitarray.c + src/bitfield/bitfield.c + src/canutil/read.c + src/canutil/write.c) + + # Binder exposes a unique public entry point + SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES + OUTPUT_NAME ${TARGET_NAME} + ) + + # Define target includes + TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME} + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src + ) + + # Library dependencies (include updates automatically) + TARGET_LINK_LIBRARIES(${TARGET_NAME} + ${link_libraries}) \ No newline at end of file diff --git a/CAN-binder/libs/ini-config/CMakeLists.txt b/CAN-binder/libs/ini-config/CMakeLists.txt new file mode 100644 index 0000000..ceb4825 --- /dev/null +++ b/CAN-binder/libs/ini-config/CMakeLists.txt @@ -0,0 +1,38 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: Fulup Ar Foll +# contrib: Romain Forlot +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + +# Add target to project dependency list +PROJECT_TARGET_ADD(ini-config) + + # Define project Target + add_library(${TARGET_NAME} STATIC ${TARGET_NAME}.cpp) + + # Binder exposes a unique public entry point + SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES + OUTPUT_NAME ${TARGET_NAME} + ) + + # Define target includes + TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME} + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} + ) + + # Library dependencies (include updates automatically) + TARGET_LINK_LIBRARIES(${TARGET_NAME} + ${link_libraries}) diff --git a/CAN-binder/libs/isotp-c/CMakeLists.txt b/CAN-binder/libs/isotp-c/CMakeLists.txt new file mode 100644 index 0000000..a494212 --- /dev/null +++ b/CAN-binder/libs/isotp-c/CMakeLists.txt @@ -0,0 +1,43 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: Fulup Ar Foll +# contrib: Romain Forlot +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + +# Add target to project dependency list +PROJECT_TARGET_ADD(isotp-c) + + # Define project Target + add_library(${TARGET_NAME} STATIC + src/isotp/isotp.c + src/isotp/receive.c + src/isotp/send.c) + + # Binder exposes a unique public entry point + SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES + OUTPUT_NAME ${TARGET_NAME} + ) + + # Define target includes + get_target_property(Bitfield_inc bitfield-c INCLUDE_DIRECTORIES) + TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME} + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src + ${Bitfield_inc} + ) + + # Library dependencies (include updates automatically) + TARGET_LINK_LIBRARIES(${TARGET_NAME} + ${link_libraries}) diff --git a/CAN-binder/libs/nanopb/CMakeLists.txt b/CAN-binder/libs/nanopb/CMakeLists.txt deleted file mode 100644 index 7fb7ad4..0000000 --- a/CAN-binder/libs/nanopb/CMakeLists.txt +++ /dev/null @@ -1,90 +0,0 @@ -cmake_minimum_required(VERSION 2.8) - -project(nanopb C) - -set(nanopb_VERSION_STRING nanopb-0.3.9-dev) - -string(REPLACE "nanopb-" "" nanopb_VERSION ${nanopb_VERSION_STRING}) - -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 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 "lib/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='${CMAKE_INSTALL_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 protoc --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) - add_library(protobuf-nanopb STATIC - pb.h - pb_common.h - pb_common.c - pb_encode.h - pb_encode.c - pb_decode.h - pb_decode.c) - - target_include_directories(protobuf-nanopb INTERFACE - $ - ) - - configure_file(extra/nanopb-config-version.cmake.in - nanopb-config-version.cmake @ONLY) - - install(TARGETS protobuf-nanopb EXPORT nanopb-targets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - 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() diff --git a/CAN-binder/libs/openxc-message-format/CMakeLists.txt b/CAN-binder/libs/openxc-message-format/CMakeLists.txt new file mode 100644 index 0000000..8e36ed4 --- /dev/null +++ b/CAN-binder/libs/openxc-message-format/CMakeLists.txt @@ -0,0 +1,43 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: Fulup Ar Foll +# contrib: Romain Forlot +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + +# Add target to project dependency list +PROJECT_TARGET_ADD(openxc-message-format) + + # Define project Target + add_library(${TARGET_NAME} STATIC + gen/cpp/openxc.pb.c + ${PROJECT_LIBDIR}/nanopb/pb_encode.c + ${PROJECT_LIBDIR}/nanopb/pb_decode.c + ${PROJECT_LIBDIR}/nanopb/pb_common.c) + + # Binder exposes a unique public entry point + SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES + OUTPUT_NAME ${TARGET_NAME} + ) + + # Define target includes + TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME} + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/gen/cpp + ${CMAKE_CURRENT_SOURCE_DIR}/libs/nanopb + ) + + # Library dependencies (include updates automatically) + TARGET_LINK_LIBRARIES(${TARGET_NAME} + ${link_libraries}) diff --git a/CAN-binder/libs/openxc-message-format/libs/nanopb b/CAN-binder/libs/openxc-message-format/libs/nanopb deleted file mode 160000 index b947dc6..0000000 --- a/CAN-binder/libs/openxc-message-format/libs/nanopb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b947dc6e2c0d63a29e83ebf9c8af450d2531aef2 diff --git a/CAN-binder/libs/nanopb/.gitignore b/CAN-binder/libs/openxc-message-format/libs/nanopb/.gitignore similarity index 100% rename from CAN-binder/libs/nanopb/.gitignore rename to CAN-binder/libs/openxc-message-format/libs/nanopb/.gitignore diff --git a/CAN-binder/libs/nanopb/.travis.yml b/CAN-binder/libs/openxc-message-format/libs/nanopb/.travis.yml similarity index 100% rename from CAN-binder/libs/nanopb/.travis.yml rename to CAN-binder/libs/openxc-message-format/libs/nanopb/.travis.yml diff --git a/CAN-binder/libs/nanopb/AUTHORS b/CAN-binder/libs/openxc-message-format/libs/nanopb/AUTHORS similarity index 100% rename from CAN-binder/libs/nanopb/AUTHORS rename to CAN-binder/libs/openxc-message-format/libs/nanopb/AUTHORS diff --git a/CAN-binder/libs/nanopb/BUILD b/CAN-binder/libs/openxc-message-format/libs/nanopb/BUILD similarity index 100% rename from CAN-binder/libs/nanopb/BUILD rename to CAN-binder/libs/openxc-message-format/libs/nanopb/BUILD diff --git a/CAN-binder/libs/nanopb/CHANGELOG.txt b/CAN-binder/libs/openxc-message-format/libs/nanopb/CHANGELOG.txt similarity index 100% rename from CAN-binder/libs/nanopb/CHANGELOG.txt rename to CAN-binder/libs/openxc-message-format/libs/nanopb/CHANGELOG.txt diff --git a/CAN-binder/libs/nanopb/CONTRIBUTING.md b/CAN-binder/libs/openxc-message-format/libs/nanopb/CONTRIBUTING.md similarity index 100% rename from CAN-binder/libs/nanopb/CONTRIBUTING.md rename to CAN-binder/libs/openxc-message-format/libs/nanopb/CONTRIBUTING.md diff --git a/CAN-binder/libs/nanopb/LICENSE.txt b/CAN-binder/libs/openxc-message-format/libs/nanopb/LICENSE.txt similarity index 100% rename from CAN-binder/libs/nanopb/LICENSE.txt rename to CAN-binder/libs/openxc-message-format/libs/nanopb/LICENSE.txt diff --git a/CAN-binder/libs/nanopb/README.md b/CAN-binder/libs/openxc-message-format/libs/nanopb/README.md similarity index 100% rename from CAN-binder/libs/nanopb/README.md rename to CAN-binder/libs/openxc-message-format/libs/nanopb/README.md diff --git a/CAN-binder/libs/nanopb/docs/Makefile b/CAN-binder/libs/openxc-message-format/libs/nanopb/docs/Makefile similarity index 100% rename from CAN-binder/libs/nanopb/docs/Makefile rename to CAN-binder/libs/openxc-message-format/libs/nanopb/docs/Makefile diff --git a/CAN-binder/libs/nanopb/docs/concepts.rst b/CAN-binder/libs/openxc-message-format/libs/nanopb/docs/concepts.rst similarity index 100% rename from CAN-binder/libs/nanopb/docs/concepts.rst rename to CAN-binder/libs/openxc-message-format/libs/nanopb/docs/concepts.rst diff --git a/CAN-binder/libs/nanopb/docs/generator_flow.svg b/CAN-binder/libs/openxc-message-format/libs/nanopb/docs/generator_flow.svg similarity index 100% rename from CAN-binder/libs/nanopb/docs/generator_flow.svg rename to CAN-binder/libs/openxc-message-format/libs/nanopb/docs/generator_flow.svg diff --git a/CAN-binder/libs/nanopb/docs/index.rst b/CAN-binder/libs/openxc-message-format/libs/nanopb/docs/index.rst similarity index 100% rename from CAN-binder/libs/nanopb/docs/index.rst rename to CAN-binder/libs/openxc-message-format/libs/nanopb/docs/index.rst diff --git a/CAN-binder/libs/nanopb/docs/logo/logo.png b/CAN-binder/libs/openxc-message-format/libs/nanopb/docs/logo/logo.png similarity index 100% rename from CAN-binder/libs/nanopb/docs/logo/logo.png rename to CAN-binder/libs/openxc-message-format/libs/nanopb/docs/logo/logo.png diff --git a/CAN-binder/libs/nanopb/docs/logo/logo.svg b/CAN-binder/libs/openxc-message-format/libs/nanopb/docs/logo/logo.svg similarity index 100% rename from CAN-binder/libs/nanopb/docs/logo/logo.svg rename to CAN-binder/libs/openxc-message-format/libs/nanopb/docs/logo/logo.svg diff --git a/CAN-binder/libs/nanopb/docs/logo/logo16px.png b/CAN-binder/libs/openxc-message-format/libs/nanopb/docs/logo/logo16px.png similarity index 100% rename from CAN-binder/libs/nanopb/docs/logo/logo16px.png rename to CAN-binder/libs/openxc-message-format/libs/nanopb/docs/logo/logo16px.png diff --git a/CAN-binder/libs/nanopb/docs/logo/logo48px.png b/CAN-binder/libs/openxc-message-format/libs/nanopb/docs/logo/logo48px.png similarity index 100% rename from CAN-binder/libs/nanopb/docs/logo/logo48px.png rename to CAN-binder/libs/openxc-message-format/libs/nanopb/docs/logo/logo48px.png diff --git a/CAN-binder/libs/nanopb/docs/lsr.css b/CAN-binder/libs/openxc-message-format/libs/nanopb/docs/lsr.css similarity index 100% rename from CAN-binder/libs/nanopb/docs/lsr.css rename to CAN-binder/libs/openxc-message-format/libs/nanopb/docs/lsr.css diff --git a/CAN-binder/libs/nanopb/docs/menu.rst b/CAN-binder/libs/openxc-message-format/libs/nanopb/docs/menu.rst similarity index 100% rename from CAN-binder/libs/nanopb/docs/menu.rst rename to CAN-binder/libs/openxc-message-format/libs/nanopb/docs/menu.rst diff --git a/CAN-binder/libs/nanopb/docs/migration.rst b/CAN-binder/libs/openxc-message-format/libs/nanopb/docs/migration.rst similarity index 100% rename from CAN-binder/libs/nanopb/docs/migration.rst rename to CAN-binder/libs/openxc-message-format/libs/nanopb/docs/migration.rst diff --git a/CAN-binder/libs/nanopb/docs/reference.rst b/CAN-binder/libs/openxc-message-format/libs/nanopb/docs/reference.rst similarity index 100% rename from CAN-binder/libs/nanopb/docs/reference.rst rename to CAN-binder/libs/openxc-message-format/libs/nanopb/docs/reference.rst diff --git a/CAN-binder/libs/nanopb/docs/security.rst b/CAN-binder/libs/openxc-message-format/libs/nanopb/docs/security.rst similarity index 100% rename from CAN-binder/libs/nanopb/docs/security.rst rename to CAN-binder/libs/openxc-message-format/libs/nanopb/docs/security.rst diff --git a/CAN-binder/libs/nanopb/examples/cmake_simple/CMakeLists.txt b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/cmake_simple/CMakeLists.txt similarity index 100% rename from CAN-binder/libs/nanopb/examples/cmake_simple/CMakeLists.txt rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/cmake_simple/CMakeLists.txt diff --git a/CAN-binder/libs/nanopb/examples/cmake_simple/README.txt b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/cmake_simple/README.txt similarity index 100% rename from CAN-binder/libs/nanopb/examples/cmake_simple/README.txt rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/cmake_simple/README.txt diff --git a/CAN-binder/libs/nanopb/examples/cmake_simple/simple.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/cmake_simple/simple.c similarity index 100% rename from CAN-binder/libs/nanopb/examples/cmake_simple/simple.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/cmake_simple/simple.c diff --git a/CAN-binder/libs/nanopb/examples/cmake_simple/simple.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/cmake_simple/simple.proto similarity index 100% rename from CAN-binder/libs/nanopb/examples/cmake_simple/simple.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/cmake_simple/simple.proto diff --git a/CAN-binder/libs/nanopb/examples/network_server/Makefile b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/network_server/Makefile similarity index 100% rename from CAN-binder/libs/nanopb/examples/network_server/Makefile rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/network_server/Makefile diff --git a/CAN-binder/libs/nanopb/examples/network_server/README.txt b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/network_server/README.txt similarity index 100% rename from CAN-binder/libs/nanopb/examples/network_server/README.txt rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/network_server/README.txt diff --git a/CAN-binder/libs/nanopb/examples/network_server/client.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/network_server/client.c similarity index 100% rename from CAN-binder/libs/nanopb/examples/network_server/client.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/network_server/client.c diff --git a/CAN-binder/libs/nanopb/examples/network_server/common.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/network_server/common.c similarity index 100% rename from CAN-binder/libs/nanopb/examples/network_server/common.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/network_server/common.c diff --git a/CAN-binder/libs/nanopb/examples/network_server/common.h b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/network_server/common.h similarity index 100% rename from CAN-binder/libs/nanopb/examples/network_server/common.h rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/network_server/common.h diff --git a/CAN-binder/libs/nanopb/examples/network_server/fileproto.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/network_server/fileproto.options similarity index 100% rename from CAN-binder/libs/nanopb/examples/network_server/fileproto.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/network_server/fileproto.options diff --git a/CAN-binder/libs/nanopb/examples/network_server/fileproto.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/network_server/fileproto.proto similarity index 100% rename from CAN-binder/libs/nanopb/examples/network_server/fileproto.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/network_server/fileproto.proto diff --git a/CAN-binder/libs/nanopb/examples/network_server/server.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/network_server/server.c similarity index 100% rename from CAN-binder/libs/nanopb/examples/network_server/server.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/network_server/server.c diff --git a/CAN-binder/libs/nanopb/examples/simple/Makefile b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/simple/Makefile similarity index 100% rename from CAN-binder/libs/nanopb/examples/simple/Makefile rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/simple/Makefile diff --git a/CAN-binder/libs/nanopb/examples/simple/README.txt b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/simple/README.txt similarity index 100% rename from CAN-binder/libs/nanopb/examples/simple/README.txt rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/simple/README.txt diff --git a/CAN-binder/libs/nanopb/examples/simple/simple.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/simple/simple.c similarity index 100% rename from CAN-binder/libs/nanopb/examples/simple/simple.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/simple/simple.c diff --git a/CAN-binder/libs/nanopb/examples/simple/simple.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/simple/simple.proto similarity index 100% rename from CAN-binder/libs/nanopb/examples/simple/simple.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/simple/simple.proto diff --git a/CAN-binder/libs/nanopb/examples/using_double_on_avr/Makefile b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_double_on_avr/Makefile similarity index 100% rename from CAN-binder/libs/nanopb/examples/using_double_on_avr/Makefile rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_double_on_avr/Makefile diff --git a/CAN-binder/libs/nanopb/examples/using_double_on_avr/README.txt b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_double_on_avr/README.txt similarity index 100% rename from CAN-binder/libs/nanopb/examples/using_double_on_avr/README.txt rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_double_on_avr/README.txt diff --git a/CAN-binder/libs/nanopb/examples/using_double_on_avr/decode_double.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_double_on_avr/decode_double.c similarity index 100% rename from CAN-binder/libs/nanopb/examples/using_double_on_avr/decode_double.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_double_on_avr/decode_double.c diff --git a/CAN-binder/libs/nanopb/examples/using_double_on_avr/double_conversion.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_double_on_avr/double_conversion.c similarity index 100% rename from CAN-binder/libs/nanopb/examples/using_double_on_avr/double_conversion.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_double_on_avr/double_conversion.c diff --git a/CAN-binder/libs/nanopb/examples/using_double_on_avr/double_conversion.h b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_double_on_avr/double_conversion.h similarity index 100% rename from CAN-binder/libs/nanopb/examples/using_double_on_avr/double_conversion.h rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_double_on_avr/double_conversion.h diff --git a/CAN-binder/libs/nanopb/examples/using_double_on_avr/doubleproto.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_double_on_avr/doubleproto.proto similarity index 100% rename from CAN-binder/libs/nanopb/examples/using_double_on_avr/doubleproto.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_double_on_avr/doubleproto.proto diff --git a/CAN-binder/libs/nanopb/examples/using_double_on_avr/encode_double.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_double_on_avr/encode_double.c similarity index 100% rename from CAN-binder/libs/nanopb/examples/using_double_on_avr/encode_double.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_double_on_avr/encode_double.c diff --git a/CAN-binder/libs/nanopb/examples/using_double_on_avr/test_conversions.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_double_on_avr/test_conversions.c similarity index 100% rename from CAN-binder/libs/nanopb/examples/using_double_on_avr/test_conversions.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_double_on_avr/test_conversions.c diff --git a/CAN-binder/libs/nanopb/examples/using_union_messages/Makefile b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_union_messages/Makefile similarity index 100% rename from CAN-binder/libs/nanopb/examples/using_union_messages/Makefile rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_union_messages/Makefile diff --git a/CAN-binder/libs/nanopb/examples/using_union_messages/README.txt b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_union_messages/README.txt similarity index 100% rename from CAN-binder/libs/nanopb/examples/using_union_messages/README.txt rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_union_messages/README.txt diff --git a/CAN-binder/libs/nanopb/examples/using_union_messages/decode.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_union_messages/decode.c similarity index 100% rename from CAN-binder/libs/nanopb/examples/using_union_messages/decode.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_union_messages/decode.c diff --git a/CAN-binder/libs/nanopb/examples/using_union_messages/encode.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_union_messages/encode.c similarity index 100% rename from CAN-binder/libs/nanopb/examples/using_union_messages/encode.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_union_messages/encode.c diff --git a/CAN-binder/libs/nanopb/examples/using_union_messages/unionproto.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_union_messages/unionproto.proto similarity index 100% rename from CAN-binder/libs/nanopb/examples/using_union_messages/unionproto.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/examples/using_union_messages/unionproto.proto diff --git a/CAN-binder/libs/nanopb/extra/FindNanopb.cmake b/CAN-binder/libs/openxc-message-format/libs/nanopb/extra/FindNanopb.cmake similarity index 100% rename from CAN-binder/libs/nanopb/extra/FindNanopb.cmake rename to CAN-binder/libs/openxc-message-format/libs/nanopb/extra/FindNanopb.cmake diff --git a/CAN-binder/libs/nanopb/extra/nanopb-config-version.cmake.in b/CAN-binder/libs/openxc-message-format/libs/nanopb/extra/nanopb-config-version.cmake.in similarity index 100% rename from CAN-binder/libs/nanopb/extra/nanopb-config-version.cmake.in rename to CAN-binder/libs/openxc-message-format/libs/nanopb/extra/nanopb-config-version.cmake.in diff --git a/CAN-binder/libs/nanopb/extra/nanopb-config.cmake b/CAN-binder/libs/openxc-message-format/libs/nanopb/extra/nanopb-config.cmake similarity index 100% rename from CAN-binder/libs/nanopb/extra/nanopb-config.cmake rename to CAN-binder/libs/openxc-message-format/libs/nanopb/extra/nanopb-config.cmake diff --git a/CAN-binder/libs/nanopb/extra/nanopb.mk b/CAN-binder/libs/openxc-message-format/libs/nanopb/extra/nanopb.mk similarity index 100% rename from CAN-binder/libs/nanopb/extra/nanopb.mk rename to CAN-binder/libs/openxc-message-format/libs/nanopb/extra/nanopb.mk diff --git a/CAN-binder/libs/nanopb/extra/pb_syshdr.h b/CAN-binder/libs/openxc-message-format/libs/nanopb/extra/pb_syshdr.h similarity index 100% rename from CAN-binder/libs/nanopb/extra/pb_syshdr.h rename to CAN-binder/libs/openxc-message-format/libs/nanopb/extra/pb_syshdr.h diff --git a/CAN-binder/libs/nanopb/generator/nanopb/options.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/generator/nanopb/options.proto similarity index 100% rename from CAN-binder/libs/nanopb/generator/nanopb/options.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/generator/nanopb/options.proto diff --git a/CAN-binder/libs/nanopb/generator/nanopb_generator.py b/CAN-binder/libs/openxc-message-format/libs/nanopb/generator/nanopb_generator.py similarity index 100% rename from CAN-binder/libs/nanopb/generator/nanopb_generator.py rename to CAN-binder/libs/openxc-message-format/libs/nanopb/generator/nanopb_generator.py diff --git a/CAN-binder/libs/nanopb/generator/proto/Makefile b/CAN-binder/libs/openxc-message-format/libs/nanopb/generator/proto/Makefile similarity index 100% rename from CAN-binder/libs/nanopb/generator/proto/Makefile rename to CAN-binder/libs/openxc-message-format/libs/nanopb/generator/proto/Makefile diff --git a/CAN-binder/libs/nanopb/generator/proto/__init__.py b/CAN-binder/libs/openxc-message-format/libs/nanopb/generator/proto/__init__.py similarity index 100% rename from CAN-binder/libs/nanopb/generator/proto/__init__.py rename to CAN-binder/libs/openxc-message-format/libs/nanopb/generator/proto/__init__.py diff --git a/CAN-binder/libs/nanopb/generator/proto/google/protobuf/descriptor.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/generator/proto/google/protobuf/descriptor.proto similarity index 100% rename from CAN-binder/libs/nanopb/generator/proto/google/protobuf/descriptor.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/generator/proto/google/protobuf/descriptor.proto diff --git a/CAN-binder/libs/nanopb/generator/proto/nanopb.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/generator/proto/nanopb.proto similarity index 100% rename from CAN-binder/libs/nanopb/generator/proto/nanopb.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/generator/proto/nanopb.proto diff --git a/CAN-binder/libs/nanopb/generator/proto/plugin.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/generator/proto/plugin.proto similarity index 100% rename from CAN-binder/libs/nanopb/generator/proto/plugin.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/generator/proto/plugin.proto diff --git a/CAN-binder/libs/nanopb/generator/protoc-gen-nanopb b/CAN-binder/libs/openxc-message-format/libs/nanopb/generator/protoc-gen-nanopb similarity index 100% rename from CAN-binder/libs/nanopb/generator/protoc-gen-nanopb rename to CAN-binder/libs/openxc-message-format/libs/nanopb/generator/protoc-gen-nanopb diff --git a/CAN-binder/libs/nanopb/generator/protoc-gen-nanopb.bat b/CAN-binder/libs/openxc-message-format/libs/nanopb/generator/protoc-gen-nanopb.bat similarity index 100% rename from CAN-binder/libs/nanopb/generator/protoc-gen-nanopb.bat rename to CAN-binder/libs/openxc-message-format/libs/nanopb/generator/protoc-gen-nanopb.bat diff --git a/CAN-binder/libs/nanopb/library.json b/CAN-binder/libs/openxc-message-format/libs/nanopb/library.json similarity index 100% rename from CAN-binder/libs/nanopb/library.json rename to CAN-binder/libs/openxc-message-format/libs/nanopb/library.json diff --git a/CAN-binder/libs/nanopb/pb.h b/CAN-binder/libs/openxc-message-format/libs/nanopb/pb.h similarity index 100% rename from CAN-binder/libs/nanopb/pb.h rename to CAN-binder/libs/openxc-message-format/libs/nanopb/pb.h diff --git a/CAN-binder/libs/nanopb/pb_common.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/pb_common.c similarity index 100% rename from CAN-binder/libs/nanopb/pb_common.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/pb_common.c diff --git a/CAN-binder/libs/nanopb/pb_common.h b/CAN-binder/libs/openxc-message-format/libs/nanopb/pb_common.h similarity index 100% rename from CAN-binder/libs/nanopb/pb_common.h rename to CAN-binder/libs/openxc-message-format/libs/nanopb/pb_common.h diff --git a/CAN-binder/libs/nanopb/pb_decode.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/pb_decode.c similarity index 100% rename from CAN-binder/libs/nanopb/pb_decode.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/pb_decode.c diff --git a/CAN-binder/libs/nanopb/pb_decode.h b/CAN-binder/libs/openxc-message-format/libs/nanopb/pb_decode.h similarity index 100% rename from CAN-binder/libs/nanopb/pb_decode.h rename to CAN-binder/libs/openxc-message-format/libs/nanopb/pb_decode.h diff --git a/CAN-binder/libs/nanopb/pb_encode.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/pb_encode.c similarity index 100% rename from CAN-binder/libs/nanopb/pb_encode.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/pb_encode.c diff --git a/CAN-binder/libs/nanopb/pb_encode.h b/CAN-binder/libs/openxc-message-format/libs/nanopb/pb_encode.h similarity index 100% rename from CAN-binder/libs/nanopb/pb_encode.h rename to CAN-binder/libs/openxc-message-format/libs/nanopb/pb_encode.h diff --git a/CAN-binder/libs/nanopb/tests/Makefile b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/Makefile similarity index 100% rename from CAN-binder/libs/nanopb/tests/Makefile rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/Makefile diff --git a/CAN-binder/libs/nanopb/tests/SConstruct b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/SConstruct similarity index 100% rename from CAN-binder/libs/nanopb/tests/SConstruct rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/SConstruct diff --git a/CAN-binder/libs/nanopb/tests/alltypes/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes/SConscript diff --git a/CAN-binder/libs/nanopb/tests/alltypes/alltypes.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes/alltypes.options similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes/alltypes.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes/alltypes.options diff --git a/CAN-binder/libs/nanopb/tests/alltypes/alltypes.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes/alltypes.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes/alltypes.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes/alltypes.proto diff --git a/CAN-binder/libs/nanopb/tests/alltypes/decode_alltypes.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes/decode_alltypes.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes/decode_alltypes.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes/decode_alltypes.c diff --git a/CAN-binder/libs/nanopb/tests/alltypes/encode_alltypes.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes/encode_alltypes.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes/encode_alltypes.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes/encode_alltypes.c diff --git a/CAN-binder/libs/nanopb/tests/alltypes_callback/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_callback/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes_callback/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_callback/SConscript diff --git a/CAN-binder/libs/nanopb/tests/alltypes_callback/alltypes.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_callback/alltypes.options similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes_callback/alltypes.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_callback/alltypes.options diff --git a/CAN-binder/libs/nanopb/tests/alltypes_callback/decode_alltypes_callback.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_callback/decode_alltypes_callback.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes_callback/decode_alltypes_callback.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_callback/decode_alltypes_callback.c diff --git a/CAN-binder/libs/nanopb/tests/alltypes_callback/encode_alltypes_callback.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_callback/encode_alltypes_callback.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes_callback/encode_alltypes_callback.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_callback/encode_alltypes_callback.c diff --git a/CAN-binder/libs/nanopb/tests/alltypes_pointer/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_pointer/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes_pointer/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_pointer/SConscript diff --git a/CAN-binder/libs/nanopb/tests/alltypes_pointer/alltypes.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_pointer/alltypes.options similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes_pointer/alltypes.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_pointer/alltypes.options diff --git a/CAN-binder/libs/nanopb/tests/alltypes_pointer/decode_alltypes_pointer.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_pointer/decode_alltypes_pointer.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes_pointer/decode_alltypes_pointer.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_pointer/decode_alltypes_pointer.c diff --git a/CAN-binder/libs/nanopb/tests/alltypes_pointer/encode_alltypes_pointer.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_pointer/encode_alltypes_pointer.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes_pointer/encode_alltypes_pointer.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_pointer/encode_alltypes_pointer.c diff --git a/CAN-binder/libs/nanopb/tests/alltypes_proto3/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_proto3/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes_proto3/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_proto3/SConscript diff --git a/CAN-binder/libs/nanopb/tests/alltypes_proto3/alltypes.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_proto3/alltypes.options similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes_proto3/alltypes.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_proto3/alltypes.options diff --git a/CAN-binder/libs/nanopb/tests/alltypes_proto3/alltypes.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_proto3/alltypes.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes_proto3/alltypes.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_proto3/alltypes.proto diff --git a/CAN-binder/libs/nanopb/tests/alltypes_proto3/decode_alltypes.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_proto3/decode_alltypes.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes_proto3/decode_alltypes.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_proto3/decode_alltypes.c diff --git a/CAN-binder/libs/nanopb/tests/alltypes_proto3/encode_alltypes.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_proto3/encode_alltypes.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes_proto3/encode_alltypes.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_proto3/encode_alltypes.c diff --git a/CAN-binder/libs/nanopb/tests/alltypes_proto3_callback/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_proto3_callback/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes_proto3_callback/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_proto3_callback/SConscript diff --git a/CAN-binder/libs/nanopb/tests/alltypes_proto3_callback/alltypes.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_proto3_callback/alltypes.options similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes_proto3_callback/alltypes.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_proto3_callback/alltypes.options diff --git a/CAN-binder/libs/nanopb/tests/alltypes_proto3_callback/decode_alltypes_callback.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_proto3_callback/decode_alltypes_callback.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes_proto3_callback/decode_alltypes_callback.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_proto3_callback/decode_alltypes_callback.c diff --git a/CAN-binder/libs/nanopb/tests/alltypes_proto3_callback/encode_alltypes_callback.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_proto3_callback/encode_alltypes_callback.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/alltypes_proto3_callback/encode_alltypes_callback.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_proto3_callback/encode_alltypes_callback.c diff --git a/CAN-binder/libs/nanopb/tests/anonymous_oneof/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/anonymous_oneof/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/anonymous_oneof/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/anonymous_oneof/SConscript diff --git a/CAN-binder/libs/nanopb/tests/anonymous_oneof/decode_oneof.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/anonymous_oneof/decode_oneof.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/anonymous_oneof/decode_oneof.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/anonymous_oneof/decode_oneof.c diff --git a/CAN-binder/libs/nanopb/tests/anonymous_oneof/oneof.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/anonymous_oneof/oneof.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/anonymous_oneof/oneof.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/anonymous_oneof/oneof.proto diff --git a/CAN-binder/libs/nanopb/tests/backwards_compatibility/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/backwards_compatibility/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/backwards_compatibility/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/backwards_compatibility/SConscript diff --git a/CAN-binder/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.c diff --git a/CAN-binder/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.h b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.h similarity index 100% rename from CAN-binder/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.h rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.h diff --git a/CAN-binder/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.options similarity index 100% rename from CAN-binder/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.options diff --git a/CAN-binder/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/backwards_compatibility/alltypes_legacy.proto diff --git a/CAN-binder/libs/nanopb/tests/backwards_compatibility/decode_legacy.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/backwards_compatibility/decode_legacy.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/backwards_compatibility/decode_legacy.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/backwards_compatibility/decode_legacy.c diff --git a/CAN-binder/libs/nanopb/tests/backwards_compatibility/encode_legacy.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/backwards_compatibility/encode_legacy.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/backwards_compatibility/encode_legacy.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/backwards_compatibility/encode_legacy.c diff --git a/CAN-binder/libs/nanopb/tests/basic_buffer/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/basic_buffer/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/basic_buffer/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/basic_buffer/SConscript diff --git a/CAN-binder/libs/nanopb/tests/basic_buffer/decode_buffer.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/basic_buffer/decode_buffer.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/basic_buffer/decode_buffer.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/basic_buffer/decode_buffer.c diff --git a/CAN-binder/libs/nanopb/tests/basic_buffer/encode_buffer.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/basic_buffer/encode_buffer.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/basic_buffer/encode_buffer.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/basic_buffer/encode_buffer.c diff --git a/CAN-binder/libs/nanopb/tests/basic_stream/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/basic_stream/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/basic_stream/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/basic_stream/SConscript diff --git a/CAN-binder/libs/nanopb/tests/basic_stream/decode_stream.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/basic_stream/decode_stream.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/basic_stream/decode_stream.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/basic_stream/decode_stream.c diff --git a/CAN-binder/libs/nanopb/tests/basic_stream/encode_stream.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/basic_stream/encode_stream.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/basic_stream/encode_stream.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/basic_stream/encode_stream.c diff --git a/CAN-binder/libs/nanopb/tests/buffer_only/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/buffer_only/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/buffer_only/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/buffer_only/SConscript diff --git a/CAN-binder/libs/nanopb/tests/callbacks/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/callbacks/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/callbacks/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/callbacks/SConscript diff --git a/CAN-binder/libs/nanopb/tests/callbacks/callbacks.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/callbacks/callbacks.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/callbacks/callbacks.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/callbacks/callbacks.proto diff --git a/CAN-binder/libs/nanopb/tests/callbacks/decode_callbacks.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/callbacks/decode_callbacks.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/callbacks/decode_callbacks.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/callbacks/decode_callbacks.c diff --git a/CAN-binder/libs/nanopb/tests/callbacks/encode_callbacks.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/callbacks/encode_callbacks.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/callbacks/encode_callbacks.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/callbacks/encode_callbacks.c diff --git a/CAN-binder/libs/nanopb/tests/common/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/common/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/common/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/common/SConscript diff --git a/CAN-binder/libs/nanopb/tests/common/malloc_wrappers.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/common/malloc_wrappers.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/common/malloc_wrappers.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/common/malloc_wrappers.c diff --git a/CAN-binder/libs/nanopb/tests/common/malloc_wrappers.h b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/common/malloc_wrappers.h similarity index 100% rename from CAN-binder/libs/nanopb/tests/common/malloc_wrappers.h rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/common/malloc_wrappers.h diff --git a/CAN-binder/libs/nanopb/tests/common/malloc_wrappers_syshdr.h b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/common/malloc_wrappers_syshdr.h similarity index 100% rename from CAN-binder/libs/nanopb/tests/common/malloc_wrappers_syshdr.h rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/common/malloc_wrappers_syshdr.h diff --git a/CAN-binder/libs/nanopb/tests/common/person.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/common/person.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/common/person.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/common/person.proto diff --git a/CAN-binder/libs/nanopb/tests/common/test_helpers.h b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/common/test_helpers.h similarity index 100% rename from CAN-binder/libs/nanopb/tests/common/test_helpers.h rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/common/test_helpers.h diff --git a/CAN-binder/libs/nanopb/tests/common/unittestproto.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/common/unittestproto.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/common/unittestproto.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/common/unittestproto.proto diff --git a/CAN-binder/libs/nanopb/tests/common/unittests.h b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/common/unittests.h similarity index 100% rename from CAN-binder/libs/nanopb/tests/common/unittests.h rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/common/unittests.h diff --git a/CAN-binder/libs/nanopb/tests/cxx_main_program/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/cxx_main_program/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/cxx_main_program/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/cxx_main_program/SConscript diff --git a/CAN-binder/libs/nanopb/tests/cyclic_messages/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/cyclic_messages/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/cyclic_messages/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/cyclic_messages/SConscript diff --git a/CAN-binder/libs/nanopb/tests/cyclic_messages/cyclic.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/cyclic_messages/cyclic.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/cyclic_messages/cyclic.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/cyclic_messages/cyclic.proto diff --git a/CAN-binder/libs/nanopb/tests/cyclic_messages/cyclic_callback.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/cyclic_messages/cyclic_callback.options similarity index 100% rename from CAN-binder/libs/nanopb/tests/cyclic_messages/cyclic_callback.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/cyclic_messages/cyclic_callback.options diff --git a/CAN-binder/libs/nanopb/tests/cyclic_messages/encode_cyclic_callback.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/cyclic_messages/encode_cyclic_callback.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/cyclic_messages/encode_cyclic_callback.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/cyclic_messages/encode_cyclic_callback.c diff --git a/CAN-binder/libs/nanopb/tests/decode_unittests/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/decode_unittests/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/decode_unittests/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/decode_unittests/SConscript diff --git a/CAN-binder/libs/nanopb/tests/decode_unittests/decode_unittests.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/decode_unittests/decode_unittests.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/decode_unittests/decode_unittests.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/decode_unittests/decode_unittests.c diff --git a/CAN-binder/libs/nanopb/tests/encode_unittests/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/encode_unittests/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/encode_unittests/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/encode_unittests/SConscript diff --git a/CAN-binder/libs/nanopb/tests/encode_unittests/encode_unittests.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/encode_unittests/encode_unittests.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/encode_unittests/encode_unittests.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/encode_unittests/encode_unittests.c diff --git a/CAN-binder/libs/nanopb/tests/enum_sizes/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/enum_sizes/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/enum_sizes/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/enum_sizes/SConscript diff --git a/CAN-binder/libs/nanopb/tests/enum_sizes/enumsizes.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/enum_sizes/enumsizes.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/enum_sizes/enumsizes.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/enum_sizes/enumsizes.proto diff --git a/CAN-binder/libs/nanopb/tests/enum_sizes/enumsizes_unittests.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/enum_sizes/enumsizes_unittests.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/enum_sizes/enumsizes_unittests.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/enum_sizes/enumsizes_unittests.c diff --git a/CAN-binder/libs/nanopb/tests/enum_to_string/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/enum_to_string/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/enum_to_string/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/enum_to_string/SConscript diff --git a/CAN-binder/libs/nanopb/tests/enum_to_string/enum.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/enum_to_string/enum.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/enum_to_string/enum.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/enum_to_string/enum.proto diff --git a/CAN-binder/libs/nanopb/tests/enum_to_string/enum_to_string.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/enum_to_string/enum_to_string.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/enum_to_string/enum_to_string.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/enum_to_string/enum_to_string.c diff --git a/CAN-binder/libs/nanopb/tests/extensions/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/extensions/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/extensions/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/extensions/SConscript diff --git a/CAN-binder/libs/nanopb/tests/extensions/decode_extensions.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/extensions/decode_extensions.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/extensions/decode_extensions.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/extensions/decode_extensions.c diff --git a/CAN-binder/libs/nanopb/tests/extensions/encode_extensions.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/extensions/encode_extensions.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/extensions/encode_extensions.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/extensions/encode_extensions.c diff --git a/CAN-binder/libs/nanopb/tests/extensions/extensions.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/extensions/extensions.options similarity index 100% rename from CAN-binder/libs/nanopb/tests/extensions/extensions.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/extensions/extensions.options diff --git a/CAN-binder/libs/nanopb/tests/extensions/extensions.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/extensions/extensions.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/extensions/extensions.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/extensions/extensions.proto diff --git a/CAN-binder/libs/nanopb/tests/extra_fields/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/extra_fields/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/extra_fields/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/extra_fields/SConscript diff --git a/CAN-binder/libs/nanopb/tests/extra_fields/alltypes_with_extra_fields.pb b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/extra_fields/alltypes_with_extra_fields.pb similarity index 100% rename from CAN-binder/libs/nanopb/tests/extra_fields/alltypes_with_extra_fields.pb rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/extra_fields/alltypes_with_extra_fields.pb diff --git a/CAN-binder/libs/nanopb/tests/extra_fields/person_with_extra_field.expected b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/extra_fields/person_with_extra_field.expected similarity index 100% rename from CAN-binder/libs/nanopb/tests/extra_fields/person_with_extra_field.expected rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/extra_fields/person_with_extra_field.expected diff --git a/CAN-binder/libs/nanopb/tests/extra_fields/person_with_extra_field.pb b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/extra_fields/person_with_extra_field.pb similarity index 100% rename from CAN-binder/libs/nanopb/tests/extra_fields/person_with_extra_field.pb rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/extra_fields/person_with_extra_field.pb diff --git a/CAN-binder/libs/nanopb/tests/field_size_16/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_16/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/field_size_16/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_16/SConscript diff --git a/CAN-binder/libs/nanopb/tests/field_size_16/alltypes.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_16/alltypes.options similarity index 100% rename from CAN-binder/libs/nanopb/tests/field_size_16/alltypes.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_16/alltypes.options diff --git a/CAN-binder/libs/nanopb/tests/field_size_16/alltypes.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_16/alltypes.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/field_size_16/alltypes.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_16/alltypes.proto diff --git a/CAN-binder/libs/nanopb/tests/field_size_16_proto3/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_16_proto3/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/field_size_16_proto3/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_16_proto3/SConscript diff --git a/CAN-binder/libs/nanopb/tests/field_size_16_proto3/alltypes.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_16_proto3/alltypes.options similarity index 100% rename from CAN-binder/libs/nanopb/tests/field_size_16_proto3/alltypes.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_16_proto3/alltypes.options diff --git a/CAN-binder/libs/nanopb/tests/field_size_16_proto3/alltypes.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_16_proto3/alltypes.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/field_size_16_proto3/alltypes.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_16_proto3/alltypes.proto diff --git a/CAN-binder/libs/nanopb/tests/field_size_16_proto3/decode_alltypes.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_16_proto3/decode_alltypes.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/field_size_16_proto3/decode_alltypes.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_16_proto3/decode_alltypes.c diff --git a/CAN-binder/libs/nanopb/tests/field_size_16_proto3/encode_alltypes.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_16_proto3/encode_alltypes.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/field_size_16_proto3/encode_alltypes.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_16_proto3/encode_alltypes.c diff --git a/CAN-binder/libs/nanopb/tests/field_size_32/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_32/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/field_size_32/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_32/SConscript diff --git a/CAN-binder/libs/nanopb/tests/field_size_32/alltypes.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_32/alltypes.options similarity index 100% rename from CAN-binder/libs/nanopb/tests/field_size_32/alltypes.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_32/alltypes.options diff --git a/CAN-binder/libs/nanopb/tests/field_size_32/alltypes.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_32/alltypes.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/field_size_32/alltypes.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/field_size_32/alltypes.proto diff --git a/CAN-binder/libs/nanopb/tests/fuzztest/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/fuzztest/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/fuzztest/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/fuzztest/SConscript diff --git a/CAN-binder/libs/nanopb/tests/fuzztest/alltypes_pointer.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/fuzztest/alltypes_pointer.options similarity index 100% rename from CAN-binder/libs/nanopb/tests/fuzztest/alltypes_pointer.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/fuzztest/alltypes_pointer.options diff --git a/CAN-binder/libs/nanopb/tests/fuzztest/alltypes_static.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/fuzztest/alltypes_static.options similarity index 100% rename from CAN-binder/libs/nanopb/tests/fuzztest/alltypes_static.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/fuzztest/alltypes_static.options diff --git a/CAN-binder/libs/nanopb/tests/fuzztest/fuzzstub.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/fuzztest/fuzzstub.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/fuzztest/fuzzstub.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/fuzztest/fuzzstub.c diff --git a/CAN-binder/libs/nanopb/tests/fuzztest/fuzztest.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/fuzztest/fuzztest.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/fuzztest/fuzztest.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/fuzztest/fuzztest.c diff --git a/CAN-binder/libs/nanopb/tests/fuzztest/generate_message.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/fuzztest/generate_message.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/fuzztest/generate_message.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/fuzztest/generate_message.c diff --git a/CAN-binder/libs/nanopb/tests/fuzztest/run_radamsa.sh b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/fuzztest/run_radamsa.sh similarity index 100% rename from CAN-binder/libs/nanopb/tests/fuzztest/run_radamsa.sh rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/fuzztest/run_radamsa.sh diff --git a/CAN-binder/libs/nanopb/tests/fuzztest/sample_data/sample1.pb b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/fuzztest/sample_data/sample1.pb similarity index 100% rename from CAN-binder/libs/nanopb/tests/fuzztest/sample_data/sample1.pb rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/fuzztest/sample_data/sample1.pb diff --git a/CAN-binder/libs/nanopb/tests/fuzztest/sample_data/sample2.pb b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/fuzztest/sample_data/sample2.pb similarity index 100% rename from CAN-binder/libs/nanopb/tests/fuzztest/sample_data/sample2.pb rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/fuzztest/sample_data/sample2.pb diff --git a/CAN-binder/libs/nanopb/tests/inline/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/inline/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/inline/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/inline/SConscript diff --git a/CAN-binder/libs/nanopb/tests/inline/inline.expected b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/inline/inline.expected similarity index 100% rename from CAN-binder/libs/nanopb/tests/inline/inline.expected rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/inline/inline.expected diff --git a/CAN-binder/libs/nanopb/tests/inline/inline.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/inline/inline.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/inline/inline.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/inline/inline.proto diff --git a/CAN-binder/libs/nanopb/tests/inline/inline_unittests.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/inline/inline_unittests.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/inline/inline_unittests.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/inline/inline_unittests.c diff --git a/CAN-binder/libs/nanopb/tests/intsizes/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/intsizes/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/intsizes/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/intsizes/SConscript diff --git a/CAN-binder/libs/nanopb/tests/intsizes/intsizes.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/intsizes/intsizes.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/intsizes/intsizes.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/intsizes/intsizes.proto diff --git a/CAN-binder/libs/nanopb/tests/intsizes/intsizes_unittests.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/intsizes/intsizes_unittests.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/intsizes/intsizes_unittests.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/intsizes/intsizes_unittests.c diff --git a/CAN-binder/libs/nanopb/tests/io_errors/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/io_errors/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/io_errors/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/io_errors/SConscript diff --git a/CAN-binder/libs/nanopb/tests/io_errors/alltypes.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/io_errors/alltypes.options similarity index 100% rename from CAN-binder/libs/nanopb/tests/io_errors/alltypes.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/io_errors/alltypes.options diff --git a/CAN-binder/libs/nanopb/tests/io_errors/io_errors.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/io_errors/io_errors.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/io_errors/io_errors.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/io_errors/io_errors.c diff --git a/CAN-binder/libs/nanopb/tests/io_errors_pointers/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/io_errors_pointers/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/io_errors_pointers/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/io_errors_pointers/SConscript diff --git a/CAN-binder/libs/nanopb/tests/io_errors_pointers/alltypes.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/io_errors_pointers/alltypes.options similarity index 100% rename from CAN-binder/libs/nanopb/tests/io_errors_pointers/alltypes.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/io_errors_pointers/alltypes.options diff --git a/CAN-binder/libs/nanopb/tests/mem_release/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/mem_release/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/mem_release/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/mem_release/SConscript diff --git a/CAN-binder/libs/nanopb/tests/mem_release/mem_release.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/mem_release/mem_release.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/mem_release/mem_release.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/mem_release/mem_release.c diff --git a/CAN-binder/libs/nanopb/tests/mem_release/mem_release.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/mem_release/mem_release.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/mem_release/mem_release.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/mem_release/mem_release.proto diff --git a/CAN-binder/libs/nanopb/tests/message_sizes/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/message_sizes/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/message_sizes/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/message_sizes/SConscript diff --git a/CAN-binder/libs/nanopb/tests/message_sizes/dummy.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/message_sizes/dummy.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/message_sizes/dummy.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/message_sizes/dummy.c diff --git a/CAN-binder/libs/nanopb/tests/message_sizes/messages1.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/message_sizes/messages1.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/message_sizes/messages1.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/message_sizes/messages1.proto diff --git a/CAN-binder/libs/nanopb/tests/message_sizes/messages2.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/message_sizes/messages2.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/message_sizes/messages2.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/message_sizes/messages2.proto diff --git a/CAN-binder/libs/nanopb/tests/missing_fields/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/missing_fields/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/missing_fields/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/missing_fields/SConscript diff --git a/CAN-binder/libs/nanopb/tests/missing_fields/missing_fields.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/missing_fields/missing_fields.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/missing_fields/missing_fields.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/missing_fields/missing_fields.c diff --git a/CAN-binder/libs/nanopb/tests/missing_fields/missing_fields.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/missing_fields/missing_fields.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/missing_fields/missing_fields.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/missing_fields/missing_fields.proto diff --git a/CAN-binder/libs/nanopb/tests/multiple_files/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/multiple_files/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/multiple_files/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/multiple_files/SConscript diff --git a/CAN-binder/libs/nanopb/tests/multiple_files/multifile1.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/multiple_files/multifile1.options similarity index 100% rename from CAN-binder/libs/nanopb/tests/multiple_files/multifile1.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/multiple_files/multifile1.options diff --git a/CAN-binder/libs/nanopb/tests/multiple_files/multifile1.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/multiple_files/multifile1.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/multiple_files/multifile1.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/multiple_files/multifile1.proto diff --git a/CAN-binder/libs/nanopb/tests/multiple_files/multifile2.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/multiple_files/multifile2.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/multiple_files/multifile2.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/multiple_files/multifile2.proto diff --git a/CAN-binder/libs/nanopb/tests/multiple_files/subdir/multifile2.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/multiple_files/subdir/multifile2.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/multiple_files/subdir/multifile2.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/multiple_files/subdir/multifile2.proto diff --git a/CAN-binder/libs/nanopb/tests/multiple_files/test_multiple_files.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/multiple_files/test_multiple_files.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/multiple_files/test_multiple_files.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/multiple_files/test_multiple_files.c diff --git a/CAN-binder/libs/nanopb/tests/no_errmsg/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/no_errmsg/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/no_errmsg/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/no_errmsg/SConscript diff --git a/CAN-binder/libs/nanopb/tests/no_messages/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/no_messages/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/no_messages/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/no_messages/SConscript diff --git a/CAN-binder/libs/nanopb/tests/no_messages/no_messages.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/no_messages/no_messages.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/no_messages/no_messages.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/no_messages/no_messages.proto diff --git a/CAN-binder/libs/nanopb/tests/oneof/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/oneof/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/oneof/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/oneof/SConscript diff --git a/CAN-binder/libs/nanopb/tests/oneof/decode_oneof.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/oneof/decode_oneof.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/oneof/decode_oneof.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/oneof/decode_oneof.c diff --git a/CAN-binder/libs/nanopb/tests/oneof/encode_oneof.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/oneof/encode_oneof.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/oneof/encode_oneof.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/oneof/encode_oneof.c diff --git a/CAN-binder/libs/nanopb/tests/oneof/oneof.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/oneof/oneof.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/oneof/oneof.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/oneof/oneof.proto diff --git a/CAN-binder/libs/nanopb/tests/options/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/options/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/options/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/options/SConscript diff --git a/CAN-binder/libs/nanopb/tests/options/options.expected b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/options/options.expected similarity index 100% rename from CAN-binder/libs/nanopb/tests/options/options.expected rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/options/options.expected diff --git a/CAN-binder/libs/nanopb/tests/options/options.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/options/options.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/options/options.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/options/options.proto diff --git a/CAN-binder/libs/nanopb/tests/options/proto3_options.expected b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/options/proto3_options.expected similarity index 100% rename from CAN-binder/libs/nanopb/tests/options/proto3_options.expected rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/options/proto3_options.expected diff --git a/CAN-binder/libs/nanopb/tests/options/proto3_options.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/options/proto3_options.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/options/proto3_options.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/options/proto3_options.proto diff --git a/CAN-binder/libs/nanopb/tests/package_name/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/package_name/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/package_name/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/package_name/SConscript diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_118/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_118/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_118/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_118/SConscript diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_118/enumdef.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_118/enumdef.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_118/enumdef.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_118/enumdef.proto diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_118/enumuse.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_118/enumuse.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_118/enumuse.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_118/enumuse.proto diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_125/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_125/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_125/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_125/SConscript diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_125/extensionbug.expected b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_125/extensionbug.expected similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_125/extensionbug.expected rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_125/extensionbug.expected diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_125/extensionbug.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_125/extensionbug.options similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_125/extensionbug.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_125/extensionbug.options diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_125/extensionbug.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_125/extensionbug.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_125/extensionbug.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_125/extensionbug.proto diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_141/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_141/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_141/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_141/SConscript diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_141/testproto.expected b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_141/testproto.expected similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_141/testproto.expected rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_141/testproto.expected diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_141/testproto.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_141/testproto.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_141/testproto.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_141/testproto.proto diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_145/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_145/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_145/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_145/SConscript diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_145/comments.expected b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_145/comments.expected similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_145/comments.expected rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_145/comments.expected diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_145/comments.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_145/comments.options similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_145/comments.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_145/comments.options diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_145/comments.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_145/comments.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_145/comments.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_145/comments.proto diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_166/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_166/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_166/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_166/SConscript diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_166/enum_encoded_size.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_166/enum_encoded_size.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_166/enum_encoded_size.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_166/enum_encoded_size.c diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_166/enums.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_166/enums.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_166/enums.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_166/enums.proto diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_172/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_172/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_172/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_172/SConscript diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_172/msg_size.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_172/msg_size.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_172/msg_size.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_172/msg_size.c diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_172/submessage/submessage.options b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_172/submessage/submessage.options similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_172/submessage/submessage.options rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_172/submessage/submessage.options diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_172/submessage/submessage.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_172/submessage/submessage.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_172/submessage/submessage.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_172/submessage/submessage.proto diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_172/test.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_172/test.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_172/test.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_172/test.proto diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_188/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_188/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_188/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_188/SConscript diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_188/oneof.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_188/oneof.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_188/oneof.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_188/oneof.proto diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_195/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_195/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_195/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_195/SConscript diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_195/test.expected b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_195/test.expected similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_195/test.expected rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_195/test.expected diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_195/test.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_195/test.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_195/test.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_195/test.proto diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_203/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_203/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_203/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_203/SConscript diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_203/file1.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_203/file1.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_203/file1.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_203/file1.proto diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_203/file2.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_203/file2.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_203/file2.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_203/file2.proto diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_205/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_205/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_205/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_205/SConscript diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_205/size_corruption.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_205/size_corruption.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_205/size_corruption.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_205/size_corruption.c diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_205/size_corruption.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_205/size_corruption.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_205/size_corruption.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_205/size_corruption.proto diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_227/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_227/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_227/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_227/SConscript diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_227/unaligned_uint64.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_227/unaligned_uint64.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_227/unaligned_uint64.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_227/unaligned_uint64.c diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_227/unaligned_uint64.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_227/unaligned_uint64.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_227/unaligned_uint64.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_227/unaligned_uint64.proto diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_229/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_229/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_229/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_229/SConscript diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_229/multiple_oneof.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_229/multiple_oneof.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_229/multiple_oneof.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_229/multiple_oneof.c diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_229/multiple_oneof.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_229/multiple_oneof.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_229/multiple_oneof.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_229/multiple_oneof.proto diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_242/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_242/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_242/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_242/SConscript diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_242/zero_value.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_242/zero_value.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_242/zero_value.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_242/zero_value.c diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_242/zero_value.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_242/zero_value.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_242/zero_value.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_242/zero_value.proto diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_247/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_247/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_247/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_247/SConscript diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_247/padding.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_247/padding.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_247/padding.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_247/padding.c diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_247/padding.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_247/padding.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_247/padding.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_247/padding.proto diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_249/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_249/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_249/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_249/SConscript diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_249/test.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_249/test.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_249/test.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_249/test.c diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_249/test.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_249/test.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_249/test.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_249/test.proto diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_253/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_253/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_253/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_253/SConscript diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_253/short_array.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_253/short_array.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_253/short_array.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_253/short_array.c diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_253/short_array.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_253/short_array.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_253/short_array.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_253/short_array.proto diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_256/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_256/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_256/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_256/SConscript diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_256/submsg_array.c b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_256/submsg_array.c similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_256/submsg_array.c rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_256/submsg_array.c diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_256/submsg_array.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_256/submsg_array.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/regression/issue_256/submsg_array.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/regression/issue_256/submsg_array.proto diff --git a/CAN-binder/libs/nanopb/tests/site_scons/site_init.py b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/site_scons/site_init.py similarity index 100% rename from CAN-binder/libs/nanopb/tests/site_scons/site_init.py rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/site_scons/site_init.py diff --git a/CAN-binder/libs/nanopb/tests/site_scons/site_tools/nanopb.py b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/site_scons/site_tools/nanopb.py similarity index 100% rename from CAN-binder/libs/nanopb/tests/site_scons/site_tools/nanopb.py rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/site_scons/site_tools/nanopb.py diff --git a/CAN-binder/libs/nanopb/tests/special_characters/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/special_characters/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/special_characters/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/special_characters/SConscript diff --git a/CAN-binder/libs/nanopb/tests/special_characters/funny-proto+name has.characters.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/special_characters/funny-proto+name has.characters.proto similarity index 100% rename from CAN-binder/libs/nanopb/tests/special_characters/funny-proto+name has.characters.proto rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/special_characters/funny-proto+name has.characters.proto diff --git a/CAN-binder/libs/nanopb/tests/splint/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/splint/SConscript similarity index 100% rename from CAN-binder/libs/nanopb/tests/splint/SConscript rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/splint/SConscript diff --git a/CAN-binder/libs/nanopb/tests/splint/splint.rc b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/splint/splint.rc similarity index 100% rename from CAN-binder/libs/nanopb/tests/splint/splint.rc rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tests/splint/splint.rc diff --git a/CAN-binder/libs/nanopb/tools/make_linux_package.sh b/CAN-binder/libs/openxc-message-format/libs/nanopb/tools/make_linux_package.sh similarity index 100% rename from CAN-binder/libs/nanopb/tools/make_linux_package.sh rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tools/make_linux_package.sh diff --git a/CAN-binder/libs/nanopb/tools/make_mac_package.sh b/CAN-binder/libs/openxc-message-format/libs/nanopb/tools/make_mac_package.sh similarity index 100% rename from CAN-binder/libs/nanopb/tools/make_mac_package.sh rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tools/make_mac_package.sh diff --git a/CAN-binder/libs/nanopb/tools/make_windows_package.sh b/CAN-binder/libs/openxc-message-format/libs/nanopb/tools/make_windows_package.sh similarity index 100% rename from CAN-binder/libs/nanopb/tools/make_windows_package.sh rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tools/make_windows_package.sh diff --git a/CAN-binder/libs/nanopb/tools/set_version.sh b/CAN-binder/libs/openxc-message-format/libs/nanopb/tools/set_version.sh similarity index 100% rename from CAN-binder/libs/nanopb/tools/set_version.sh rename to CAN-binder/libs/openxc-message-format/libs/nanopb/tools/set_version.sh diff --git a/CAN-binder/libs/uds-c/CMakeLists.txt b/CAN-binder/libs/uds-c/CMakeLists.txt new file mode 100644 index 0000000..34ae4ea --- /dev/null +++ b/CAN-binder/libs/uds-c/CMakeLists.txt @@ -0,0 +1,42 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: Fulup Ar Foll +# contrib: Romain Forlot +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + +# Add target to project dependency list +PROJECT_TARGET_ADD(uds-c) + + # Define project Target + add_library(${TARGET_NAME} STATIC + src/uds/extras.c + src/uds/uds.c) + + # Binder exposes a unique public entry point + SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES + OUTPUT_NAME ${TARGET_NAME} + ) + + # Define target includes + get_target_property(IsoTP_inc isotp-c INCLUDE_DIRECTORIES) + TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME} + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src + ${IsoTP_inc} + ) + + # Library dependencies (include updates automatically) + TARGET_LINK_LIBRARIES(${TARGET_NAME} + ${link_libraries}) diff --git a/CAN-binder/low-can-binding/CMakeLists.txt b/CAN-binder/low-can-binding/CMakeLists.txt index ded3be4..174b752 100644 --- a/CAN-binder/low-can-binding/CMakeLists.txt +++ b/CAN-binder/low-can-binding/CMakeLists.txt @@ -53,7 +53,6 @@ PROJECT_TARGET_ADD(low-can-binding) TARGET_LINK_LIBRARIES(${TARGET_NAME} ini-config openxc-message-format - nanopb uds-c isotp-c bitfield-c -- 2.16.6