pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-11 23:52:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

change type to 8 bit uint

Browse Source
This commit is contained in:
Thomas Göttgens 2024-05-24 22:59:31 +02:00
parent 2eb3cfd5e0
commit ba14ffb8d3
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/detect/ScanI2C.cpp
View File

@ -6,7 +6,7 @@ const ScanI2C::FoundDevice ScanI2C::DEVICE_NONE = ScanI2C::FoundDevice(ScanI2C::
ScanI2C::ScanI2C() = default; ScanI2C::ScanI2C() = default;
void ScanI2C::scanPort(ScanI2C::I2CPort port) {} void ScanI2C::scanPort(ScanI2C::I2CPort port) {}
void ScanI2C::scanPort(ScanI2C::I2CPort port, int *address) {} void ScanI2C::scanPort(ScanI2C::I2CPort port, uint8_t *address) {}
void ScanI2C::setSuppressScreen() void ScanI2C::setSuppressScreen()
{ {

2
src/detect/ScanI2C.h
View File

@ -88,7 +88,7 @@ class ScanI2C
ScanI2C(); ScanI2C();
virtual void scanPort(ScanI2C::I2CPort); virtual void scanPort(ScanI2C::I2CPort);
virtual void scanPort(ScanI2C::I2CPort, int *); virtual void scanPort(ScanI2C::I2CPort, uint8_t *);
/* /*
* A bit of a hack, this tells the scanner not to tell later systems there is a screen to avoid enabling it. * A bit of a hack, this tells the scanner not to tell later systems there is a screen to avoid enabling it.

6
src/detect/ScanI2CTwoWire.cpp
View File

@ -135,7 +135,7 @@ uint16_t ScanI2CTwoWire::getRegisterValue(const ScanI2CTwoWire::RegisterLocation
type = T; \ type = T; \
break; break;
void ScanI2CTwoWire::scanPort(I2CPort port, int *address) void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address)
{ {
concurrency::LockGuard guard((concurrency::Lock *)&lock); concurrency::LockGuard guard((concurrency::Lock *)&lock);
@ -163,8 +163,8 @@ void ScanI2CTwoWire::scanPort(I2CPort port, int *address)
#endif #endif
for (addr.address = 1; addr.address < 127; addr.address++) { for (addr.address = 1; addr.address < 127; addr.address++) {
// Skip the address if it is not requested oon a partial scan // Skip the address if it is not requested on a partial scan
if (sizeof(address) > 0 && addr.address != *address) { if (address != nullptr && *address != addr.address) {
continue; continue;
} }
i2cBus->beginTransmission(addr.address); i2cBus->beginTransmission(addr.address);

2
src/detect/ScanI2CTwoWire.h
View File

@ -16,7 +16,7 @@ class ScanI2CTwoWire : public ScanI2C
public: public:
void scanPort(ScanI2C::I2CPort) override; void scanPort(ScanI2C::I2CPort) override;
void scanPort(ScanI2C::I2CPort, int *) override; void scanPort(ScanI2C::I2CPort, uint8_t *) override;
ScanI2C::FoundDevice find(ScanI2C::DeviceType) const override; ScanI2C::FoundDevice find(ScanI2C::DeviceType) const override;

2
src/input/kbI2cBase.cpp
View File

@ -33,7 +33,7 @@ int32_t KbI2cBase::runOnce()
if (cardkb_found.address == 0x00) { if (cardkb_found.address == 0x00) {
// Input device is not detected. Rescan now. // Input device is not detected. Rescan now.
auto i2cScanner = std::unique_ptr<ScanI2CTwoWire>(new ScanI2CTwoWire()); auto i2cScanner = std::unique_ptr<ScanI2CTwoWire>(new ScanI2CTwoWire());
int i2caddr_scan[] = {CARDKB_ADDR, TDECK_KB_ADDR, BBQ10_KB_ADDR}; uint8_t i2caddr_scan[] = {CARDKB_ADDR, TDECK_KB_ADDR, BBQ10_KB_ADDR};
#if defined(I2C_SDA1) #if defined(I2C_SDA1)
i2cScanner->scanPort(ScanI2C::I2CPort::WIRE1, i2caddr_scan); i2cScanner->scanPort(ScanI2C::I2CPort::WIRE1, i2caddr_scan);
#endif #endif