mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-17 23:37:44 +00:00
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
45 lines
1.5 KiB
C++
45 lines
1.5 KiB
C++
#include "configuration.h"
|
|
|
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<bsec2.h>)
|
|
|
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
|
#include "TelemetrySensor.h"
|
|
#include <bsec2.h>
|
|
|
|
#define STATE_SAVE_PERIOD UINT32_C(360 * 60 * 1000) // That's 6 hours worth of millis()
|
|
|
|
const uint8_t bsec_config[] = {
|
|
#include "config/bme680/bme680_iaq_33v_3s_4d/bsec_iaq.txt"
|
|
};
|
|
|
|
class BME680Sensor : public TelemetrySensor
|
|
{
|
|
private:
|
|
Bsec2 bme680;
|
|
|
|
protected:
|
|
const char *bsecConfigFileName = "/prefs/bsec.dat";
|
|
uint8_t bsecState[BSEC_MAX_STATE_BLOB_SIZE] = {0};
|
|
uint8_t accuracy = 0;
|
|
uint16_t stateUpdateCounter = 0;
|
|
bsecSensor sensorList[9] = {BSEC_OUTPUT_IAQ,
|
|
BSEC_OUTPUT_RAW_TEMPERATURE,
|
|
BSEC_OUTPUT_RAW_PRESSURE,
|
|
BSEC_OUTPUT_RAW_HUMIDITY,
|
|
BSEC_OUTPUT_RAW_GAS,
|
|
BSEC_OUTPUT_STABILIZATION_STATUS,
|
|
BSEC_OUTPUT_RUN_IN_STATUS,
|
|
BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_TEMPERATURE,
|
|
BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_HUMIDITY};
|
|
void loadState();
|
|
void updateState();
|
|
void checkStatus(const char *functionName);
|
|
|
|
public:
|
|
BME680Sensor();
|
|
virtual int32_t runOnce() override;
|
|
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
|
|
virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
|
|
};
|
|
|
|
#endif |