Merge branch 'main' into feat/NODEZ-43-sensors-api

BuzzVerse · Jan 31, 2025 · d1a653f · d1a653f
2 parents d1e654b + 8918eca
commit d1a653f
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 12 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})
 
@@ -43,4 +60,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
@@ -2,9 +2,9 @@
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 
+#include "buzzverse/bme280.pb.h"
+#include "buzzverse/packet.pb.h"
 #include "peripherals/lorawan_handler/lorawan_handler.hpp"
-#include "protobufs/buzzverse/bme280.pb.h"
-#include "protobufs/buzzverse/packet.pb.h"
 #include "sensors/bme280/bme280.hpp"
 #include "utils/packet_handler.hpp"
 

diff --git a/app/src/peripherals/lorawan_handler/lorawan_handler.hpp b/app/src/peripherals/lorawan_handler/lorawan_handler.hpp
@@ -4,8 +4,8 @@
 #include <etl/array.h>
 #include <etl/string.h>
 
+#include "buzzverse/packet.pb.h"
 #include "peripheral.hpp"
-#include "protobufs/buzzverse/packet.pb.h"
 
 class LoRaWANHandler : public Peripheral {
  public:

diff --git a/app/src/sensors/bme280/bme280.cpp b/app/src/sensors/bme280/bme280.cpp
@@ -3,7 +3,7 @@
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/logging/log.h>
 
-#include "protobufs/buzzverse/bme280.pb.h"
+#include "buzzverse/bme280.pb.h"
 
 LOG_MODULE_REGISTER(bme280, LOG_LEVEL_DBG);
 

diff --git a/app/src/sensors/bme280/bme280.hpp b/app/src/sensors/bme280/bme280.hpp
@@ -4,7 +4,7 @@
 #include <etl/string.h>
 #include <zephyr/device.h>
 
-#include "protobufs/buzzverse/bme280.pb.h"
+#include "buzzverse/bme280.pb.h"
 #include "sensor.hpp"
 
 class BME280 : public Sensor<buzzverse_v1_BME280Data> {

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