mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-17 07:17:32 +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.
34 lines
936 B
C++
Executable File
34 lines
936 B
C++
Executable File
#include "LSM6DS3Sensor.h"
|
|
#include "NodeDB.h"
|
|
|
|
#if !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C && __has_include(<Adafruit_LSM6DS3TRC.h>)
|
|
|
|
LSM6DS3Sensor::LSM6DS3Sensor(ScanI2C::FoundDevice foundDevice) : MotionSensor::MotionSensor(foundDevice) {}
|
|
|
|
bool LSM6DS3Sensor::init()
|
|
{
|
|
if (sensor.begin_I2C(deviceAddress())) {
|
|
|
|
// Default threshold of 2G, less sensitive options are 4, 8 or 16G
|
|
sensor.setAccelRange(LSM6DS_ACCEL_RANGE_2_G);
|
|
|
|
// Duration is number of occurrences needed to trigger, higher threshold is less sensitive
|
|
sensor.enableWakeup(config.display.wake_on_tap_or_motion, 1, LSM6DS3_WAKE_THRESH);
|
|
|
|
LOG_DEBUG("LSM6DS3 init ok");
|
|
return true;
|
|
}
|
|
LOG_DEBUG("LSM6DS3 init failed");
|
|
return false;
|
|
}
|
|
|
|
int32_t LSM6DS3Sensor::runOnce()
|
|
{
|
|
if (sensor.shake()) {
|
|
wakeScreen();
|
|
return 500;
|
|
}
|
|
return MOTION_SENSOR_CHECK_INTERVAL_MS;
|
|
}
|
|
|
|
#endif |