jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 04:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ads1115 refactoring to avoid code duplication

Browse Source 
Signed-off-by: Nagy Attila Gabor <mrbig@sneaker.hu>
This commit is contained in:
Nagy Attila Gabor 2020-08-21 15:28:16 +02:00
parent c48e69c945
commit 5f447e38a7
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tasmota/xsns_12_ads1115.ino
View File

@ -180,6 +180,17 @@ void Ads1115Detect(void)
} }
} }
// Create the identifier of the the selected sensor
void Ads1115Label(char* label, uint32_t maxsize, uint8_t address) {
if (1 == Ads1115.count) {
// "ADS1115":{"A0":3240,"A1":3235,"A2":3269,"A3":3269}
snprintf_P(label, maxsize, PSTR("ADS1115"));
} else {
// "ADS1115-48":{"A0":3240,"A1":3235,"A2":3269,"A3":3269},"ADS1115-49":{"A0":3240,"A1":3235,"A2":3269,"A3":3269}
snprintf_P(label, maxsize, PSTR("ADS1115%c%02x"), IndexSeparator(), address);
}
}
#ifdef USE_RULES #ifdef USE_RULES
// Check every 250ms if there are relevant changes in any of the analog inputs // Check every 250ms if there are relevant changes in any of the analog inputs
// and if so then trigger a message // and if so then trigger a message
@ -208,13 +219,7 @@ void AdsEvery250ms(void)
Ads1115.address = old_address; Ads1115.address = old_address;
if (changed) { if (changed) {
char label[15]; char label[15];
if (1 == Ads1115.count) { Ads1115Label(label, sizeof(label), Ads1115.addresses[t]);
// "ADS1115":{"A0":3240,"A1":3235,"A2":3269,"A3":3269}
snprintf_P(label, sizeof(label), PSTR("ADS1115"));
} else {
// "ADS1115-48":{"A0":3240,"A1":3235,"A2":3269,"A3":3269},"ADS1115-49":{"A0":3240,"A1":3235,"A2":3269,"A3":3269}
snprintf_P(label, sizeof(label), PSTR("ADS1115%c%02x"), IndexSeparator(), Ads1115.addresses[t]);
}
Response_P(PSTR("{\"%s\":{"), label); Response_P(PSTR("{\"%s\":{"), label);
@ -252,13 +257,7 @@ void Ads1115Show(bool json)
Ads1115.address = old_address; Ads1115.address = old_address;
char label[15]; char label[15];
if (1 == Ads1115.count) { Ads1115Label(label, sizeof(label), Ads1115.addresses[t]);
// "ADS1115":{"A0":3240,"A1":3235,"A2":3269,"A3":3269}
snprintf_P(label, sizeof(label), PSTR("ADS1115"));
} else {
// "ADS1115-48":{"A0":3240,"A1":3235,"A2":3269,"A3":3269},"ADS1115-49":{"A0":3240,"A1":3235,"A2":3269,"A3":3269}
snprintf_P(label, sizeof(label), PSTR("ADS1115%c%02x"), IndexSeparator(), Ads1115.addresses[t]);
}
if (json) { if (json) {
ResponseAppend_P(PSTR(",\"%s\":{"), label); ResponseAppend_P(PSTR(",\"%s\":{"), label);