mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-16 06:47:52 +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.
40 lines
934 B
C++
Executable File
40 lines
934 B
C++
Executable File
#include "STK8XXXSensor.h"
|
|
|
|
#if !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C && defined(HAS_STK8XXX)
|
|
|
|
STK8XXXSensor::STK8XXXSensor(ScanI2C::FoundDevice foundDevice) : MotionSensor::MotionSensor(foundDevice) {}
|
|
|
|
#ifdef STK8XXX_INT
|
|
|
|
volatile static bool STK_IRQ;
|
|
|
|
bool STK8XXXSensor::init()
|
|
{
|
|
if (sensor.STK8xxx_Initialization(STK8xxx_VAL_RANGE_2G)) {
|
|
STK_IRQ = false;
|
|
sensor.STK8xxx_Anymotion_init();
|
|
pinMode(STK8XXX_INT, INPUT_PULLUP);
|
|
attachInterrupt(
|
|
digitalPinToInterrupt(STK8XXX_INT), [] { STK_IRQ = true; }, RISING);
|
|
|
|
LOG_DEBUG("STK8XXX init ok");
|
|
return true;
|
|
}
|
|
LOG_DEBUG("STK8XXX init failed");
|
|
return false;
|
|
}
|
|
|
|
int32_t STK8XXXSensor::runOnce()
|
|
{
|
|
if (STK_IRQ) {
|
|
STK_IRQ = false;
|
|
if (config.display.wake_on_tap_or_motion) {
|
|
wakeScreen();
|
|
}
|
|
}
|
|
return MOTION_SENSOR_CHECK_INTERVAL_MS;
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif |