mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-21 18:52:36 +10:00
Jorropo
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.
62 lines
1.5 KiB
C++
62 lines
1.5 KiB
C++
#pragma once
|
|
|
|
#include "configuration.h"
|
|
#if !MESHTASTIC_EXCLUDE_I2C
|
|
|
|
#include <map>
|
|
#include <memory>
|
|
#include <stddef.h>
|
|
#include <stdint.h>
|
|
|
|
#include <Wire.h>
|
|
|
|
#include "ScanI2C.h"
|
|
|
|
#include "../concurrency/Lock.h"
|
|
|
|
class ScanI2CTwoWire : public ScanI2C
|
|
{
|
|
public:
|
|
void scanPort(ScanI2C::I2CPort) override;
|
|
|
|
void scanPort(ScanI2C::I2CPort, uint8_t *, uint8_t) override;
|
|
|
|
ScanI2C::FoundDevice find(ScanI2C::DeviceType) const override;
|
|
|
|
bool exists(ScanI2C::DeviceType) const override;
|
|
|
|
size_t countDevices() const override;
|
|
|
|
static TwoWire *fetchI2CBus(ScanI2C::DeviceAddress);
|
|
|
|
protected:
|
|
FoundDevice firstOfOrNONE(size_t, DeviceType[]) const override;
|
|
|
|
private:
|
|
typedef struct RegisterLocation {
|
|
DeviceAddress i2cAddress;
|
|
RegisterAddress registerAddress;
|
|
|
|
RegisterLocation(DeviceAddress deviceAddress, RegisterAddress registerAddress)
|
|
: i2cAddress(deviceAddress), registerAddress(registerAddress)
|
|
{
|
|
}
|
|
|
|
} RegisterLocation;
|
|
|
|
typedef uint8_t ResponseWidth;
|
|
|
|
std::map<ScanI2C::DeviceAddress, ScanI2C::DeviceType> foundDevices;
|
|
|
|
// note: prone to overwriting if multiple devices of a type are added at different addresses (rare?)
|
|
std::map<ScanI2C::DeviceType, ScanI2C::DeviceAddress> deviceAddresses;
|
|
|
|
concurrency::Lock lock;
|
|
|
|
uint16_t getRegisterValue(const RegisterLocation &, ResponseWidth, bool) const;
|
|
|
|
DeviceType probeOLED(ScanI2C::DeviceAddress) const;
|
|
|
|
static void logFoundDevice(const char *device, uint8_t address);
|
|
};
|
|
#endif |