mirror
/
MeshCore
mirror of https://github.com/meshcore-dev/MeshCore
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Remove sensor wrapper classes and simplify. Switch to Adafruit libs for sensors.

pull/305/head
Normunds Gavars 1 year ago
parent
5d9e7b4567
commit
98d94d9423
6 changed files with 97 additions and 241 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      src/helpers/sensors/AHTX0Sensor.h
  2. 55
      src/helpers/sensors/BME280Sensor.h
  3. 118
      src/helpers/sensors/EnvironmentSensorManager.cpp
  4. 40
      src/helpers/sensors/EnvironmentSensorManager.h
  5. 71
      src/helpers/sensors/INA3221Sensor.h
  6. 15
      variants/promicro/platformio.ini

39
src/helpers/sensors/AHTX0Sensor.h
View File

@ -1,39 +0,0 @@
#pragma once
#include <Mesh.h>
#include <Adafruit_AHTX0.h>
#define TELEM_AHTX_ADDRESS 0x38 // AHT10, AHT20 temperature and humidity sensor I2C address
static Adafruit_AHTX0 AHTX0;
class AHTX0Sensor {
bool initialized = false;
public:
void begin() {
if (AHTX0.begin(&Wire, 0, TELEM_AHTX_ADDRESS)) {
MESH_DEBUG_PRINTLN("Found AHT10/AHT20 at address: %02X", TELEM_AHTX_ADDRESS);
initialized = true;
} else {
initialized = false;
MESH_DEBUG_PRINTLN("AHT10/AHT20 was not found at I2C address %02X", TELEM_AHTX_ADDRESS);
}
}
bool isInitialized() const { return initialized; };
float getRelativeHumidity() const {
if (initialized) {
sensors_event_t humidity, temp;
AHTX0.getEvent(&humidity, &temp);
return humidity.relative_humidity;
}
}
float getTemperature() const {
if (initialized) {
sensors_event_t humidity, temp;
AHTX0.getEvent(&humidity, &temp);
return temp.temperature;
}
}
};

55
src/helpers/sensors/BME280Sensor.h
View File

@ -1,55 +0,0 @@
#pragma once
#include <Mesh.h>
#include <Adafruit_BME280.h>
#define TELEM_BME280_ADDRESS 0x76 // BME280 environmental sensor I2C address
#define SEALEVELPRESSURE_HPA (1013.25) // Athmospheric pressure at sea level
static Adafruit_BME280 BME280;
class BME280Sensor {
bool initialized = false;
public:
void begin() {
if (BME280.begin(TELEM_BME280_ADDRESS, &Wire)) {
MESH_DEBUG_PRINTLN("Found BME280 at address: %02X", TELEM_BME280_ADDRESS);
MESH_DEBUG_PRINTLN("BME sensor ID: %02X", BME280.sensorID);
initialized = true;
} else {
initialized = false;
MESH_DEBUG_PRINTLN("BME280 was not found at I2C address %02X", TELEM_BME280_ADDRESS);
}
}
bool isInitialized() const { return initialized; };
float getRelativeHumidity() const {
if (initialized) {
return BME280.readHumidity();;
}
}
float getTemperature() const {
if (initialized) {
return BME280.readTemperature();;
}
}
float getBarometricPressure() const {
if (initialized) {
return BME280.readPressure();
}
}
float getAltitude() const {
if (initialized) {
return BME280.readAltitude(SEALEVELPRESSURE_HPA);
}
}
void setTemperatureCompensation(float delta) {
if (initialized) {
BME280.setTemperatureCompensation(delta);
}
}
};

118
src/helpers/sensors/EnvironmentSensorManager.cpp
View File

