284 files changed, 211 insertions, 110 deletions

diff --git a/CAN-binder/etc/config.cmake b/CAN-binder/etc/config.cmake
index 54f25da8..d03a0aeb 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 38ccd2d1..cc4af555 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 00000000..d4c91128
--- /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 00000000..ceb48259
--- /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 00000000..a4942126
--- /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 7fb7ad4a..00000000
--- 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 00000000..8e36ed47
--- /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 3bb09db1..3bb09db1 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 2e77e7c0..2e77e7c0 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 7618ff77..7618ff77 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 f9fc57f5..f9fc57f5 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 194d6136..194d6136 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 4041bc3c..4041bc3c 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 d11c9af1..d11c9af1 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 07860f06..07860f06 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 0dbd97cf..0dbd97cf 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 2e0d3f9b..2e0d3f9b 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 e30277a7..e30277a7 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 afc7ee4f..afc7ee4f 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 0d9534fa..0d9534fa 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 91ab28b6..91ab28b6 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 8db0e2ef..8db0e2ef 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 b598c011..b598c011 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 429bce51..429bce51 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 2c110def..2c110def 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 d6b32b53..d6b32b53 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 e59a0c94..e59a0c94 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 d8546122..d8546122 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 e5f33a02..e5f33a02 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 aa0f3f3a..aa0f3f3a 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 1f6b1373..1f6b1373 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 5c73a3b2..5c73a3b2 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 2c7639a1..2c7639a1 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 7bdcbed5..7bdcbed5 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 00f6dab8..00f6dab8 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 04a5aa85..04a5aa85 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 8dab3b7c..8dab3b7c 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 29a2ab0e..29a2ab0e 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 5640b8d5..5640b8d5 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 46a5f38d..46a5f38d 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 970a8650..970a8650 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 ee77bfc7..ee77bfc7 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 1f6b1373..1f6b1373 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 5c73a3b2..5c73a3b2 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 874a64bd..874a64bd 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 d9fcdfc6..d9fcdfc6 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 5802eca7..5802eca7 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 cf79b9a0..cf79b9a0 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 62b6a8ae..62b6a8ae 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 72d3f9c1..72d3f9c1 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 cd532d46..cd532d46 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 22620a6a..22620a6a 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 66396a02..66396a02 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 7a1e75d4..7a1e75d4 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 b9f4af55..b9f4af55 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 e124bf91..e124bf91 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 209df0d2..209df0d2 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 9afb21d0..9afb21d0 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 f9292a83..f9292a83 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 4f726a68..4f726a68 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 5c2cff56..5c2cff56 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 55d06a3a..55d06a3a 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 f08e53d1..f08e53d1 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 42669ace..42669ace 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 89bfe528..89bfe528 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 e69de29b..e69de29b 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 e17c0cc8..e17c0cc8 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 e4c1da79..e4c1da79 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 e627289b..e627289b 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 471a620b..471a620b 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 e6cf187f..e6cf187f 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 8e963f34..8e963f34 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 c7e6bc67..c7e6bc67 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 4fb7186b..4fb7186b 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 60b3d374..60b3d374 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 06d766af..06d766af 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 a426bdd7..a426bdd7 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 05d691df..05d691df 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 d9909fb0..d9909fb0 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 cee6bf67..cee6bf67 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 ae79f710..ae79f710 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 6c6238c6..6c6238c6 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 0d5ab12b..0d5ab12b 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 b2250c00..b2250c00 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 2e609e56..2e609e56 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 1b863555..1b863555 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 8be53908..8be53908 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 74d7a9c0..74d7a9c0 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 576ce307..576ce307 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 b206783b..b206783b 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 b095ae03..b095ae03 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 8699fe27..8699fe27 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 4ee6f8bf..4ee6f8bf 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 a39af6fa..a39af6fa 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 c0b2fc1b..c0b2fc1b 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 78dd08d1..78dd08d1 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 f66109ec..f66109ec 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 51c1c41e..51c1c41e 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 1da06688..1da06688 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 183a138a..183a138a 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 74d7a9c0..74d7a9c0 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 2b3c2f32..2b3c2f32 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 8c7bdd66..8c7bdd66 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 10672287..10672287 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 0f774dbc..0f774dbc 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 d56285c0..d56285c0 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 81b03182..81b03182 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 7311fd45..7311fd45 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 4e0a63be..4e0a63be 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 b31e3cf0..b31e3cf0 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 f5bc35ce..f5bc35ce 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 5f5b6bbe..5f5b6bbe 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 5c9d41b3..5c9d41b3 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 acaf5ffa..acaf5ffa 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 291d164c..291d164c 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 c412c14e..c412c14e 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 7d668562..7d668562 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 798dcc50..798dcc50 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 7f571c41..7f571c41 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 55b747b0..55b747b0 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 44521439..44521439 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 96ac744d..96ac744d 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 45724d0b..45724d0b 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 6cb67b1e..6cb67b1e 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 05e2f852..05e2f852 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 ad69f1ce..ad69f1ce 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 7eec7952..7eec7952 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 d295d9ed..d295d9ed 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 becefdf3..becefdf3 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 f77760a5..f77760a5 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 23b5b97f..23b5b97f 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 c2b470ad..c2b470ad 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 edb88127..edb88127 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 c782001c..c782001c 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 8cab0b14..8cab0b14 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 fd4e1e1c..fd4e1e1c 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 7f67e70c..7f67e70c 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 369b9dc7..369b9dc7 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 a6f5c17e..a6f5c17e 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 bf6d1404..bf6d1404 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 583af5c6..583af5c6 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 048592ed..048592ed 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 a85d4160..a85d4160 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 5606895a..5606895a 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 e86fcca0..e86fcca0 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 07c67363..07c67363 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 c4fb31d4..c4fb31d4 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 a2c87428..a2c87428 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 e4374380..e4374380 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 00745826..00745826 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 a5cd61dd..a5cd61dd 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 fcd5b43b..fcd5b43b 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 75ac5c5e..75ac5c5e 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 f9f53941..f9f53941 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 da9c32df..da9c32df 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 ffb303dd..ffb303dd 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 ffb29c4e..ffb29c4e 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 78dd08d1..78dd08d1 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 46ac46af..46ac46af 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 912c0389..912c0389 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 edfbe788..edfbe788 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 f66109ec..f66109ec 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 6611f8cc..6611f8cc 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 1da06688..1da06688 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 0b8dc0e3..0b8dc0e3 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 0d5ab12b..0d5ab12b 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 ac76c8ef..ac76c8ef 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 d2fb689c..d2fb689c 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 7e3ad1e5..7e3ad1e5 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 e197e1df..e197e1df 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 ec9e2afe..ec9e2afe 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 ee851ec0..ee851ec0 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 6e492990..6e492990 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 52cd40a8..52cd40a8 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 07527885..07527885 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 cc89f91b..cc89f91b 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 34371fda..34371fda 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 593e972b..593e972b 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 6e511f0a..6e511f0a 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 b5834c7e..b5834c7e 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 a90680bc..a90680bc 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 91444d41..91444d41 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 79ef0369..79ef0369 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 60146cc0..60146cc0 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 0d5ab12b..0d5ab12b 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 76f35b08..76f35b08 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 03727df9..03727df9 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 7e3ad1e5..7e3ad1e5 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 6754e285..6754e285 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 dc6f87de..dc6f87de 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 0816dc22..0816dc22 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 e7524e02..e7524e02 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 767ad463..767ad463 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 b66fad71..b66fad71 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 67614080..67614080 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 86ba0833..86ba0833 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 8aded827..8aded827 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 cc5e550b..cc5e550b 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 b1281e17..b1281e17 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 c44d2669..c44d2669 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 18f2c672..18f2c672 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 4af45fd9..4af45fd9 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 847a9290..847a9290 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 70a3e596..70a3e596 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 629bfa68..629bfa68 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 6492e2cf..6492e2cf 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 45bb2e66..45bb2e66 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 22634fb0..22634fb0 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 37075cd6..37075cd6 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 913d2d43..913d2d43 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 b4fe56f2..b4fe56f2 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 215e3bd0..215e3bd0 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 9e47e6a4..9e47e6a4 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 c6ca5e25..c6ca5e25 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 cc2f29c0..cc2f29c0 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 1017f046..1017f046 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 4afc5037..4afc5037 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 833d9dec..833d9dec 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 46845bc9..46845bc9 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 4afc4521..4afc4521 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 f2155e63..f2155e63 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 fc213354..fc213354 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 30b464a4..30b464a4 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 fd1e74f1..fd1e74f1 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 b6526bed..b6526bed 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 75bc195c..75bc195c 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 a445c68a..a445c68a 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 0b793a7a..0b793a7a 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 7f874587..7f874587 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 89959ba2..89959ba2 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 621779f5..621779f5 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 c50b9193..c50b9193 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 84e1c7de..84e1c7de 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 36948044..36948044 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 49c919e8..49c919e8 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 be45acb4..be45acb4 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 12fb1984..12fb1984 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 ce6804af..ce6804af 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 fbd97be5..fbd97be5 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 6bc32712..6bc32712 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 e37f5c02..e37f5c02 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 78326d32..78326d32 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 83ea7ab8..83ea7ab8 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 7a77d69d..7a77d69d 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 8b4d6cc7..8b4d6cc7 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 dae250b8..dae250b8 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 513b0f0d..513b0f0d 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 ed8899dd..ed8899dd 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 08cef457..08cef457 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 6c9c2453..6c9c2453 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 10741240..10741240 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 17c1d779..17c1d779 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 f0269f60..f0269f60 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 b0f8376d..b0f8376d 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 902248d0..902248d0 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 22373e1d..22373e1d 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 000063ef..000063ef 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 b3d96b7a..b3d96b7a 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 020a39a5..020a39a5 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 b41e9f29..b41e9f29 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 8860179d..8860179d 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 20bddac3..20bddac3 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 ba667129..ba667129 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 a37180fd..a37180fd 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 eaa2abde..eaa2abde 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 5a16948c..5a16948c 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 5ed6c3f7..5ed6c3f7 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 5a5d8a3d..5a5d8a3d 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 b2c3e864..b2c3e864 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 c63bd30a..c63bd30a 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 4964a05f..4964a05f 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 da5f6d65..da5f6d65 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 c72a45d3..c72a45d3 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 2309cf2e..2309cf2e 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 26b2cb1b..26b2cb1b 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 cd4b5b9d..cd4b5b9d 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 e47d3c21..e47d3c21 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 aea1c567..aea1c567 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 32bba5cc..32bba5cc 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 72de6f33..72de6f33 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 729ca0d7..729ca0d7 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 00000000..34ae4ea7
--- /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 ded3be4c..174b7526 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