From 6b731d30ceaa7e895196baf0f2ed3a8ab8f69418 Mon Sep 17 00:00:00 2001
From: Zoe Pfister <zoe.pfister@student.uibk.ac.at>
Date: Wed, 7 Sep 2022 16:03:37 +0200
Subject: [PATCH] move log includes to header files, init espnow to fix runtime
errors, specify log level to VERBOSE
---
client/client/lib/caching/src/ram_caching.cpp | 1 -
client/client/lib/caching/src/ram_caching.hpp | 1 +
client/client/lib/dr26_analogue/src/dr26.cpp | 1 -
client/client/lib/dr26_analogue/src/dr26.hpp | 1 +
client/client/lib/drs26_digital/drs26.cpp | 8 +++---
client/client/lib/drs26_digital/drs26.hpp | 1 +
client/client/lib/espnow/src/ESPNow.cpp | 1 -
client/client/lib/espnow/src/ESPNow.hpp | 1 +
client/client/lib/espnow/src/Message.cpp | 11 ++++----
client/client/lib/espnow/src/Message.hpp | 1 +
client/client/lib/ina219/ina219.cpp | 1 -
client/client/lib/ina219/ina219.hpp | 1 +
client/client/lib/scd30/scd30.cpp | 1 -
client/client/lib/scd30/scd30.hpp | 1 +
client/client/platformio.ini | 27 ++++++++++---------
client/client/src/main.cpp | 26 +++++++++---------
16 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/client/client/lib/caching/src/ram_caching.cpp b/client/client/lib/caching/src/ram_caching.cpp
index bb3b71a..f5ebd71 100644
--- a/client/client/lib/caching/src/ram_caching.cpp
+++ b/client/client/lib/caching/src/ram_caching.cpp
@@ -1,7 +1,6 @@
#include "ram_caching.hpp"
static const char* TAG = "CACHING";
-#include "esp_log.h"
RTC_DATA_ATTR int cachedAmount = -1;
RTC_DATA_ATTR ClientDataPackage backup[NUM_SENSORS];
diff --git a/client/client/lib/caching/src/ram_caching.hpp b/client/client/lib/caching/src/ram_caching.hpp
index 466668b..3ade962 100644
--- a/client/client/lib/caching/src/ram_caching.hpp
+++ b/client/client/lib/caching/src/ram_caching.hpp
@@ -1,6 +1,7 @@
#ifndef _RAM_CACHE
#define _RAM_CACHE
#include "ClientDataPackage.hpp"
+#include "esp_log.h"
#include <ESP32Time.h>
bool ram_cache_is_empty();
diff --git a/client/client/lib/dr26_analogue/src/dr26.cpp b/client/client/lib/dr26_analogue/src/dr26.cpp
index 755dd5a..c2cec29 100644
--- a/client/client/lib/dr26_analogue/src/dr26.cpp
+++ b/client/client/lib/dr26_analogue/src/dr26.cpp
@@ -1,7 +1,6 @@
#include "dr26.hpp"
static const char* TAG = "DR26";
-#include "esp_log.h"
Adafruit_ADS1115 ads;
diff --git a/client/client/lib/dr26_analogue/src/dr26.hpp b/client/client/lib/dr26_analogue/src/dr26.hpp
index dcc3089..b06c420 100644
--- a/client/client/lib/dr26_analogue/src/dr26.hpp
+++ b/client/client/lib/dr26_analogue/src/dr26.hpp
@@ -3,6 +3,7 @@
#include "ForteSensor.hpp"
#include "Message.hpp"
+#include "esp_log.h"
#include "pinout.hpp"
#include <Adafruit_ADS1X15.h>
#include <Wire.h>
diff --git a/client/client/lib/drs26_digital/drs26.cpp b/client/client/lib/drs26_digital/drs26.cpp
index e6dbd6b..f6f97ca 100644
--- a/client/client/lib/drs26_digital/drs26.cpp
+++ b/client/client/lib/drs26_digital/drs26.cpp
@@ -1,7 +1,6 @@
#include <drs26.hpp>
static const char* TAG = "DRS26";
-#include "esp_log.h"
/*
It happens for some reason that the sensor cant get reached every 2 time
Because the sensor use sdi12 protocoll we have to wait aproxemettly 1 secound between the commands
@@ -45,7 +44,8 @@ out_data_drs26 Forte_DRS26 ::read_data()
Message Forte_DRS26 ::build_message()
{
- // auto message = Message();
- // message.add_data(data.circumference, data.id);
- throw "Not yet implemented";
+ auto message = Message();
+ message.add_data(12.12, 1);
+ ESP_LOGE(TAG, "test");
+ return message;
}
\ No newline at end of file
diff --git a/client/client/lib/drs26_digital/drs26.hpp b/client/client/lib/drs26_digital/drs26.hpp
index 9214112..6a64da5 100644
--- a/client/client/lib/drs26_digital/drs26.hpp
+++ b/client/client/lib/drs26_digital/drs26.hpp
@@ -4,6 +4,7 @@
#include "ForteSensor.hpp"
#include "Message.hpp"
#include "Wire.h"
+#include "esp_log.h"
#include "pinout.hpp"
#include <SDI12.h>
diff --git a/client/client/lib/espnow/src/ESPNow.cpp b/client/client/lib/espnow/src/ESPNow.cpp
index 8f27c80..8d7eb36 100644
--- a/client/client/lib/espnow/src/ESPNow.cpp
+++ b/client/client/lib/espnow/src/ESPNow.cpp
@@ -1,7 +1,6 @@
#include "ESPNow.hpp"
static const char* TAG = "ESPNOW";
-#include "esp_log.h"
uint8_t BROADCAST_MAC[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
esp_now_peer_info_t hostInfo;
diff --git a/client/client/lib/espnow/src/ESPNow.hpp b/client/client/lib/espnow/src/ESPNow.hpp
index 1230290..7f6feb7 100644
--- a/client/client/lib/espnow/src/ESPNow.hpp
+++ b/client/client/lib/espnow/src/ESPNow.hpp
@@ -3,6 +3,7 @@
#include "Message.hpp"
#include "Time.hpp"
+#include "esp_log.h"
#include "ram_caching.hpp"
#include <ClientDataPackage.hpp>
#include <ESP32Time.h>
diff --git a/client/client/lib/espnow/src/Message.cpp b/client/client/lib/espnow/src/Message.cpp
index 5d58b42..447242c 100644
--- a/client/client/lib/espnow/src/Message.cpp
+++ b/client/client/lib/espnow/src/Message.cpp
@@ -1,7 +1,6 @@
#include "Message.hpp"
-static const char* TAG = "MESSAGE";
-#include "esp_log.h"
+static const char *TAG = "MESSAGE";
void Message::add_data(float value, int identifier)
{
@@ -23,12 +22,12 @@ esp_err_t Message::send()
// }
// }
for (int i = 0; i < data.amountData; i++) {
- Serial.println(data.values[i]);
+ ESP_LOGD(TAG, "Sent data: %i", data.values[i]);
}
- ESP_LOGD(TAG, "time sent: " + data.timestamp);
- ESP_LOGD(TAG, "send status: " + success);
-
+ ESP_LOGD(TAG, "time sent: %l", data.timestamp);
+ ESP_LOGD(TAG, "send status: %d", success);
+
return success;
}
diff --git a/client/client/lib/espnow/src/Message.hpp b/client/client/lib/espnow/src/Message.hpp
index cc3dfa3..101f754 100644
--- a/client/client/lib/espnow/src/Message.hpp
+++ b/client/client/lib/espnow/src/Message.hpp
@@ -3,6 +3,7 @@
#include "ClientDataPackage.hpp"
#include "ESPNow.hpp"
#include "Time.hpp"
+#include "esp_log.h"
#include <Arduino.h>
#include <ESP32Time.h>
#include <esp_now.h>
diff --git a/client/client/lib/ina219/ina219.cpp b/client/client/lib/ina219/ina219.cpp
index c0427eb..7c9360c 100644
--- a/client/client/lib/ina219/ina219.cpp
+++ b/client/client/lib/ina219/ina219.cpp
@@ -1,7 +1,6 @@
#include "ina219.hpp"
static const char* TAG = "INA219";
-#include "esp_log.h"
void Forte_INA219 ::setup()
{
diff --git a/client/client/lib/ina219/ina219.hpp b/client/client/lib/ina219/ina219.hpp
index 26d3f6e..64e8728 100644
--- a/client/client/lib/ina219/ina219.hpp
+++ b/client/client/lib/ina219/ina219.hpp
@@ -4,6 +4,7 @@
#include "ForteSensor.hpp"
#include "Message.hpp"
#include "Wire.h"
+#include "esp_log.h"
#include "pinout.hpp"
#include <INA219_WE.h>
diff --git a/client/client/lib/scd30/scd30.cpp b/client/client/lib/scd30/scd30.cpp
index b93a2b1..0ad4f2c 100644
--- a/client/client/lib/scd30/scd30.cpp
+++ b/client/client/lib/scd30/scd30.cpp
@@ -1,7 +1,6 @@
#include "scd30.hpp"
static const char* TAG = "SCD30";
-#include "esp_log.h"
void Forte_SCD30 ::setup()
{
diff --git a/client/client/lib/scd30/scd30.hpp b/client/client/lib/scd30/scd30.hpp
index 7414704..dcd05a4 100644
--- a/client/client/lib/scd30/scd30.hpp
+++ b/client/client/lib/scd30/scd30.hpp
@@ -4,6 +4,7 @@
#include "ForteSensor.hpp"
#include "Message.hpp"
#include "NoDataAvailableException.hpp"
+#include "esp_log.h"
#include "pinout.hpp"
#include <SparkFun_SCD30_Arduino_Library.h>
#include <Wire.h>
diff --git a/client/client/platformio.ini b/client/client/platformio.ini
index 31c0f4c..8b0ba57 100644
--- a/client/client/platformio.ini
+++ b/client/client/platformio.ini
@@ -12,16 +12,17 @@
platform = espressif32
board = esp32-c3-devkitm-1
framework = arduino
-monitor_speed = 9600
-build_flags =
- -I include
-lib_deps =
- sparkfun/SparkFun SCD30 Arduino Library@^1.0.18
- Wire
- adafruit/Adafruit ADS1X15@^2.4.0
- wollewald/INA219_WE@^1.3.1
- adafruit/Adafruit BusIO@^1.13.2
- Adafruit_I2CDevice
- SPI
- envirodiy/SDI-12@^2.1.4
- fbiego/ESP32Time@^2.0.0
+monitor_speed = 115200
+build_flags =
+ -I include
+ -DCORE_DEBUG_LEVEL=5
+lib_deps =
+ sparkfun/SparkFun SCD30 Arduino Library@^1.0.18
+ Wire
+ adafruit/Adafruit ADS1X15@^2.4.0
+ wollewald/INA219_WE@^1.3.1
+ adafruit/Adafruit BusIO@^1.13.2
+ 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 65e8729..266c4c7 100644
--- a/client/client/src/main.cpp
+++ b/client/client/src/main.cpp
@@ -1,19 +1,20 @@
+#include "NoDataAvailableException.hpp"
+#include "esp_log.h"
#include <Arduino.h>
#include <dr26.hpp>
#include <drs26.hpp>
#include <ina219.hpp>
#include <scd30.hpp>
-
-static const char* TAG = "MAIN";
-#include "esp_log.h"
+// #include "esp32-hal-log.h"
+static const char *TAG = "MAIN";
Forte_DRS26 drs26;
void setup()
{
- Serial.begin(9600);
+ Serial.begin(115200);
drs26.setup();
- ESP_LOGI(TAG, "Setup complete.");
+ // log_e("Setup complete.");
}
void loop()
@@ -22,16 +23,17 @@ void loop()
out_data_drs26 data{};
try {
- data = drs26.read_data();
- // auto message = scd30.build_message();
- // message.send();
+ espnow_setup();
+ // data = drs26.read_data();
+ auto message = drs26.build_message();
+ message.send();
} catch (const NoDataAvailableException &e) {
std::cerr << e.what() << '\n';
}
-
- ESP_LOGI(TAG, "Sensor Circumference: " + data.circumference);
- ESP_LOGI(TAG, "Temperature: " + data.temperatur);
- ESP_LOGI(TAG, "Id: " + data.id);
+
+ ESP_LOGE(TAG, "Sensor Circumference: ");
+ // log_e("Temperature: ");
+ // log_e("Id: ");
delay(5000);
}
--
GitLab