JorropoandGitHub
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.
66 lines
1.8 KiB
C++
Executable File
66 lines
1.8 KiB
C++
Executable File
#pragma once
|
|
#ifndef _MOTION_SENSOR_H_
|
|
#define _MOTION_SENSOR_H_
|
|
|
|
#define MOTION_SENSOR_CHECK_INTERVAL_MS 100
|
|
#define MOTION_SENSOR_CLICK_THRESHOLD 40
|
|
|
|
#include "../configuration.h"
|
|
|
|
#if !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
|
|
|
|
#include "../PowerFSM.h"
|
|
#include "../detect/ScanI2C.h"
|
|
#include "../graphics/Screen.h"
|
|
#include "../graphics/ScreenFonts.h"
|
|
#include "../power.h"
|
|
#include "Wire.h"
|
|
|
|
// Base class for motion processing
|
|
class MotionSensor
|
|
{
|
|
public:
|
|
explicit MotionSensor(ScanI2C::FoundDevice foundDevice);
|
|
virtual ~MotionSensor(){};
|
|
|
|
// Get the device type
|
|
ScanI2C::DeviceType deviceType();
|
|
|
|
// Get the device address
|
|
uint8_t deviceAddress();
|
|
|
|
// Get the device port
|
|
ScanI2C::I2CPort devicePort();
|
|
|
|
// Initialise the motion sensor
|
|
inline virtual bool init() { return false; };
|
|
|
|
// The method that will be called each time our sensor gets a chance to run
|
|
// Returns the desired period for next invocation (or RUN_SAME for no change)
|
|
// Refer to /src/concurrency/OSThread.h for more information
|
|
inline virtual int32_t runOnce() { return MOTION_SENSOR_CHECK_INTERVAL_MS; };
|
|
|
|
virtual void calibrate(uint16_t forSeconds){};
|
|
|
|
protected:
|
|
// Turn on the screen when a tap or motion is detected
|
|
virtual void wakeScreen();
|
|
|
|
// Register a button press when a double-tap is detected
|
|
virtual void buttonPress();
|
|
|
|
#if !defined(MESHTASTIC_EXCLUDE_SCREEN) && HAS_SCREEN
|
|
// draw an OLED frame (currently only used by the RAK4631 BMX160 sensor)
|
|
static void drawFrameCalibration(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
|
|
#endif
|
|
|
|
ScanI2C::FoundDevice device;
|
|
|
|
// Do calibration if true
|
|
bool doCalibration = false;
|
|
uint32_t endCalibrationAt = 0;
|
|
};
|
|
|
|
#endif
|
|
|
|
#endif |