rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-29 14:10:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'portexpander-keyboard' of https://github.com/meshtastic/firmware into portexpander-keyboard

Browse Source
This commit is contained in:
Thomas Göttgens
2024-10-16 13:19:11 +02:00
parent d36c02f271 b22046a0f1
commit 7b062293f8
639 changed files with 55882 additions and 10480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/input/cardKbI2cImpl.cpp
View File

@@ -16,14 +16,14 @@ void CardKbI2cImpl::init()
disable();
return;
}
#ifndef ARCH_PORTDUINO
#if !MESHTASTIC_EXCLUDE_I2C && !defined(ARCH_PORTDUINO)
if (cardkb_found.address == 0x00) {
LOG_DEBUG("Rescanning for I2C keyboard\n");
LOG_DEBUG("Rescanning for I2C keyboard");
uint8_t i2caddr_scan[] = {CARDKB_ADDR, TDECK_KB_ADDR, BBQ10_KB_ADDR};
uint8_t i2caddr_asize = 3;
auto i2cScanner = std::unique_ptr<ScanI2CTwoWire>(new ScanI2CTwoWire());
#if defined(I2C_SDA1)
#if WIRE_INTERFACES_COUNT == 2
i2cScanner->scanPort(ScanI2C::I2CPort::WIRE1, i2caddr_scan, i2caddr_asize);
#endif
i2cScanner->scanPort(ScanI2C::I2CPort::WIRE, i2caddr_scan, i2caddr_asize);
@@ -48,7 +48,7 @@ void CardKbI2cImpl::init()
break;
default:
// use this as default since it's also just zero
LOG_WARN("kb_info.type is unknown(0x%02x), setting kb_model=0x00\n", kb_info.type);
LOG_WARN("kb_info.type is unknown(0x%02x), setting kb_model=0x00", kb_info.type);
kb_model = 0x00;
}
}
@@ -60,9 +60,9 @@ void CardKbI2cImpl::init()
#else
if (cardkb_found.address == 0x00) {
>>>>>>> 96bcc781ee31f68e5eb7b778306525c630435bdd
disable();
return;
}
#endif
inputBroker->registerSource(this);
disable();
return;
}
#endif
inputBroker->registerSource(this);
}