mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-16 14:57:41 +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.
57 lines
1.4 KiB
C++
57 lines
1.4 KiB
C++
#pragma once
|
|
#ifndef _BMM_150_SENSOR_H_
|
|
#define _BMM_150_SENSOR_H_
|
|
|
|
#include "MotionSensor.h"
|
|
|
|
#if !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C && __has_include(<DFRobot_BMM150.h>)
|
|
|
|
#include "Fusion/Fusion.h"
|
|
#include <DFRobot_BMM150.h>
|
|
|
|
// The I2C address of the Accelerometer (if found) from main.cpp
|
|
extern ScanI2C::DeviceAddress accelerometer_found;
|
|
|
|
// Singleton wrapper
|
|
class BMM150Singleton : public DFRobot_BMM150_I2C
|
|
{
|
|
private:
|
|
static BMM150Singleton *pinstance;
|
|
|
|
protected:
|
|
BMM150Singleton(TwoWire *tw, uint8_t addr) : DFRobot_BMM150_I2C(tw, addr) {}
|
|
~BMM150Singleton();
|
|
|
|
public:
|
|
// Create a singleton instance (not thread safe)
|
|
static BMM150Singleton *GetInstance(ScanI2C::FoundDevice device);
|
|
|
|
// Singletons should not be cloneable.
|
|
BMM150Singleton(BMM150Singleton &other) = delete;
|
|
|
|
// Singletons should not be assignable.
|
|
void operator=(const BMM150Singleton &) = delete;
|
|
|
|
// Initialise the motion sensor singleton for normal operation
|
|
bool init(ScanI2C::FoundDevice device);
|
|
};
|
|
|
|
class BMM150Sensor : public MotionSensor
|
|
{
|
|
private:
|
|
BMM150Singleton *sensor = nullptr;
|
|
bool showingScreen = false;
|
|
|
|
public:
|
|
explicit BMM150Sensor(ScanI2C::FoundDevice foundDevice);
|
|
|
|
// Initialise the motion sensor
|
|
virtual bool init() override;
|
|
|
|
// Called each time our sensor gets a chance to run
|
|
virtual int32_t runOnce() override;
|
|
};
|
|
|
|
#endif
|
|
|
|
#endif |