kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Ben Meadors
2026-04-18 11:17:03 -05:00
committed by GitHub
co-authored by GitHub
parent c48b5ab556 e589de2d6e
commit 8fd0a7f283
6 changed files with 96 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detect/ScanI2C.h
+2 -1
View File
@@ -95,7 +95,8 @@ class ScanI2C
SFA30,
CW2015,
SCD30,
ADS1115
ADS1115,
CST3530,
} DeviceType;
// typedef uint8_t DeviceAddress;
src/detect/ScanI2CTwoWire.cpp
+7 -7
View File
@@ -589,21 +589,21 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
{
// T-Deck pro V1.1 new touch panel use CST3530
int retry = 5;
while(retry--) {
while (retry--) {
uint8_t buffer[7];
uint8_t r_cmd[] = {0x0d0,0x03,0x00,0x00};
uint8_t r_cmd[] = {0x0d0, 0x03, 0x00, 0x00};
i2cBus->beginTransmission(addr.address);
i2cBus->write(r_cmd, sizeof(r_cmd));
if(i2cBus->endTransmission() == 0){
i2cBus->requestFrom((int)addr.address,7);
i2cBus->readBytes(buffer,7);
if(buffer[2] == 0xCA && buffer[3] == 0xCA){
if (i2cBus->endTransmission() == 0) {
i2cBus->requestFrom((int)addr.address, 7);
i2cBus->readBytes(buffer, 7);
if (buffer[2] == 0xCA && buffer[3] == 0xCA) {
logFoundDevice("CST3530", (uint8_t)addr.address);
type = CST3530;
break;
}
}
uint8_t cmd1[] = {0xD0,0x00,0x04,0x00};
uint8_t cmd1[] = {0xD0, 0x00, 0x04, 0x00};
i2cBus->beginTransmission(addr.address);
i2cBus->write(cmd1, sizeof(cmd1));
i2cBus->endTransmission();