pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-12 08:19:39 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

dafuq?

Browse Source
This commit is contained in:
Thomas Göttgens 2024-10-16 13:25:06 +02:00
parent 7b062293f8
commit d5712714e6
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/input/cardKbI2cImpl.cpp
View File

@ -9,9 +9,6 @@ CardKbI2cImpl::CardKbI2cImpl() : KbI2cBase("cardKB") {}
void CardKbI2cImpl::init()
{
<<<<<<< HEAD
if ((cardkb_found.address == 0x00) || (kb_model == 0x12)) {
=======
if (kb_model == 0x12) {
disable();
return;
@ -59,7 +56,6 @@ void CardKbI2cImpl::init()
}
#else
if (cardkb_found.address == 0x00) {
>>>>>>> 96bcc781ee31f68e5eb7b778306525c630435bdd
disable();
return;
}