mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-17 15:27:29 +00:00
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.
This commit is contained in:
@@ -4,26 +4,28 @@
|
||||
|
||||
MPU6050Sensor::MPU6050Sensor(ScanI2C::FoundDevice foundDevice) : MotionSensor::MotionSensor(foundDevice) {}
|
||||
|
||||
bool MPU6050Sensor::init() {
|
||||
if (sensor.begin(deviceAddress())) {
|
||||
// setup motion detection
|
||||
sensor.setHighPassFilter(MPU6050_HIGHPASS_0_63_HZ);
|
||||
sensor.setMotionDetectionThreshold(1);
|
||||
sensor.setMotionDetectionDuration(20);
|
||||
sensor.setInterruptPinLatch(true); // Keep it latched. Will turn off when reinitialized.
|
||||
sensor.setInterruptPinPolarity(true);
|
||||
LOG_DEBUG("MPU6050 init ok");
|
||||
return true;
|
||||
}
|
||||
LOG_DEBUG("MPU6050 init failed");
|
||||
return false;
|
||||
bool MPU6050Sensor::init()
|
||||
{
|
||||
if (sensor.begin(deviceAddress())) {
|
||||
// setup motion detection
|
||||
sensor.setHighPassFilter(MPU6050_HIGHPASS_0_63_HZ);
|
||||
sensor.setMotionDetectionThreshold(1);
|
||||
sensor.setMotionDetectionDuration(20);
|
||||
sensor.setInterruptPinLatch(true); // Keep it latched. Will turn off when reinitialized.
|
||||
sensor.setInterruptPinPolarity(true);
|
||||
LOG_DEBUG("MPU6050 init ok");
|
||||
return true;
|
||||
}
|
||||
LOG_DEBUG("MPU6050 init failed");
|
||||
return false;
|
||||
}
|
||||
|
||||
int32_t MPU6050Sensor::runOnce() {
|
||||
if (sensor.getMotionInterruptStatus()) {
|
||||
wakeScreen();
|
||||
}
|
||||
return MOTION_SENSOR_CHECK_INTERVAL_MS;
|
||||
int32_t MPU6050Sensor::runOnce()
|
||||
{
|
||||
if (sensor.getMotionInterruptStatus()) {
|
||||
wakeScreen();
|
||||
}
|
||||
return MOTION_SENSOR_CHECK_INTERVAL_MS;
|
||||
}
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user