mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-30 13:41:53 +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.
37 lines
600 B
C++
Executable File
37 lines
600 B
C++
Executable File
#pragma once
|
|
#ifndef _STK8XXX_SENSOR_H_
|
|
#define _STK8XXX_SENSOR_H_
|
|
|
|
#include "MotionSensor.h"
|
|
|
|
#if !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C && defined(HAS_STK8XXX)
|
|
|
|
#ifdef STK8XXX_INT
|
|
|
|
#include <stk8baxx.h>
|
|
|
|
class STK8XXXSensor : public MotionSensor
|
|
{
|
|
private:
|
|
STK8xxx sensor;
|
|
|
|
public:
|
|
explicit STK8XXXSensor(ScanI2C::FoundDevice foundDevice);
|
|
virtual bool init() override;
|
|
virtual int32_t runOnce() override;
|
|
};
|
|
|
|
#else
|
|
|
|
// Stub
|
|
class STK8XXXSensor : public MotionSensor
|
|
{
|
|
public:
|
|
explicit STK8XXXSensor(ScanI2C::FoundDevice foundDevice);
|
|
};
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif |