feat(pir): added motion sensor implementation

Author: Bondpl

app/Kconfig

@@ -87,6 +87,12 @@ config ENABLE_ANALOG
     help
         Enable support for Analog sensor.
 
+config ENABLE_MOTION_SENSOR
+    bool "Enable Motion Sensor"
+    default n
+    help
+        Enable support for Motion sensor.
+
 source "Kconfig.zephyr"
 endmenu
 

app/boards/nucleo_wl55jc.overlay

@@ -8,6 +8,7 @@
     zephyr,user {
         io-channels = <&adc1 6>;
         io-channels-names = "a0";
+        motion-gpios = <&gpiob 12 GPIO_ACTIVE_HIGH>;
     };
 };
 

app/prj.conf

@@ -14,6 +14,7 @@ CONFIG_I2C=y
 CONFIG_GPIO=y
 CONFIG_SPI=y
 
+CONFIG_BQ274XX=y
 CONFIG_BQ274XX_PM=y
 
 CONFIG_PM_DEVICE=y
@@ -46,7 +47,7 @@ CONFIG_SETTINGS_RUNTIME=y
 CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 
-CONFIG_BOOTLOADER_MCUBOOT=y
+CONFIG_BOOTLOADER_MCUBOOT=n
 
 # ADC config
 CONFIG_ADC=y

app/src/Application.hpp

@@ -5,16 +5,22 @@
 #include "sensor.hpp"
 
 // Number of supported sensor types used in the sensors array
-#define BASE_SENSOR_COUNT 1
+#define BASE_SENSOR_COUNT 0
 
 #ifdef CONFIG_ENABLE_ANALOG
     #define ANALOG_SENSOR_COUNT 1 // Analog sensor is enabled
 #else
     #define ANALOG_SENSOR_COUNT 0 // Analog sensor is disabled
 #endif
 
+#ifdef CONFIG_ENABLE_MOTION_SENSOR
+    #define MOTION_SENSOR_COUNT 1 // Motion sensor is enabled
+#else
+    #define MOTION_SENSOR_COUNT 0 // Motion sensor is disabled
+#endif
+
 // The final fixed size is calculated by the preprocessor
-#define NUMBER_OF_SENSORS (BASE_SENSOR_COUNT + ANALOG_SENSOR_COUNT)
+#define NUMBER_OF_SENSORS (BASE_SENSOR_COUNT + ANALOG_SENSOR_COUNT + MOTION_SENSOR_COUNT)
 
 class LoRaWANHandler;
 class SleepManager;

app/src/main.cpp

@@ -10,6 +10,7 @@
 #include "sensors/bme280/bme280.hpp"
 #include "sensors/analog/analog.hpp"
 #include "sensors/bq27441/bq27441.hpp"
+#include "sensors/motion_sensor/pir.hpp"
 #include "utils/banner.hpp"
 #include "utils/sleep-manager.hpp"
 
@@ -21,22 +22,37 @@ LOG_MODULE_REGISTER(main_entry, LOG_LEVEL_DBG);
   #define APP_SLEEP_DURATION_MS 10000
 #endif
 
+#ifdef CONFIG_ENABLE_ANALOG
 static const struct adc_dt_spec soil_sensor_adc_spec =
     ADC_DT_SPEC_GET_BY_IDX(DT_PATH(zephyr_user), 0);
