From 6419d106ef1aa4c4ca47ca0f64aa7aa4bf4c829b Mon Sep 17 00:00:00 2001
From: Zoe Pfister <zoe.pfister@student.uibk.ac.at>
Date: Fri, 2 Sep 2022 16:43:44 +0200
Subject: [PATCH] add build_message to ForteSensor.hpp, minor changes according
to clion
---
.../client/include/{forte_sensor.hpp => ForteSensor.hpp} | 4 ++--
client/client/lib/dr26_analogue/src/dr26.hpp | 8 ++++----
client/client/lib/drs26_digital/drs26.hpp | 8 ++++----
client/client/lib/espnow/src/Message.cpp | 6 +++++-
client/client/lib/espnow/src/Message.hpp | 3 ++-
client/client/lib/ina219/ina219.hpp | 8 ++++----
client/client/lib/scd30/scd30.hpp | 8 ++++----
client/client/platformio.ini | 1 +
client/client/src/main.cpp | 2 +-
9 files changed, 27 insertions(+), 21 deletions(-)
rename client/client/include/{forte_sensor.hpp => ForteSensor.hpp} (71%)
diff --git a/client/client/include/forte_sensor.hpp b/client/client/include/ForteSensor.hpp
similarity index 71%
rename from client/client/include/forte_sensor.hpp
rename to client/client/include/ForteSensor.hpp
index 36c4e75..d322213 100644
--- a/client/client/include/forte_sensor.hpp
+++ b/client/client/include/ForteSensor.hpp
@@ -1,13 +1,13 @@
#ifndef _FORTE_SENSOR
#define _FORTE_SENSOR
-// #include "Message.hpp"
+#include "Message.hpp"
template <class T>
class Forte_Sensor {
public:
virtual T read_data() = 0;
virtual void setup() = 0;
- // virtual Message build_message() = 0;
+ virtual Message build_message() = 0;
private:
};
diff --git a/client/client/lib/dr26_analogue/src/dr26.hpp b/client/client/lib/dr26_analogue/src/dr26.hpp
index 6105c29..dcc3089 100644
--- a/client/client/lib/dr26_analogue/src/dr26.hpp
+++ b/client/client/lib/dr26_analogue/src/dr26.hpp
@@ -1,18 +1,18 @@
#ifndef _DR26
#define _DR26
+#include "ForteSensor.hpp"
#include "Message.hpp"
-#include "forte_sensor.hpp"
#include "pinout.hpp"
#include <Adafruit_ADS1X15.h>
#include <Wire.h>
class Forte_DR26 : public Forte_Sensor<float> {
public:
- void setup();
- float read_data();
+ void setup() override;
+ float read_data() override;
void change_Gain(adsGain_t gain);
- Message build_message();
+ Message build_message() override;
private:
};
diff --git a/client/client/lib/drs26_digital/drs26.hpp b/client/client/lib/drs26_digital/drs26.hpp
index 1c5116d..9214112 100644
--- a/client/client/lib/drs26_digital/drs26.hpp
+++ b/client/client/lib/drs26_digital/drs26.hpp
@@ -1,9 +1,9 @@
#ifndef _DRS26
#define _DRS26
+#include "ForteSensor.hpp"
#include "Message.hpp"
#include "Wire.h"
-#include "forte_sensor.hpp"
#include "pinout.hpp"
#include <SDI12.h>
@@ -15,9 +15,9 @@ struct out_data_drs26 {
class Forte_DRS26 : public Forte_Sensor<out_data_drs26> {
public:
- void setup();
- out_data_drs26 read_data();
- Message build_message();
+ void setup() override;
+ out_data_drs26 read_data() override;
+ Message build_message() override;
private:
SDI12 drs26;
diff --git a/client/client/lib/espnow/src/Message.cpp b/client/client/lib/espnow/src/Message.cpp
index c4bfb3f..382f2a7 100644
--- a/client/client/lib/espnow/src/Message.cpp
+++ b/client/client/lib/espnow/src/Message.cpp
@@ -44,4 +44,8 @@ Message ::Message(ClientDataPackage old_data)
data = old_data;
// memcpy(&data, &old_data, sizeof(data));
get_host_mac(recipient);
-}
\ No newline at end of file
+}
+ClientDataPackage Message::getData()
+{
+ return data;
+}
diff --git a/client/client/lib/espnow/src/Message.hpp b/client/client/lib/espnow/src/Message.hpp
index ee00f7f..cc3dfa3 100644
--- a/client/client/lib/espnow/src/Message.hpp
+++ b/client/client/lib/espnow/src/Message.hpp
@@ -12,9 +12,10 @@
class Message {
public:
Message();
- Message(ClientDataPackage old_data);
+ explicit Message(ClientDataPackage old_data);
void add_data(float value, int identifier);
esp_err_t send();
+ ClientDataPackage getData();
private:
ClientDataPackage data;
diff --git a/client/client/lib/ina219/ina219.hpp b/client/client/lib/ina219/ina219.hpp
index cd964cc..26d3f6e 100644
--- a/client/client/lib/ina219/ina219.hpp
+++ b/client/client/lib/ina219/ina219.hpp
@@ -1,9 +1,9 @@
#ifndef _INA219
#define _INA219
+#include "ForteSensor.hpp"
#include "Message.hpp"
#include "Wire.h"
-#include "forte_sensor.hpp"
#include "pinout.hpp"
#include <INA219_WE.h>
@@ -18,9 +18,9 @@ struct out_data_ina219 {
class Forte_INA219 : public Forte_Sensor<out_data_ina219> {
public:
- void setup();
- out_data_ina219 read_data();
- Message build_message();
+ void setup() override;
+ out_data_ina219 read_data() override;
+ Message build_message() override;
private:
INA219_WE ina219;
diff --git a/client/client/lib/scd30/scd30.hpp b/client/client/lib/scd30/scd30.hpp
index c3bf697..7414704 100644
--- a/client/client/lib/scd30/scd30.hpp
+++ b/client/client/lib/scd30/scd30.hpp
@@ -1,9 +1,9 @@
#ifndef _SCD30
#define _SCD30
+#include "ForteSensor.hpp"
#include "Message.hpp"
#include "NoDataAvailableException.hpp"
-#include "forte_sensor.hpp"
#include "pinout.hpp"
#include <SparkFun_SCD30_Arduino_Library.h>
#include <Wire.h>
@@ -16,9 +16,9 @@ struct out_data_scd30 {
class Forte_SCD30 : public Forte_Sensor<out_data_scd30> {
public:
- void setup();
- out_data_scd30 read_data();
- Message build_message();
+ void setup() override;
+ out_data_scd30 read_data() override;
+ Message build_message() override;
private:
SCD30 airSensor;
diff --git a/client/client/platformio.ini b/client/client/platformio.ini
index 08a880b..31c0f4c 100644
--- a/client/client/platformio.ini
+++ b/client/client/platformio.ini
@@ -24,3 +24,4 @@ lib_deps =
Adafruit_I2CDevice
SPI
envirodiy/SDI-12@^2.1.4
+ fbiego/ESP32Time@^2.0.0
diff --git a/client/client/src/main.cpp b/client/client/src/main.cpp
index a9cdb27..9106c96 100644
--- a/client/client/src/main.cpp
+++ b/client/client/src/main.cpp
@@ -15,7 +15,7 @@ void setup()
void loop()
{
- out_data_drs26 data;
+ out_data_drs26 data{};
try {
data = drs26.read_data();
--
GitLab