284 files changed, 211 insertions, 110 deletions

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 <fulup@iot.bzh>
+# contrib: Romain Forlot <romain.forlot@iot.bzh>
+#
+# 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 <fulup@iot.bzh>
+# contrib: Romain Forlot <romain.forlot@iot.bzh>
+#
+# 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 <fulup@iot.bzh>
+# contrib: Romain Forlot <romain.forlot@iot.bzh>
+#
+# 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
-      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-    )
-
-    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 <fulup@iot.bzh>
+# contrib: Romain Forlot <romain.forlot@iot.bzh>
+#
+# 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
-Subproject b947dc6e2c0d63a29e83ebf9c8af450d2531aef
diff --git a/CAN-binder/libs/nanopb/.gitignore b/CAN-binder/libs/openxc-message-format/libs/nanopb/.gitignore
index 3bb09db..3bb09db 100644
--- a/CAN-binder/libs/nanopb/.gitignore
+++ b/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
index 2e77e7c..2e77e7c 100644
--- a/CAN-binder/libs/nanopb/.travis.yml
+++ b/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
index 7618ff7..7618ff7 100644
--- a/CAN-binder/libs/nanopb/AUTHORS
+++ b/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
index f9fc57f..f9fc57f 100644
--- a/CAN-binder/libs/nanopb/BUILD
+++ b/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
index 194d613..194d613 100644
--- a/CAN-binder/libs/nanopb/CHANGELOG.txt
+++ b/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
index 4041bc3..4041bc3 100644
--- a/CAN-binder/libs/nanopb/CONTRIBUTING.md
+++ b/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
index d11c9af..d11c9af 100644
--- a/CAN-binder/libs/nanopb/LICENSE.txt
+++ b/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
index 07860f0..07860f0 100644
--- a/CAN-binder/libs/nanopb/README.md
+++ b/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
index 0dbd97c..0dbd97c 100644
--- a/CAN-binder/libs/nanopb/docs/Makefile
+++ b/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
index 2e0d3f9..2e0d3f9 100644
--- a/CAN-binder/libs/nanopb/docs/concepts.rst
+++ b/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
index e30277a..e30277a 100644
--- a/CAN-binder/libs/nanopb/docs/generator_flow.svg
+++ b/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
index afc7ee4..afc7ee4 100644
--- a/CAN-binder/libs/nanopb/docs/index.rst
+++ b/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
index 0d9534f..0d9534f 100644
--- a/CAN-binder/libs/nanopb/docs/logo/logo.png
+++ b/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
index 91ab28b..91ab28b 100644
--- a/CAN-binder/libs/nanopb/docs/logo/logo.svg
+++ b/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
index 8db0e2e..8db0e2e 100644
--- a/CAN-binder/libs/nanopb/docs/logo/logo16px.png
+++ b/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
index b598c01..b598c01 100644
--- a/CAN-binder/libs/nanopb/docs/logo/logo48px.png
+++ b/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
index 429bce5..429bce5 100644
--- a/CAN-binder/libs/nanopb/docs/lsr.css
+++ b/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
index 2c110de..2c110de 100644
--- a/CAN-binder/libs/nanopb/docs/menu.rst
+++ b/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
index d6b32b5..d6b32b5 100644
--- a/CAN-binder/libs/nanopb/docs/migration.rst
+++ b/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
index e59a0c9..e59a0c9 100644
--- a/CAN-binder/libs/nanopb/docs/reference.rst
+++ b/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
index d854612..d854612 100644
--- a/CAN-binder/libs/nanopb/docs/security.rst
+++ b/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
index e5f33a0..e5f33a0 100644
--- a/CAN-binder/libs/nanopb/examples/cmake_simple/CMakeLists.txt
+++ b/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
index aa0f3f3..aa0f3f3 100644
--- a/CAN-binder/libs/nanopb/examples/cmake_simple/README.txt
+++ b/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
index 1f6b137..1f6b137 100644
--- a/CAN-binder/libs/nanopb/examples/cmake_simple/simple.c
+++ b/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
index 5c73a3b..5c73a3b 100644
--- a/CAN-binder/libs/nanopb/examples/cmake_simple/simple.proto
+++ b/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
index 2c7639a..2c7639a 100644
--- a/CAN-binder/libs/nanopb/examples/network_server/Makefile
+++ b/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
index 7bdcbed..7bdcbed 100644
--- a/CAN-binder/libs/nanopb/examples/network_server/README.txt
+++ b/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
index 00f6dab..00f6dab 100644
--- a/CAN-binder/libs/nanopb/examples/network_server/client.c
+++ b/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
index 04a5aa8..04a5aa8 100644
--- a/CAN-binder/libs/nanopb/examples/network_server/common.c
+++ b/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
index 8dab3b7..8dab3b7 100644
--- a/CAN-binder/libs/nanopb/examples/network_server/common.h
+++ b/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
index 29a2ab0..29a2ab0 100644
--- a/CAN-binder/libs/nanopb/examples/network_server/fileproto.options
+++ b/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
index 5640b8d..5640b8d 100644
--- a/CAN-binder/libs/nanopb/examples/network_server/fileproto.proto
+++ b/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
index 46a5f38..46a5f38 100644
--- a/CAN-binder/libs/nanopb/examples/network_server/server.c
+++ b/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
index 970a865..970a865 100644
--- a/CAN-binder/libs/nanopb/examples/simple/Makefile
+++ b/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
index ee77bfc..ee77bfc 100644
--- a/CAN-binder/libs/nanopb/examples/simple/README.txt
+++ b/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
index 1f6b137..1f6b137 100644
--- a/CAN-binder/libs/nanopb/examples/simple/simple.c
+++ b/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
index 5c73a3b..5c73a3b 100644
--- a/CAN-binder/libs/nanopb/examples/simple/simple.proto
+++ b/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
index 874a64b..874a64b 100644
--- 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
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
index d9fcdfc..d9fcdfc 100644
--- 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
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
index 5802eca..5802eca 100644
--- 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
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
index cf79b9a..cf79b9a 100644
--- 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
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
index 62b6a8a..62b6a8a 100644
--- 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
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
index 72d3f9c..72d3f9c 100644
--- 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
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
index cd532d4..cd532d4 100644
--- 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
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
index 22620a6..22620a6 100644
--- 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
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
index 66396a0..66396a0 100644
--- a/CAN-binder/libs/nanopb/examples/using_union_messages/Makefile
+++ b/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
index 7a1e75d..7a1e75d 100644
--- 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
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
index b9f4af5..b9f4af5 100644
--- 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
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
index e124bf9..e124bf9 100644
--- 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
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
index 209df0d..209df0d 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/extra/FindNanopb.cmake b/CAN-binder/libs/openxc-message-format/libs/nanopb/extra/FindNanopb.cmake
index 9afb21d..9afb21d 100644
--- a/CAN-binder/libs/nanopb/extra/FindNanopb.cmake
+++ b/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
index f9292a8..f9292a8 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/extra/nanopb-config.cmake b/CAN-binder/libs/openxc-message-format/libs/nanopb/extra/nanopb-config.cmake
index 4f726a6..4f726a6 100644
--- a/CAN-binder/libs/nanopb/extra/nanopb-config.cmake
+++ b/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
index 5c2cff5..5c2cff5 100644
--- a/CAN-binder/libs/nanopb/extra/nanopb.mk
+++ b/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
index 55d06a3..55d06a3 100644
--- a/CAN-binder/libs/nanopb/extra/pb_syshdr.h
+++ b/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
index f08e53d..f08e53d 100644
--- a/CAN-binder/libs/nanopb/generator/nanopb/options.proto
+++ b/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
index 42669ac..42669ac 100755
--- a/CAN-binder/libs/nanopb/generator/nanopb_generator.py
+++ b/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
index 89bfe52..89bfe52 100644
--- a/CAN-binder/libs/nanopb/generator/proto/Makefile
+++ b/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
index e69de29..e69de29 100644
--- a/CAN-binder/libs/nanopb/generator/proto/__init__.py
+++ b/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
index e17c0cc..e17c0cc 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/generator/proto/nanopb.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/generator/proto/nanopb.proto
index e4c1da7..e4c1da7 100644
--- a/CAN-binder/libs/nanopb/generator/proto/nanopb.proto
+++ b/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
index e627289..e627289 100644
--- a/CAN-binder/libs/nanopb/generator/proto/plugin.proto
+++ b/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
index 471a620..471a620 100755
--- a/CAN-binder/libs/nanopb/generator/protoc-gen-nanopb
+++ b/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
index e6cf187..e6cf187 100644
--- a/CAN-binder/libs/nanopb/generator/protoc-gen-nanopb.bat
+++ b/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
index 8e963f3..8e963f3 100644
--- a/CAN-binder/libs/nanopb/library.json
+++ b/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
index c7e6bc6..c7e6bc6 100644
--- a/CAN-binder/libs/nanopb/pb.h
+++ b/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
index 4fb7186..4fb7186 100644
--- a/CAN-binder/libs/nanopb/pb_common.c
+++ b/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
index 60b3d37..60b3d37 100644
--- a/CAN-binder/libs/nanopb/pb_common.h
+++ b/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
index 06d766a..06d766a 100644
--- a/CAN-binder/libs/nanopb/pb_decode.c
+++ b/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
index a426bdd..a426bdd 100644
--- a/CAN-binder/libs/nanopb/pb_decode.h
+++ b/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
index 05d691d..05d691d 100644
--- a/CAN-binder/libs/nanopb/pb_encode.c
+++ b/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
index d9909fb..d9909fb 100644
--- a/CAN-binder/libs/nanopb/pb_encode.h
+++ b/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
index cee6bf6..cee6bf6 100644
--- a/CAN-binder/libs/nanopb/tests/Makefile
+++ b/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
index ae79f71..ae79f71 100644
--- a/CAN-binder/libs/nanopb/tests/SConstruct
+++ b/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
index 6c6238c..6c6238c 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes/SConscript
+++ b/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
index 0d5ab12..0d5ab12 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes/alltypes.options
+++ b/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
index b2250c0..b2250c0 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes/alltypes.proto
+++ b/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
index 2e609e5..2e609e5 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes/decode_alltypes.c
+++ b/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
index 1b86355..1b86355 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes/encode_alltypes.c
+++ b/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
index 8be5390..8be5390 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_callback/SConscript
+++ b/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
index 74d7a9c..74d7a9c 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_callback/alltypes.options
+++ b/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
index 576ce30..576ce30 100644
--- 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
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
index b206783..b206783 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/alltypes_pointer/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_pointer/SConscript
index b095ae0..b095ae0 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_pointer/SConscript
+++ b/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
index 8699fe2..8699fe2 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_pointer/alltypes.options
+++ b/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
index 4ee6f8b..4ee6f8b 100644
--- 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
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
index a39af6f..a39af6f 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/alltypes_proto3/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/alltypes_proto3/SConscript
index c0b2fc1..c0b2fc1 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_proto3/SConscript
+++ b/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
index 78dd08d..78dd08d 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_proto3/alltypes.options
+++ b/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
index f66109e..f66109e 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_proto3/alltypes.proto
+++ b/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
index 51c1c41..51c1c41 100644
--- 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
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
index 1da0668..1da0668 100644
--- 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
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
index 183a138..183a138 100644
--- a/CAN-binder/libs/nanopb/tests/alltypes_proto3_callback/SConscript
+++ b/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
index 74d7a9c..74d7a9c 100644
--- 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
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
index 2b3c2f3..2b3c2f3 100644
--- 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
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
index 8c7bdd6..8c7bdd6 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/anonymous_oneof/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/anonymous_oneof/SConscript
index 1067228..1067228 100644
--- a/CAN-binder/libs/nanopb/tests/anonymous_oneof/SConscript
+++ b/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
index 0f774db..0f774db 100644
--- 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
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
index d56285c..d56285c 100644
--- a/CAN-binder/libs/nanopb/tests/anonymous_oneof/oneof.proto
+++ b/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
index 81b0318..81b0318 100644
--- a/CAN-binder/libs/nanopb/tests/backwards_compatibility/SConscript
+++ b/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
index 7311fd4..7311fd4 100644
--- 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
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
index 4e0a63b..4e0a63b 100644
--- 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
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
index b31e3cf..b31e3cf 100644
--- 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
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
index f5bc35c..f5bc35c 100644
--- 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
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
index 5f5b6bb..5f5b6bb 100644
--- 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
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
index 5c9d41b..5c9d41b 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/basic_buffer/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/basic_buffer/SConscript
index acaf5ff..acaf5ff 100644
--- a/CAN-binder/libs/nanopb/tests/basic_buffer/SConscript
+++ b/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
index 291d164..291d164 100644
--- 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
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
index c412c14..c412c14 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/basic_stream/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/basic_stream/SConscript
index 7d66856..7d66856 100644
--- a/CAN-binder/libs/nanopb/tests/basic_stream/SConscript
+++ b/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
index 798dcc5..798dcc5 100644
--- 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
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
index 7f571c4..7f571c4 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/buffer_only/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/buffer_only/SConscript
index 55b747b..55b747b 100644
--- a/CAN-binder/libs/nanopb/tests/buffer_only/SConscript
+++ b/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
index 4452143..4452143 100644
--- a/CAN-binder/libs/nanopb/tests/callbacks/SConscript
+++ b/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
index 96ac744..96ac744 100644
--- a/CAN-binder/libs/nanopb/tests/callbacks/callbacks.proto
+++ b/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
index 45724d0..45724d0 100644
--- a/CAN-binder/libs/nanopb/tests/callbacks/decode_callbacks.c
+++ b/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
index 6cb67b1..6cb67b1 100644
--- a/CAN-binder/libs/nanopb/tests/callbacks/encode_callbacks.c
+++ b/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
index 05e2f85..05e2f85 100644
--- a/CAN-binder/libs/nanopb/tests/common/SConscript
+++ b/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
index ad69f1c..ad69f1c 100644
--- a/CAN-binder/libs/nanopb/tests/common/malloc_wrappers.c
+++ b/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
index 7eec795..7eec795 100644
--- a/CAN-binder/libs/nanopb/tests/common/malloc_wrappers.h
+++ b/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
index d295d9e..d295d9e 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/common/person.proto b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/common/person.proto
index becefdf..becefdf 100644
--- a/CAN-binder/libs/nanopb/tests/common/person.proto
+++ b/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
index f77760a..f77760a 100644
--- a/CAN-binder/libs/nanopb/tests/common/test_helpers.h
+++ b/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
index 23b5b97..23b5b97 100644
--- a/CAN-binder/libs/nanopb/tests/common/unittestproto.proto
+++ b/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
index c2b470a..c2b470a 100644
--- a/CAN-binder/libs/nanopb/tests/common/unittests.h
+++ b/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
index edb8812..edb8812 100644
--- a/CAN-binder/libs/nanopb/tests/cxx_main_program/SConscript
+++ b/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
index c782001..c782001 100644
--- a/CAN-binder/libs/nanopb/tests/cyclic_messages/SConscript
+++ b/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
index 8cab0b1..8cab0b1 100644
--- a/CAN-binder/libs/nanopb/tests/cyclic_messages/cyclic.proto
+++ b/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
index fd4e1e1..fd4e1e1 100644
--- 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
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
index 7f67e70..7f67e70 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/decode_unittests/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/decode_unittests/SConscript
index 369b9dc..369b9dc 100644
--- a/CAN-binder/libs/nanopb/tests/decode_unittests/SConscript
+++ b/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
index a6f5c17..a6f5c17 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/encode_unittests/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/encode_unittests/SConscript
index bf6d140..bf6d140 100644
--- a/CAN-binder/libs/nanopb/tests/encode_unittests/SConscript
+++ b/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
index 583af5c..583af5c 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/enum_sizes/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/enum_sizes/SConscript
index 048592e..048592e 100644
--- a/CAN-binder/libs/nanopb/tests/enum_sizes/SConscript
+++ b/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
index a85d416..a85d416 100644
--- a/CAN-binder/libs/nanopb/tests/enum_sizes/enumsizes.proto
+++ b/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
index 5606895..5606895 100644
--- 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
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
index e86fcca..e86fcca 100644
--- a/CAN-binder/libs/nanopb/tests/enum_to_string/SConscript
+++ b/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
index 07c6736..07c6736 100644
--- 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
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
index c4fb31d..c4fb31d 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/extensions/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/extensions/SConscript
index a2c8742..a2c8742 100644
--- a/CAN-binder/libs/nanopb/tests/extensions/SConscript
+++ b/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
index e437438..e437438 100644
--- a/CAN-binder/libs/nanopb/tests/extensions/decode_extensions.c
+++ b/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
index 0074582..0074582 100644
--- a/CAN-binder/libs/nanopb/tests/extensions/encode_extensions.c
+++ b/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
index a5cd61d..a5cd61d 100644
--- a/CAN-binder/libs/nanopb/tests/extensions/extensions.options
+++ b/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
index fcd5b43..fcd5b43 100644
--- a/CAN-binder/libs/nanopb/tests/extensions/extensions.proto
+++ b/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
index 75ac5c5..75ac5c5 100644
--- a/CAN-binder/libs/nanopb/tests/extra_fields/SConscript
+++ b/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
index f9f5394..f9f5394 100644
--- 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
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
index da9c32d..da9c32d 100644
--- 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
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
index ffb303d..ffb303d 100644
--- 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
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
index ffb29c4..ffb29c4 100644
--- a/CAN-binder/libs/nanopb/tests/field_size_16/SConscript
+++ b/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
index 78dd08d..78dd08d 100644
--- 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
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
index 46ac46a..46ac46a 100644
--- 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
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
index 912c038..912c038 100644
--- 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
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
index edfbe78..edfbe78 100644
--- 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
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
index f66109e..f66109e 100644
--- 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
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
index 6611f8c..6611f8c 100644
--- 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
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
index 1da0668..1da0668 100644
--- 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
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
index 0b8dc0e..0b8dc0e 100644
--- a/CAN-binder/libs/nanopb/tests/field_size_32/SConscript
+++ b/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
index 0d5ab12..0d5ab12 100644
--- 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
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
index ac76c8e..ac76c8e 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/fuzztest/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/fuzztest/SConscript
index d2fb689..d2fb689 100644
--- a/CAN-binder/libs/nanopb/tests/fuzztest/SConscript
+++ b/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
index 7e3ad1e..7e3ad1e 100644
--- a/CAN-binder/libs/nanopb/tests/fuzztest/alltypes_pointer.options
+++ b/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
index e197e1d..e197e1d 100644
--- a/CAN-binder/libs/nanopb/tests/fuzztest/alltypes_static.options
+++ b/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
index ec9e2af..ec9e2af 100644
--- a/CAN-binder/libs/nanopb/tests/fuzztest/fuzzstub.c
+++ b/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
index ee851ec..ee851ec 100644
--- a/CAN-binder/libs/nanopb/tests/fuzztest/fuzztest.c
+++ b/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
index 6e49299..6e49299 100644
--- a/CAN-binder/libs/nanopb/tests/fuzztest/generate_message.c
+++ b/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
index 52cd40a..52cd40a 100755
--- a/CAN-binder/libs/nanopb/tests/fuzztest/run_radamsa.sh
+++ b/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
index 0752788..0752788 100644
--- 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
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
index cc89f91..cc89f91 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/inline/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/inline/SConscript
index 34371fd..34371fd 100644
--- a/CAN-binder/libs/nanopb/tests/inline/SConscript
+++ b/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
index 593e972..593e972 100644
--- a/CAN-binder/libs/nanopb/tests/inline/inline.expected
+++ b/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
index 6e511f0..6e511f0 100644
--- a/CAN-binder/libs/nanopb/tests/inline/inline.proto
+++ b/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
index b5834c7..b5834c7 100644
--- a/CAN-binder/libs/nanopb/tests/inline/inline_unittests.c
+++ b/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
index a90680b..a90680b 100644
--- a/CAN-binder/libs/nanopb/tests/intsizes/SConscript
+++ b/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
index 91444d4..91444d4 100644
--- a/CAN-binder/libs/nanopb/tests/intsizes/intsizes.proto
+++ b/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
index 79ef036..79ef036 100644
--- a/CAN-binder/libs/nanopb/tests/intsizes/intsizes_unittests.c
+++ b/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
index 60146cc..60146cc 100644
--- a/CAN-binder/libs/nanopb/tests/io_errors/SConscript
+++ b/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
index 0d5ab12..0d5ab12 100644
--- a/CAN-binder/libs/nanopb/tests/io_errors/alltypes.options
+++ b/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
index 76f35b0..76f35b0 100644
--- 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
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
index 03727df..03727df 100644
--- a/CAN-binder/libs/nanopb/tests/io_errors_pointers/SConscript
+++ b/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
index 7e3ad1e..7e3ad1e 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/mem_release/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/mem_release/SConscript
index 6754e28..6754e28 100644
--- a/CAN-binder/libs/nanopb/tests/mem_release/SConscript
+++ b/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
index dc6f87d..dc6f87d 100644
--- 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
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
index 0816dc2..0816dc2 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/message_sizes/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/message_sizes/SConscript
index e7524e0..e7524e0 100644
--- a/CAN-binder/libs/nanopb/tests/message_sizes/SConscript
+++ b/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
index 767ad46..767ad46 100644
--- a/CAN-binder/libs/nanopb/tests/message_sizes/dummy.c
+++ b/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
index b66fad7..b66fad7 100644
--- a/CAN-binder/libs/nanopb/tests/message_sizes/messages1.proto
+++ b/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
index 6761408..6761408 100644
--- a/CAN-binder/libs/nanopb/tests/message_sizes/messages2.proto
+++ b/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
index 86ba083..86ba083 100644
--- a/CAN-binder/libs/nanopb/tests/missing_fields/SConscript
+++ b/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
index 8aded82..8aded82 100644
--- 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
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
index cc5e550..cc5e550 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/multiple_files/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/multiple_files/SConscript
index b1281e1..b1281e1 100644
--- a/CAN-binder/libs/nanopb/tests/multiple_files/SConscript
+++ b/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
index c44d266..c44d266 100644
--- a/CAN-binder/libs/nanopb/tests/multiple_files/multifile1.options
+++ b/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
index 18f2c67..18f2c67 100644
--- a/CAN-binder/libs/nanopb/tests/multiple_files/multifile1.proto
+++ b/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
index 4af45fd..4af45fd 100644
--- a/CAN-binder/libs/nanopb/tests/multiple_files/multifile2.proto
+++ b/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
index 847a929..847a929 100644
--- 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
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
index 70a3e59..70a3e59 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/no_errmsg/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/no_errmsg/SConscript
index 629bfa6..629bfa6 100644
--- a/CAN-binder/libs/nanopb/tests/no_errmsg/SConscript
+++ b/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
index 6492e2c..6492e2c 100644
--- a/CAN-binder/libs/nanopb/tests/no_messages/SConscript
+++ b/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
index 45bb2e6..45bb2e6 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/oneof/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/oneof/SConscript
index 22634fb..22634fb 100644
--- a/CAN-binder/libs/nanopb/tests/oneof/SConscript
+++ b/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
index 37075cd..37075cd 100644
--- a/CAN-binder/libs/nanopb/tests/oneof/decode_oneof.c
+++ b/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
index 913d2d4..913d2d4 100644
--- a/CAN-binder/libs/nanopb/tests/oneof/encode_oneof.c
+++ b/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
index b4fe56f..b4fe56f 100644
--- a/CAN-binder/libs/nanopb/tests/oneof/oneof.proto
+++ b/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
index 215e3bd..215e3bd 100644
--- a/CAN-binder/libs/nanopb/tests/options/SConscript
+++ b/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
index 9e47e6a..9e47e6a 100644
--- a/CAN-binder/libs/nanopb/tests/options/options.expected
+++ b/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
index c6ca5e2..c6ca5e2 100644
--- a/CAN-binder/libs/nanopb/tests/options/options.proto
+++ b/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
index cc2f29c..cc2f29c 100644
--- a/CAN-binder/libs/nanopb/tests/options/proto3_options.expected
+++ b/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
index 1017f04..1017f04 100644
--- a/CAN-binder/libs/nanopb/tests/options/proto3_options.proto
+++ b/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
index 4afc503..4afc503 100644
--- a/CAN-binder/libs/nanopb/tests/package_name/SConscript
+++ b/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
index 833d9de..833d9de 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_118/SConscript
+++ b/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
index 46845bc..46845bc 100644
--- 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
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
index 4afc452..4afc452 100644
--- 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
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
index f2155e6..f2155e6 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_125/SConscript
+++ b/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
index fc21335..fc21335 100644
--- 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
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
index 30b464a..30b464a 100644
--- 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
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
index fd1e74f..fd1e74f 100644
--- 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
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
index b6526be..b6526be 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_141/SConscript
+++ b/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
index 75bc195..75bc195 100644
--- 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
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
index a445c68..a445c68 100644
--- 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
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
index 0b793a7..0b793a7 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_145/SConscript
+++ b/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
index 7f87458..7f87458 100644
--- 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
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
index 89959ba..89959ba 100644
--- 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
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
index 621779f..621779f 100644
--- 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
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
index c50b919..c50b919 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_166/SConscript
+++ b/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
index 84e1c7d..84e1c7d 100644
--- 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
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
index 3694804..3694804 100644
--- 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
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
index 49c919e..49c919e 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_172/SConscript
+++ b/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
index be45acb..be45acb 100644
--- 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
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
index 12fb198..12fb198 100644
--- 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
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
index ce6804a..ce6804a 100644
--- 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
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
index fbd97be..fbd97be 100644
--- 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
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
index 6bc3271..6bc3271 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_188/SConscript
+++ b/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
index e37f5c0..e37f5c0 100644
--- 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
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
index 78326d3..78326d3 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_195/SConscript
+++ b/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
index 83ea7ab..83ea7ab 100644
--- 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
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
index 7a77d69..7a77d69 100644
--- 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
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
index 8b4d6cc..8b4d6cc 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_203/SConscript
+++ b/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
index dae250b..dae250b 100644
--- 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
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
index 513b0f0..513b0f0 100644
--- 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
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
index ed8899d..ed8899d 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_205/SConscript
+++ b/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
index 08cef45..08cef45 100644
--- 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
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
index 6c9c245..6c9c245 100644
--- 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
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
index 1074124..1074124 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_227/SConscript
+++ b/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
index 17c1d77..17c1d77 100644
--- 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
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
index f0269f6..f0269f6 100644
--- 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
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
index b0f8376..b0f8376 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_229/SConscript
+++ b/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
index 902248d..902248d 100644
--- 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
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
index 22373e1..22373e1 100644
--- 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
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
index 000063e..000063e 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_242/SConscript
+++ b/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
index b3d96b7..b3d96b7 100644
--- 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
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
index 020a39a..020a39a 100644
--- 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
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
index b41e9f2..b41e9f2 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_247/SConscript
+++ b/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
index 8860179..8860179 100644
--- 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
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
index 20bddac..20bddac 100644
--- 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
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
index ba66712..ba66712 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_249/SConscript
+++ b/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
index a37180f..a37180f 100644
--- 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
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
index eaa2abd..eaa2abd 100644
--- 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
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
index 5a16948..5a16948 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_253/SConscript
+++ b/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
index 5ed6c3f..5ed6c3f 100644
--- 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
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
index 5a5d8a3..5a5d8a3 100644
--- 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
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
index b2c3e86..b2c3e86 100644
--- a/CAN-binder/libs/nanopb/tests/regression/issue_256/SConscript
+++ b/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
index c63bd30..c63bd30 100644
--- 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
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
index 4964a05..4964a05 100644
--- 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
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
index da5f6d6..da5f6d6 100644
--- 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
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
index c72a45d..c72a45d 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/special_characters/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/special_characters/SConscript
index 2309cf2..2309cf2 100644
--- a/CAN-binder/libs/nanopb/tests/special_characters/SConscript
+++ b/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
index 26b2cb1..26b2cb1 100644
--- 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
diff --git a/CAN-binder/libs/nanopb/tests/splint/SConscript b/CAN-binder/libs/openxc-message-format/libs/nanopb/tests/splint/SConscript
index cd4b5b9..cd4b5b9 100644
--- a/CAN-binder/libs/nanopb/tests/splint/SConscript
+++ b/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
index e47d3c2..e47d3c2 100644
--- a/CAN-binder/libs/nanopb/tests/splint/splint.rc
+++ b/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
index aea1c56..aea1c56 100755
--- a/CAN-binder/libs/nanopb/tools/make_linux_package.sh
+++ b/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
index 32bba5c..32bba5c 100755
--- a/CAN-binder/libs/nanopb/tools/make_mac_package.sh
+++ b/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
index 72de6f3..72de6f3 100755
--- a/CAN-binder/libs/nanopb/tools/make_windows_package.sh
+++ b/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
index 729ca0d..729ca0d 100755
--- a/CAN-binder/libs/nanopb/tools/set_version.sh
+++ b/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 <fulup@iot.bzh>
+# contrib: Romain Forlot <romain.forlot@iot.bzh>
+#
+# 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