mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-16 16:41:33 +10:00
Ben MeadorsandThomas Göttgens
b20d89974a
* Stop accelerometer thread when double-tap/wake-on-motion disabled at runtime double_tap_as_button_press and wake_on_tap_or_motion are applied live: the OFF->ON edge calls accelerometerThread->start(), but there was no ON->OFF branch, so turning either flag off left the sensor thread running (polling I2C, drawing power) until reboot. Worse, because enabled stayed true, a later OFF->ON edge was a no-op (the enabled==false guard blocked re-start), leaving the feature un-restartable without a reboot. Add the symmetric ON->OFF branch in both handlers. When a flag goes true->off and the other consumer of the shared thread is also off, call accelerometerThread->disable() (stops runOnce polling and clears enabled so a later re-enable can start() again). Each branch checks the other flag first so disabling one feature never stops the sensor while the other still needs it. * Keep accelerometer thread running when its sensor drives the compass * Guard accelerometer thread config toggles against a null thread pointer * AdminModule: factor shared accelerometer start/stop into a helper The device and display config handlers had mirror-image blocks reconciling the shared accelerometer thread. Extract reconcileAccelerometerThread(wasOn, nowOn, otherFeatureOn) so the null guard, edge logic, compass (providesHeading) guard, and rationale live in one place; each call site is now a single call. Behavior is unchanged. Also drops the redundant per-field assignment that the whole-struct `config.device = ...` / `config.display = ...` overwrites anyway. --------- Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
45 lines
979 B
C++
Executable File
45 lines
979 B
C++
Executable File
#pragma once
|
|
|
|
#ifndef _BMX160_SENSOR_H_
|
|
#define _BMX160_SENSOR_H_
|
|
|
|
#include "MotionSensor.h"
|
|
|
|
#if !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
|
|
|
|
#if !defined(RAK2560) && __has_include(<Rak_BMX160.h>)
|
|
|
|
#include "Fusion/Fusion.h"
|
|
#include <Rak_BMX160.h>
|
|
|
|
class BMX160Sensor : public MotionSensor
|
|
{
|
|
private:
|
|
RAK_BMX160 sensor;
|
|
bool showingScreen = false;
|
|
static constexpr const char *compassCalibrationFileName = "/prefs/compass_bmx160.dat";
|
|
float highestX = 0, lowestX = 0, highestY = 0, lowestY = 0, highestZ = 0, lowestZ = 0;
|
|
|
|
public:
|
|
explicit BMX160Sensor(ScanI2C::FoundDevice foundDevice);
|
|
virtual bool init() override;
|
|
virtual int32_t runOnce() override;
|
|
virtual void calibrate(uint16_t forSeconds) override;
|
|
virtual bool providesHeading() const override { return true; }
|
|
};
|
|
|
|
#else
|
|
|
|
// Stub
|
|
class BMX160Sensor : public MotionSensor
|
|
{
|
|
public:
|
|
explicit BMX160Sensor(ScanI2C::FoundDevice foundDevice);
|
|
};
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|