+#endif
+
+#ifdef CONFIG_ENABLE_MOTION_SENSOR
+static const struct gpio_dt_spec motion_sensor_gpio_spec =
+    GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), motion_gpios);
+#endif
 
 
 int main(void) {
   printk("%s\n", APP_ASCII_BANNER);
   LOG_INF("===== Buzzverse Node System Booting (Zephyr Log) =====");
 
-  BME280 bme280(DEVICE_DT_GET_ANY(bosch_bme280));
+  //BME280 bme280(DEVICE_DT_GET_ANY(bosch_bme280));
+#ifdef CONFIG_ENABLE_ANALOG
   Analog analog(&soil_sensor_adc_spec);
+#endif
+#ifdef CONFIG_ENABLE_MOTION_SENSOR
+  MotionSensor motion_sensor(&motion_sensor_gpio_spec);
+#endif
 
   // Array of available sensors
   etl::array<etl::unique_ptr<Sensor>, NUMBER_OF_SENSORS> sensors {
-	etl::unique_ptr<BME280>(etl::move(&bme280)),
+	//etl::unique_ptr<BME280>(etl::move(&bme280)),
 #ifdef CONFIG_ENABLE_ANALOG
   etl::unique_ptr<Analog>(etl::move(&analog)),
+#endif
+#ifdef CONFIG_ENABLE_MOTION_SENSOR
+  etl::unique_ptr<MotionSensor>(etl::move(&motion_sensor)),
 #endif
   };
 

app/src/sensors/motion_sensor/pir.cpp

@@ -0,0 +1,64 @@
+#include "pir.hpp"
+
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
+
+#include "buzzverse/motion_sensor.pb.h"
+
+LOG_MODULE_REGISTER(MotionSensor, LOG_LEVEL_DBG);
+
+MotionSensor::MotionSensor(const struct gpio_dt_spec* gpio_spec)
+    : m_gpio_spec(gpio_spec) {}
+
+using Status = Sensor::Status;
+
+Peripheral::Status MotionSensor::init() {
+    if (!m_gpio_spec || !device_is_ready(m_gpio_spec->port)) {
+        status = buzzverse_v1_Status_ComponentState_INITIALIZATION_FAILED;
+        LOG_WRN("MotionSensor: GPIO device not ready or spec invalid");
+        return Peripheral::Status::NOT_READY;
+    }
+
+    int ret = gpio_pin_configure_dt(m_gpio_spec, GPIO_INPUT);
+    if (ret != 0) {
+        LOG_ERR("MotionSensor: Failed to configure GPIO pin %d (err %d)", m_gpio_spec->pin, ret);
+        status = buzzverse_v1_Status_ComponentState_INITIALIZATION_FAILED;
+        return Peripheral::Status::INIT_ERR;
+    }
+
+    LOG_INF("MotionSensor: GPIO ready on pin %d", m_gpio_spec->pin);
+    status = buzzverse_v1_Status_ComponentState_NORMAL;
+    ready = true;
+    return Peripheral::Status::OK;
+}
+
+Status MotionSensor::read_data(buzzverse_v1_MotionSensorData& data) const {
+    int val = gpio_pin_get_dt(m_gpio_spec);
+    if (val < 0) {
+        LOG_ERR("MotionSensor: GPIO read failed: %d", val);
+        return Status::READ_ERR;
+    }
+
+    data.motion_detected = (val > 0);
+
+    LOG_DBG("MotionSensor: GPIO raw: %d, motion detected: %d", val, data.motion_detected);
+    return Status::OK;
+}
+
+Status MotionSensor::get_packet(buzzverse_v1_Packet& packet) const {
+    buzzverse_v1_MotionSensorData motion_data = buzzverse_v1_MotionSensorData_init_zero;
+
+    if (read_data(motion_data) != Sensor::Status::OK) {
+        return Status::READ_ERR;
+    }
+
+    packet = buzzverse_v1_Packet_init_default;
+    packet.which_data = buzzverse_v1_Packet_motion_sensor_tag;
+    packet.data.motion_sensor = motion_data;
+    LOG_DBG("Packet constructed with motion sensor data.");
+    return Status::OK;
+}
+
+void MotionSensor::get_status(buzzverse_v1_Status& status_message) const {
+    status_message.motion_status = status;
+}

app/src/sensors/motion_sensor/pir.hpp

@@ -0,0 +1,44 @@
+#ifndef PIR_HPP
+#define PIR_HPP
+
+#include <etl/string.h>
+#include <zephyr/drivers/gpio.h>
+
+#include "buzzverse/motion_sensor.pb.h"
+#include "sensors/sensor.hpp"
+
+class MotionSensor : public Sensor {
+ public:
+  explicit MotionSensor(const struct gpio_dt_spec* gpio_spec);
+
+  Peripheral::Status init() override;
+
+  bool is_ready() const override {
+    return ready;
+  }
+
+  etl::string<PERIPHERAL_NAME_SIZE> get_name() const override {
+    return "MotionSensor";
+  }
+
+  Status get_packet(buzzverse_v1_Packet& packet) const override;
+
+  void get_status(buzzverse_v1_Status& status_message) const override;
+
+ private:
+  const struct gpio_dt_spec* m_gpio_spec;
+  bool ready{false};
+  buzzverse_v1_Status_ComponentState status{buzzverse_v1_Status_ComponentState_STATE_UNSPECIFIED};
+
+  /**
+   * @brief Read data from the sensor
+   *
+   * @param data MotionSensor data structure to populate
+   * @return Status
+   * @retval OK if the data is successfully read
+   * @retval READ_ERR if the sensor read fails
+   */
+  Status read_data(buzzverse_v1_MotionSensorData& data) const;
+};
+
+#endif  // PIR_HPP