mirror of
https://github.com/meshcore-dev/MeshCore.git
synced 2026-03-31 12:35:43 +00:00
wioe5: integrate sensor in sensor mgr
This commit is contained in:
@@ -126,11 +126,14 @@ InternalFileSystem::InternalFileSystem(void)
|
||||
|
||||
bool InternalFileSystem::begin(void)
|
||||
{
|
||||
volatile bool format_fs;
|
||||
#ifdef FORMAT_FS
|
||||
this->format();
|
||||
format_fs = true;
|
||||
#else
|
||||
format_fs = false; // you can always use debugger to force formatting ;)
|
||||
#endif
|
||||
// failed to mount, erase all sector then format and mount again
|
||||
if ( !Adafruit_LittleFS::begin() )
|
||||
if ( format_fs || !Adafruit_LittleFS::begin() )
|
||||
{
|
||||
// lfs format
|
||||
this->format();
|
||||
|
||||
@@ -18,8 +18,7 @@ static const Module::RfSwitchMode_t rfswitch_table[] = {
|
||||
};
|
||||
|
||||
VolatileRTCClock rtc_clock;
|
||||
BME280I2C bme;
|
||||
WIOE5SensorManager sensors(bme);
|
||||
WIOE5SensorManager sensors;
|
||||
|
||||
#ifndef LORA_CR
|
||||
#define LORA_CR 5
|
||||
@@ -73,9 +72,9 @@ bool WIOE5SensorManager::querySensors(uint8_t requester_permissions, CayenneLPP&
|
||||
float temp(NAN), hum(NAN), pres(NAN);
|
||||
|
||||
BME280::TempUnit tempUnit(BME280::TempUnit_Celsius);
|
||||
BME280::PresUnit presUnit(BME280::PresUnit_bar);
|
||||
BME280::PresUnit presUnit(BME280::PresUnit_hPa);
|
||||
|
||||
_bme->read(pres, temp, hum, tempUnit, presUnit);
|
||||
bme.read(pres, temp, hum, tempUnit, presUnit);
|
||||
|
||||
telemetry.addTemperature(TELEM_CHANNEL_SELF, temp);
|
||||
telemetry.addRelativeHumidity(TELEM_CHANNEL_SELF, hum);
|
||||
@@ -85,7 +84,7 @@ bool WIOE5SensorManager::querySensors(uint8_t requester_permissions, CayenneLPP&
|
||||
}
|
||||
|
||||
bool WIOE5SensorManager::begin() {
|
||||
has_bme = _bme->begin();
|
||||
has_bme = bme.begin();
|
||||
|
||||
return has_bme;
|
||||
}
|
||||
@@ -25,11 +25,11 @@ public:
|
||||
};
|
||||
|
||||
class WIOE5SensorManager : public SensorManager {
|
||||
BME280I2C* _bme;
|
||||
BME280I2C bme;
|
||||
bool has_bme = false;
|
||||
|
||||
public:
|
||||
WIOE5SensorManager(BME280I2C& bme) : _bme(&bme) {}
|
||||
WIOE5SensorManager() {}
|
||||
bool begin() override;
|
||||
bool querySensors(uint8_t requester_permissions, CayenneLPP& telemetry) override;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user