@ -1,10 +1,49 @@
#include "EnvironmentSensorManager.h" #include "EnvironmentSensorManager.h"
static Adafruit_AHTX0 AHTX0;
static Adafruit_BME280 BME280;
static Adafruit_INA3221 INA3221;
static Adafruit_INA219 INA219(TELEM_INA219_ADDRESS);
bool EnvironmentSensorManager::begin() { bool EnvironmentSensorManager::begin() {
INA3221_sensor.begin();
INA219_sensor.begin(); if (INA3221.begin(TELEM_INA3221_ADDRESS, &Wire)) {
AHTX0_sensor.begin(); MESH_DEBUG_PRINTLN("Found INA3221 at address: %02X", TELEM_INA3221_ADDRESS);
BME280_sensor.begin(); MESH_DEBUG_PRINTLN("%04X %04X", INA3221.getDieID(), INA3221.getManufacturerID());
for(int i = 0; i < 3; i++) {
INA3221.setShuntResistance(i, TELEM_INA3221_SHUNT_VALUE);
}
INA3221_initialized = true;
} else {
INA3221_initialized = false;
MESH_DEBUG_PRINTLN("INA3221 was not found at I2C address %02X", TELEM_INA3221_ADDRESS);
}
if (INA219.begin(&Wire)) {
MESH_DEBUG_PRINTLN("Found INA219 at address: %02X", TELEM_INA219_ADDRESS);
INA219_initialized = true;
} else {
INA219_initialized = false;
MESH_DEBUG_PRINTLN("INA219 was not found at I2C address %02X", TELEM_INA219_ADDRESS);
}
if (AHTX0.begin(&Wire, 0, TELEM_AHTX_ADDRESS)) {
MESH_DEBUG_PRINTLN("Found AHT10/AHT20 at address: %02X", TELEM_AHTX_ADDRESS);
AHTX0_initialized = true;
} else {
AHTX0_initialized = false;
MESH_DEBUG_PRINTLN("AHT10/AHT20 was not found at I2C address %02X", TELEM_AHTX_ADDRESS);
}
if (BME280.begin(TELEM_BME280_ADDRESS, &Wire)) {
MESH_DEBUG_PRINTLN("Found BME280 at address: %02X", TELEM_BME280_ADDRESS);
MESH_DEBUG_PRINTLN("BME sensor ID: %02X", BME280.sensorID);
BME280_initialized = true;
} else {
BME280_initialized = false;
MESH_DEBUG_PRINTLN("BME280 was not found at I2C address %02X", TELEM_BME280_ADDRESS);
}
return true; return true;
} }
@ -12,63 +51,40 @@ bool EnvironmentSensorManager::begin() {
bool EnvironmentSensorManager::querySensors(uint8_t requester_permissions, CayenneLPP& telemetry) { bool EnvironmentSensorManager::querySensors(uint8_t requester_permissions, CayenneLPP& telemetry) {
next_available_channel = TELEM_CHANNEL_SELF + 1; next_available_channel = TELEM_CHANNEL_SELF + 1;
if (requester_permissions & TELEM_PERM_ENVIRONMENT) { if (requester_permissions & TELEM_PERM_ENVIRONMENT) {
if (INA3221_sensor.isInitialized()) { if (INA3221_initialized) {
for(int i = 0; i < 3; i++) { for(int i = 0; i < TELEM_INA3221_NUM_CHANNELS; i++) {
// add only enabled INA3221 channels to telemetry // add only enabled INA3221 channels to telemetry
if (INA3221_sensor.getChannelEnabled(i)) { if (INA3221.isChannelEnabled(i)) {
telemetry.addVoltage(next_available_channel, INA3221_sensor.getVoltage(i)); float voltage = INA3221.getBusVoltage(i);
telemetry.addCurrent(next_available_channel, INA3221_sensor.getCurrent(i)); float current = INA3221.getCurrentAmps(i);
telemetry.addPower(next_available_channel, INA3221_sensor.getPower(i)); telemetry.addVoltage(next_available_channel, voltage);
telemetry.addCurrent(next_available_channel, current);
telemetry.addPower(next_available_channel, voltage * current);
next_available_channel++; next_available_channel++;
} }
} }
} }
if (INA219_sensor.isInitialized()) { if (INA219_initialized) {
telemetry.addVoltage(next_available_channel, INA219_sensor.getVoltage()); telemetry.addVoltage(next_available_channel, INA219.getBusVoltage_V());
telemetry.addCurrent(next_available_channel, INA219_sensor.getCurrent()); telemetry.addCurrent(next_available_channel, INA219.getCurrent_mA() / 1000);
telemetry.addPower(next_available_channel, INA219_sensor.getPower()); telemetry.addPower(next_available_channel, INA219.getPower_mW() / 1000);
next_available_channel++; next_available_channel++;
} }
if (AHTX0_sensor.isInitialized()) { if (AHTX0_initialized) {
telemetry.addTemperature(TELEM_CHANNEL_SELF, AHTX0_sensor.getTemperature()); sensors_event_t humidity, temp;
telemetry.addRelativeHumidity(TELEM_CHANNEL_SELF, AHTX0_sensor.getRelativeHumidity()); AHTX0.getEvent(&humidity, &temp);
telemetry.addTemperature(TELEM_CHANNEL_SELF, temp.temperature);
telemetry.addRelativeHumidity(TELEM_CHANNEL_SELF, humidity.relative_humidity);
} }
if (BME280_sensor.isInitialized()) {
telemetry.addTemperature(TELEM_CHANNEL_SELF, BME280_sensor.getTemperature()); if (BME280_initialized) {
telemetry.addRelativeHumidity(TELEM_CHANNEL_SELF, BME280_sensor.getRelativeHumidity()); telemetry.addTemperature(TELEM_CHANNEL_SELF, BME280.readTemperature());
telemetry.addBarometricPressure(TELEM_CHANNEL_SELF, BME280_sensor.getBarometricPressure()); telemetry.addRelativeHumidity(TELEM_CHANNEL_SELF, BME280.readHumidity());
telemetry.addAltitude(TELEM_CHANNEL_SELF, BME280_sensor.getAltitude()); telemetry.addBarometricPressure(TELEM_CHANNEL_SELF, BME280.readPressure());
telemetry.addAltitude(TELEM_CHANNEL_SELF, BME280.readAltitude(TELEM_BME280_SEALEVELPRESSURE_HPA));
} }
} }
return true; return true;
}
int EnvironmentSensorManager::getNumSettings() const {
return NUM_SENSOR_SETTINGS;
}
const char* EnvironmentSensorManager::getSettingName(int i) const {
if (i >= 0 && i < NUM_SENSOR_SETTINGS) {
return INA3221_CHANNEL_NAMES[i];
}
return NULL;
}
const char* EnvironmentSensorManager::getSettingValue(int i) const {
if (i >= 0 && i < NUM_SENSOR_SETTINGS) {
return INA3221_sensor.getChannelEnabled(i) == true ? "1" : "0";
}
return NULL;
}
bool EnvironmentSensorManager::setSettingValue(const char* name, const char* value) {
for (int i = 0; i < NUM_SENSOR_SETTINGS; i++) {
if (strcmp(name, INA3221_CHANNEL_NAMES[i]) == 0) {
bool channel_enabled = strcmp(value, "1") == 0 ? true : false;
INA3221_sensor.setChannelEnabled(i, channel_enabled);
return true;
}
}
return false;
} }

40
src/helpers/sensors/EnvironmentSensorManager.h
View File

@ -1,33 +1,37 @@
#pragma once #pragma once
#include <helpers/SensorManager.h> #include <helpers/SensorManager.h>
#include "INA3221Sensor.h" #include <Mesh.h>
#include "INA219Sensor.h" #include <Adafruit_INA3221.h>
#include "AHTX0Sensor.h" #include <Adafruit_INA219.h>
#include "BME280Sensor.h" #include <Adafruit_AHTX0.h>
#include <Adafruit_BME280.h>
#define NUM_SENSOR_SETTINGS 3 #define NUM_SENSOR_SETTINGS 3
#define TELEM_INA3221_SETTING_CH1 "INA3221-1" #define TELEM_AHTX_ADDRESS 0x38 // AHT10, AHT20 temperature and humidity sensor I2C address
#define TELEM_INA3221_SETTING_CH2 "INA3221-2" #define TELEM_BME280_ADDRESS 0x76 // BME280 environmental sensor I2C address
#define TELEM_INA3221_SETTING_CH3 "INA3221-3" #define TELEM_INA3221_ADDRESS 0x42 // INA3221 3 channel current sensor I2C address
#define TELEM_INA219_ADDRESS 0x40 // INA219 single channel current sensor I2C address
class EnvironmentSensorManager : public SensorManager { #define TELEM_INA3221_SHUNT_VALUE 0.100 // most variants will have a 0.1 ohm shunts
// INA3221 channels in telemetry #define TELEM_INA3221_NUM_CHANNELS 3
const char * INA3221_CHANNEL_NAMES[NUM_SENSOR_SETTINGS] = { TELEM_INA3221_SETTING_CH1, TELEM_INA3221_SETTING_CH2, TELEM_INA3221_SETTING_CH3};
#define TELEM_INA219_SHUNT_VALUE 0.100 // shunt value in ohms (may differ between manufacturers)
#define TELEM_INA219_MAX_CURRENT 5
#define TELEM_BME280_SEALEVELPRESSURE_HPA (1013.25) // Athmospheric pressure at sea level
class EnvironmentSensorManager : public SensorManager {
protected: protected:
int next_available_channel = TELEM_CHANNEL_SELF + 1; int next_available_channel = TELEM_CHANNEL_SELF + 1;
INA3221Sensor INA3221_sensor;
AHTX0Sensor AHTX0_sensor; bool INA3221_initialized = false;
INA219Sensor INA219_sensor; bool INA219_initialized = false;
BME280Sensor BME280_sensor; bool BME280_initialized = false;
bool AHTX0_initialized = false;
public: public:
EnvironmentSensorManager(){}; EnvironmentSensorManager(){};
bool begin() override; bool begin() override;
bool querySensors(uint8_t requester_permissions, CayenneLPP& telemetry) override; bool querySensors(uint8_t requester_permissions, CayenneLPP& telemetry) override;
int getNumSettings() const override;
const char* getSettingName(int i) const override;
const char* getSettingValue(int i) const override;
bool setSettingValue(const char* name, const char* value) override;
}; };

71
src/helpers/sensors/INA3221Sensor.h
View File

@ -1,71 +0,0 @@
#pragma once
#include <Mesh.h>
#include <INA3221.h>
#define TELEM_INA3221_ADDRESS 0x42 // INA3221 3 channel current sensor I2C address
#define TELEM_INA3221_SHUNT_VALUE 0.100 // most variants will have a 0.1 ohm shunts
#define NUM_CHANNELS 3
static INA3221 INA_3221(TELEM_INA3221_ADDRESS, &Wire);
class INA3221Sensor {
bool initialized = false;
public:
void begin() {
if (INA_3221.begin()) {
MESH_DEBUG_PRINTLN("Found INA3221 at address: %02X", INA_3221.getAddress());
MESH_DEBUG_PRINTLN("%04X %04X %04X", INA_3221.getDieID(), INA_3221.getManufacturerID(), INA_3221.getConfiguration());
for(int i = 0; i < 3; i++) {
INA_3221.setShuntR(i, TELEM_INA3221_SHUNT_VALUE);
}
initialized = true;
} else {
initialized = false;
MESH_DEBUG_PRINTLN("INA3221 was not found at I2C address %02X", TELEM_INA3221_ADDRESS);
}
}
bool isInitialized() const { return initialized; }
int numChannels() const { return NUM_CHANNELS; }
float getVoltage(int channel) const {
if (initialized && channel >=0 && channel < NUM_CHANNELS) {
return INA_3221.getBusVoltage(channel);
}
return 0;
}
float getCurrent(int channel) const {
if (initialized && channel >=0 && channel < NUM_CHANNELS) {
return INA_3221.getCurrent(channel);
}
return 0;
}
float getPower (int channel) const {
if (initialized && channel >=0 && channel < NUM_CHANNELS) {
return INA_3221.getPower(channel);
}
return 0;
}
bool setChannelEnabled(int channel, bool enabled) {
if (initialized && channel >=0 && channel < NUM_CHANNELS) {
INA_3221.enableChannel(channel);
return true;
}
return false;
}
bool getChannelEnabled(int channel) const {
if (initialized && channel >=0 && channel < NUM_CHANNELS) {
return INA_3221.getEnableChannel(channel);
}
return false;
}
};

15
variants/promicro/platformio.ini
View File

@ -19,10 +19,10 @@ build_src_filter = ${nrf52840_base.build_src_filter}
+<../variants/promicro> +<../variants/promicro>
lib_deps= ${nrf52840_base.lib_deps} lib_deps= ${nrf52840_base.lib_deps}
adafruit/Adafruit SSD1306 @ ^2.5.13 adafruit/Adafruit SSD1306 @ ^2.5.13
robtillaart/INA3221 @ ^0.4.1 adafruit/Adafruit INA3221 Library @ ^1.0.1
robtillaart/INA219 @ ^0.4.1 adafruit/Adafruit INA219 @ ^1.2.3
adafruit/Adafruit AHTX0@^2.0.5 adafruit/Adafruit AHTX0 @ ^2.0.5
adafruit/Adafruit BME280 Library@^2.3.0 adafruit/Adafruit BME280 Library @ ^2.3.0
[env:Faketec_Repeater] [env:Faketec_Repeater]
extends = Faketec extends = Faketec
@ -124,9 +124,10 @@ build_src_filter =
+<helpers/nrf52/PromicroBoard.cpp> +<helpers/nrf52/PromicroBoard.cpp>
+<../variants/promicro> +<../variants/promicro>
lib_deps= ${nrf52840_base.lib_deps} lib_deps= ${nrf52840_base.lib_deps}
robtillaart/INA3221 @ ^0.4.1 adafruit/Adafruit INA3221 Library @ ^1.0.1
robtillaart/INA219 @ ^0.4.1 adafruit/Adafruit INA219 @ ^1.2.3
adafruit/Adafruit AHTX0@^2.0.5 adafruit/Adafruit AHTX0 @ ^2.0.5
adafruit/Adafruit BME280 Library @ ^2.3.0
[env:ProMicroLLCC68_Repeater] [env:ProMicroLLCC68_Repeater]
extends = ProMicroLLCC68 extends = ProMicroLLCC68

Write Preview
Loading…
Cancel
Save