Merge pull request #7 from BuzzVerse/feature/nanopb-integration

refactor: Improve Nanopb protobuf build configuration and include paths
BuzzVerse · Jan 30, 2025 · 8918eca · 8918eca
2 parents d990240 + 0502f78
commit 8918eca
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -19,9 +19,11 @@ source ~/zephyrproject/.venv/bin/activate
 
 west init -m https://github.com/BuzzVerse/buzznode --mr main buzznode
 cd buzznode
-west update
+
+west config manifest.project-filter -- +nanopb
 west blobs fetch hal_espressif
 west blobs fetch hal_stm32
+west update
 ```
 
 ### Registering a device

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -17,15 +17,32 @@ endif()
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(buzznode)
 
+# Nanopb setup
 list(APPEND CMAKE_MODULE_PATH ${ZEPHYR_BASE}/modules/nanopb)
 include(nanopb)
 
-# Find all proto files
-file(GLOB_RECURSE proto_files protobufs/*.proto)
+# Set proto path for imports
+set(PROTO_PATH ${CMAKE_CURRENT_SOURCE_DIR}/protobufs)
+
+# Generate protobuf files
+file(GLOB_RECURSE proto_files protobufs/buzzverse/*.proto)
 foreach(proto_file ${proto_files})
-    zephyr_nanopb_sources(app ${proto_file})
+    get_filename_component(proto_name ${proto_file} NAME_WE)
+    nanopb_generate_cpp(PROTO_SRCS PROTO_HDRS ${proto_file}
+        RELPATH ${PROTO_PATH}
+    )
+    list(APPEND proto_sources ${PROTO_SRCS})
 endforeach()
 
+# Create a separate library for proto files
+zephyr_library_named(proto)
+target_sources(proto PRIVATE ${proto_sources})
+target_include_directories(proto PUBLIC 
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}/protobufs
+)
+
+# Add application sources
 file(GLOB_RECURSE app_sources src/*.cpp)
 target_sources(app PRIVATE ${app_sources})
 
@@ -36,4 +53,4 @@ set_target_properties(app PROPERTIES
     CXX_EXTENSIONS OFF
 )
 
-target_link_libraries(app PRIVATE etl::etl)
+target_link_libraries(app PRIVATE proto etl::etl)
diff --git a/app/protobufs b/app/protobufs
diff --git a/app/src/main.cpp b/app/src/main.cpp
@@ -7,8 +7,8 @@
 
 #include "bme280.hpp"
 #include "lorawan_handler.hpp"
-#include "protobufs/buzzverse/bme280.pb.h"
-#include "protobufs/buzzverse/packet.pb.h"
+#include "buzzverse/bme280.pb.h"
+#include "buzzverse/packet.pb.h"
 #include "utils/packet_handler.hpp"
 
 LOG_MODULE_REGISTER(main, LOG_LEVEL_DBG);

diff --git a/app/src/utils/packet_handler.hpp b/app/src/utils/packet_handler.hpp
@@ -3,7 +3,7 @@
 #include <pb_decode.h>
 #include <pb_encode.h>
 
-#include "protobufs/buzzverse/packet.pb.h"
+#include "buzzverse/packet.pb.h"
 
 class PacketHandler {
  public:
+2 −1		buzzverse/bme280.proto
+13 −0		buzzverse/bq27441.proto
+5 −2		buzzverse/packet.proto