mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-16 23:07:34 +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.
26 lines
533 B
C++
Executable File
26 lines
533 B
C++
Executable File
#pragma once
|
|
#ifndef _BMA423_SENSOR_H_
|
|
#define _BMA423_SENSOR_H_
|
|
|
|
#include "MotionSensor.h"
|
|
|
|
#if !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C && defined(HAS_BMA423) && __has_include(<SensorBMA423.hpp>)
|
|
|
|
#include <SensorBMA423.hpp>
|
|
#include <Wire.h>
|
|
|
|
class BMA423Sensor : public MotionSensor
|
|
{
|
|
private:
|
|
SensorBMA423 sensor;
|
|
volatile bool BMA_IRQ = false;
|
|
|
|
public:
|
|
explicit BMA423Sensor(ScanI2C::FoundDevice foundDevice);
|
|
virtual bool init() override;
|
|
virtual int32_t runOnce() override;
|
|
};
|
|
|
|
#endif
|
|
|
|
#endif |