meshcore-dev/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-04-20 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Create sensor classes that can be shared across variants

Browse source
This commit is contained in:
Normunds Gavars 2025-05-19 17:24:54 +03:00
parent fa0456549a
commit 8a27743e43
8 changed files with 259 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

119
variants/promicro/target.cpp
View file

@ -10,7 +10,7 @@ WRAPPER_CLASS radio_driver(radio, board);
VolatileRTCClock fallback_clock;
AutoDiscoverRTCClock rtc_clock(fallback_clock);
PromicroSensorManager sensors;
EnvironmentSensorManager sensors;
#ifdef DISPLAY_CLASS
DISPLAY_CLASS display;
@ -79,120 +79,3 @@ mesh::LocalIdentity radio_new_identity() {
return mesh::LocalIdentity(&rng); // create new random identity
}
static INA3221 INA_3221(TELEM_INA3221_ADDRESS, &Wire);
static INA219 INA_219(TELEM_INA219_ADDRESS, &Wire);
static Adafruit_AHTX0 AHTX;
bool PromicroSensorManager::begin() {
initINA3221();
initINA219();
initAHTX();
return true;
}
bool PromicroSensorManager::querySensors(uint8_t requester_permissions, CayenneLPP& telemetry) {
int nextAvalableChannel = TELEM_CHANNEL_SELF + 1;
if (requester_permissions & TELEM_PERM_ENVIRONMENT) {
if (INA3221initialized) {
for(int i = 0; i < 3; i++) {
// add only enabled INA3221 channels to telemetry
if (INA3221_CHANNEL_ENABLED[i]) {
telemetry.addVoltage(nextAvalableChannel, INA_3221.getBusVoltage(i));
telemetry.addCurrent(nextAvalableChannel, INA_3221.getCurrent(i));
telemetry.addPower(nextAvalableChannel, INA_3221.getPower(i));
nextAvalableChannel++;
}
}
}
if (INA219initialized) {
telemetry.addVoltage(nextAvalableChannel, INA_219.getBusVoltage());
telemetry.addCurrent(nextAvalableChannel, INA_219.getCurrent());
telemetry.addPower(nextAvalableChannel, INA_219.getPower());
nextAvalableChannel++;
}
if (AHTXinitialized) {
sensors_event_t humidity, temp;
AHTX.getEvent(&humidity, &temp);
telemetry.addTemperature(TELEM_CHANNEL_SELF, temp.temperature);
telemetry.addRelativeHumidity(TELEM_CHANNEL_SELF, humidity.relative_humidity);
}
}
return true;
}
int PromicroSensorManager::getNumSettings() const {
return NUM_SENSOR_SETTINGS;
}
const char* PromicroSensorManager::getSettingName(int i) const {
if (i >= 0 && i < NUM_SENSOR_SETTINGS) {
return INA3221_CHANNEL_NAMES[i];
}
return NULL;
}
const char* PromicroSensorManager::getSettingValue(int i) const {
if (i >= 0 && i < NUM_SENSOR_SETTINGS) {
return INA3221_CHANNEL_ENABLED[i] ? "1" : "0";
}
return NULL;
}
bool PromicroSensorManager::setSettingValue(const char* name, const char* value) {
for (int i = 0; i < NUM_SENSOR_SETTINGS; i++) {
if (strcmp(name, INA3221_CHANNEL_NAMES[i]) == 0) {
int channelEnabled = INA_3221.getEnableChannel(i);
if (strcmp(value, "1") == 0) {
INA3221_CHANNEL_ENABLED[i] = true;
if (!channelEnabled) {
INA_3221.enableChannel(i);
}
} else {
INA3221_CHANNEL_ENABLED[i] = false;
if (channelEnabled) {
INA_3221.disableChannel(i);
}
}
return true;
}
}
return false;
}
void PromicroSensorManager::initINA3221() {
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);
}
INA3221initialized = true;
} else {
INA3221initialized = false;
MESH_DEBUG_PRINTLN("INA3221 was not found at I2C address %02X", TELEM_INA3221_ADDRESS);
}
}
void PromicroSensorManager::initINA219() {
if (INA_219.begin()) {
MESH_DEBUG_PRINTLN("Found INA219 at address: %02X", INA_219.getAddress());
INA_219.setMaxCurrentShunt(TELEM_INA219_MAX_CURRENT, TELEM_INA219_SHUNT_VALUE);
INA219initialized = true;
} else {
INA219initialized = false;
MESH_DEBUG_PRINTLN("INA219 was not found at I2C address %02X", TELEM_INA219_ADDRESS);
}
}
void PromicroSensorManager::initAHTX() {
if (AHTX.begin(&Wire, 0, TELEM_AHTX_ADDRESS)) {
MESH_DEBUG_PRINTLN("Found AHT10/AHT20 at address: %02X", TELEM_AHTX_ADDRESS);
AHTXinitialized = true;
} else {
AHTXinitialized = false;
MESH_DEBUG_PRINTLN("AHT10/AHT20 was not found at I2C address %02X", TELEM_AHTX_ADDRESS);
}
}