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

remember which devices were scanned on which bus and set them accordingly.

Browse Source
This commit is contained in:
Thomas Göttgens
2022-11-12 17:12:40 +01:00
parent 7a67388a97
commit 861ded37db
23 changed files with 177 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/detect/i2cScan.h
View File

@@ -44,25 +44,25 @@ void printATECCInfo()
#endif
}
uint16_t getRegisterValue(uint8_t address, uint8_t reg, uint8_t length) {
uint16_t getRegisterValue(uint8_t address, uint8_t reg, uint8_t length, TwoWire myWire) {
uint16_t value = 0x00;
Wire.beginTransmission(address);
Wire.write(reg);
Wire.endTransmission();
myWire.beginTransmission(address);
myWire.write(reg);
myWire.endTransmission();
delay(20);
Wire.requestFrom(address, length);
DEBUG_MSG("Wire.available() = %d\n", Wire.available());
if (Wire.available() == 2) {
myWire.requestFrom(address, length);
DEBUG_MSG("Wire.available() = %d\n", myWire.available());
if (myWire.available() == 2) {
// Read MSB, then LSB
value = (uint16_t)Wire.read() << 8;
value |= Wire.read();
} else if (Wire.available()) {
value = Wire.read();
value = (uint16_t)myWire.read() << 8;
value |= myWire.read();
} else if (myWire.available()) {
value = myWire.read();
}
return value;
}
uint8_t oled_probe(byte addr)
uint8_t oled_probe(byte addr, TwoWire myWire)
{
uint8_t r = 0;
uint8_t r_prev = 0;
@@ -70,12 +70,12 @@ uint8_t oled_probe(byte addr)
uint8_t o_probe = 0;
do {
r_prev = r;
Wire.beginTransmission(addr);
Wire.write(0x00);
Wire.endTransmission();
Wire.requestFrom((int)addr, 1);
if (Wire.available()) {
r = Wire.read();
myWire.beginTransmission(addr);
myWire.write(0x00);
myWire.endTransmission();
myWire.requestFrom((int)addr, 1);
if (myWire.available()) {
r = myWire.read();
}
r &= 0x0f;
@@ -90,24 +90,24 @@ uint8_t oled_probe(byte addr)
return o_probe;
}
void scanI2Cdevice(bool partial)
void scanI2Cdevice(TwoWire myWire, uint8_t busnum)
{
byte err, addr;
uint16_t registerValue = 0x00;
int nDevices = 0;
for (addr = 1; addr < 127; addr++) {
if (partial && addr != SSD1306_ADDRESS && addr != ST7567_ADDRESS && addr != XPOWERS_AXP192_AXP2101_ADDRESS)
continue;
Wire.beginTransmission(addr);
err = Wire.endTransmission();
myWire.beginTransmission(addr);
err = myWire.endTransmission();
if (err == 0) {
DEBUG_MSG("I2C device found at address 0x%x\n", addr);
i2cScanMap[addr] = {addr, busnum};
nDevices++;
if (addr == SSD1306_ADDRESS) {
screen_found = addr;
screen_model = oled_probe(addr);
screen_model = oled_probe(addr, myWire);
if (screen_model == 1) {
DEBUG_MSG("ssd1306 display found\n");
} else if (screen_model == 2) {
@@ -118,8 +118,7 @@ void scanI2Cdevice(bool partial)
}
#ifndef ARCH_PORTDUINO
if (addr == ATECC608B_ADDR) {
keystore_found = addr;
if (atecc.begin(keystore_found) == true) {
if (atecc.begin(ATECC608B_ADDR) == true) {
DEBUG_MSG("ATECC608B initialized\n");
} else {
DEBUG_MSG("ATECC608B initialization failed\n");
@@ -129,24 +128,21 @@ void scanI2Cdevice(bool partial)
#endif
#ifdef RV3028_RTC
if (addr == RV3028_RTC){
rtc_found = addr;
DEBUG_MSG("RV3028 RTC found\n");
Melopero_RV3028 rtc;
rtc.initI2C();
rtc.initI2C(myWire);
rtc.writeToRegister(0x35,0x07); // no Clkout
rtc.writeToRegister(0x37,0xB4);
}
#endif
#ifdef PCF8563_RTC
if (addr == PCF8563_RTC){
rtc_found = addr;
DEBUG_MSG("PCF8563 RTC found\n");
}
#endif
if (addr == CARDKB_ADDR) {
cardkb_found = addr;
// Do we have the RAK14006 instead?
registerValue = getRegisterValue(addr, 0x04, 1);
registerValue = getRegisterValue(addr, 0x04, 1, myWire);
if (registerValue == 0x02) { // KEYPAD_VERSION
DEBUG_MSG("RAK14004 found\n");
kb_model = 0x02;
@@ -161,12 +157,11 @@ void scanI2Cdevice(bool partial)
}
#ifdef HAS_PMU
if (addr == XPOWERS_AXP192_AXP2101_ADDRESS) {
pmu_found = true;
DEBUG_MSG("axp192/axp2101 PMU found\n");
}
#endif
if (addr == BME_ADDR || addr == BME_ADDR_ALTERNATE) {
registerValue = getRegisterValue(addr, 0xD0, 1); // GET_ID
registerValue = getRegisterValue(addr, 0xD0, 1, myWire); // GET_ID
if (registerValue == 0x61) {
DEBUG_MSG("BME-680 sensor found at address 0x%x\n", (uint8_t)addr);
nodeTelemetrySensorsMap[TelemetrySensorType_BME680] = addr;
@@ -179,7 +174,7 @@ void scanI2Cdevice(bool partial)
}
}
if (addr == INA_ADDR || addr == INA_ADDR_ALTERNATE) {
registerValue = getRegisterValue(addr, 0xFE, 2);
registerValue = getRegisterValue(addr, 0xFE, 2, myWire);
DEBUG_MSG("Register MFG_UID: 0x%x\n", registerValue);
if (registerValue == 0x5449) {
DEBUG_MSG("INA260 sensor found at address 0x%x\n", (uint8_t)addr);
@@ -226,5 +221,5 @@ void scanI2Cdevice(bool partial)
DEBUG_MSG("%i I2C devices found\n",nDevices);
}
#else
void scanI2Cdevice(bool partial) {}
void scanI2Cdevice() {}
#endif