jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-19 08:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

structual changes

Browse Source 
structual changes
This commit is contained in:
device111 2020-02-18 09:49:53 +01:00
parent 01fbe69824
commit 2e0a06c19a
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tasmota/xsns_64_aht10.ino
View File

@ -56,12 +56,12 @@ bool begin()
else else
{ {
return false; return false;
} }
} }
bool AHT10Read(void) bool AHT10Read(void)
{ {
unsigned long result, temp[6]; unsigned long result_t, result_h, temp[6];
if (AHT10.valid) { AHT10.valid--; } if (AHT10.valid) { AHT10.valid--; }
@ -69,15 +69,17 @@ bool AHT10Read(void)
Wire.write(eSensorMeasureCmd, 3); Wire.write(eSensorMeasureCmd, 3);
Wire.endTransmission(); Wire.endTransmission();
delay(100); delay(100);
Wire.requestFrom(AHT10_ADDR, 6); Wire.requestFrom(AHT10_ADDR, 6);
for(unsigned char i = 0; Wire.available() > 0; i++) for(unsigned char i = 0; Wire.available() > 0; i++)
{ {
temp[i] = Wire.read(); temp[i] = Wire.read();
} }
result_h = ((temp[1] << 16) | (temp[2] << 8) | temp[3]) >> 4;
result_t = ((temp[3] & 0x0F) << 16) | (temp[4] << 8) | temp[5];
AHT10.humidity = (((temp[1] << 16) | (temp[2] << 8) | temp[3]) >> 4)* 100 / 1048576; AHT10.humidity = result_h * 100 / 1048576;
AHT10.temperature = ((200 * (((temp[3] & 0x0F) << 16) | (temp[4] << 8) | temp[5])) / 1048576) - 50; AHT10.temperature = ((200 * result_t) / 1048576) - 50;
if (isnan(AHT10.temperature) || isnan(AHT10.humidity)) { return false; } if (isnan(AHT10.temperature) || isnan(AHT10.humidity)) { return false; }
@ -97,12 +99,12 @@ unsigned char readStatus(void)
void AHT10Detect(void) void AHT10Detect(void)
{ {
if (I2cActive(AHT10_ADDR)) if (I2cActive(AHT10_ADDR))
{ {
return; return;
} }
if (begin()) if (begin())
{ {
I2cSetActiveFound(AHT10_ADDR, AHT10.name); I2cSetActiveFound(AHT10_ADDR, AHT10.name);
AHT10.count = 1; AHT10.count = 1;