dandri/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-05-10 21:46:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

wioe5: integrate sensor in sensor mgr

Browse Source
This commit is contained in:
Florent
2025-06-01 08:30:53 +02:00
committed by hank
parent 73a7a96ae4
commit 92c296308a
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/helpers/stm32/InternalFileSystem.cpp
+5 -2
View File
@@ -126,11 +126,14 @@ InternalFileSystem::InternalFileSystem(void)
bool InternalFileSystem::begin(void) bool InternalFileSystem::begin(void)
{ {
volatile bool format_fs;
#ifdef FORMAT_FS #ifdef FORMAT_FS
this->format(); format_fs = true;
#else
format_fs = false; // you can always use debugger to force formatting ;)
#endif #endif
// failed to mount, erase all sector then format and mount again // failed to mount, erase all sector then format and mount again
if ( !Adafruit_LittleFS::begin() ) if ( format_fs || !Adafruit_LittleFS::begin() )
{ {
// lfs format // lfs format
this->format(); this->format();
variants/wio-e5-mini/target.cpp
+4 -5
View File
@@ -18,8 +18,7 @@ static const Module::RfSwitchMode_t rfswitch_table[] = {
}; };
VolatileRTCClock rtc_clock; VolatileRTCClock rtc_clock;
BME280I2C bme; WIOE5SensorManager sensors;
WIOE5SensorManager sensors(bme);
#ifndef LORA_CR #ifndef LORA_CR
#define LORA_CR 5 #define LORA_CR 5
@@ -73,9 +72,9 @@ bool WIOE5SensorManager::querySensors(uint8_t requester_permissions, CayenneLPP&
float temp(NAN), hum(NAN), pres(NAN); float temp(NAN), hum(NAN), pres(NAN);
BME280::TempUnit tempUnit(BME280::TempUnit_Celsius); 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.addTemperature(TELEM_CHANNEL_SELF, temp);
telemetry.addRelativeHumidity(TELEM_CHANNEL_SELF, hum); telemetry.addRelativeHumidity(TELEM_CHANNEL_SELF, hum);
@@ -85,7 +84,7 @@ bool WIOE5SensorManager::querySensors(uint8_t requester_permissions, CayenneLPP&
} }
bool WIOE5SensorManager::begin() { bool WIOE5SensorManager::begin() {
has_bme = _bme->begin(); has_bme = bme.begin();
return has_bme; return has_bme;
} }
variants/wio-e5-mini/target.h
+2 -2
View File
@@ -25,11 +25,11 @@ public:
}; };
class WIOE5SensorManager : public SensorManager { class WIOE5SensorManager : public SensorManager {
BME280I2C* _bme; BME280I2C bme;
bool has_bme = false; bool has_bme = false;
public: public:
WIOE5SensorManager(BME280I2C& bme) : _bme(&bme) {} WIOE5SensorManager() {}
bool begin() override; bool begin() override;
bool querySensors(uint8_t requester_permissions, CayenneLPP& telemetry) override; bool querySensors(uint8_t requester_permissions, CayenneLPP& telemetry) override;
}; };