mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some code refactoring

This commit is contained in:
Theo Arends 2020-06-02 12:09:31 +02:00
parent eb5ebfbf0f
commit e57bbb2b7d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasmota/xsns_26_lm75ad.ino
View File

@ -89,7 +89,7 @@ void LM75ADShow(bool json)
dtostrfd(t, Settings.flag2.temperature_resolution, temperature); dtostrfd(t, Settings.flag2.temperature_resolution, temperature);
if (json) { if (json) {
ResponseAppend_P(PSTR(",\"LM75AD\":{\"" D_JSON_TEMPERATURE "\":%s}"), temperature); ResponseAppend_P(JSON_SNS_TEMP, "LM75AD", temperature);
#ifdef USE_DOMOTICZ #ifdef USE_DOMOTICZ
if (0 == tele_period) DomoticzSensor(DZ_TEMP, temperature); if (0 == tele_period) DomoticzSensor(DZ_TEMP, temperature);
#endif // USE_DOMOTICZ #endif // USE_DOMOTICZ

2
tasmota/xsns_59_ds1624.ino
View File

@ -184,7 +184,7 @@ void DS1624Show(bool json)
dtostrfd(ds1624_sns[i].value, Settings.flag2.temperature_resolution, temperature); dtostrfd(ds1624_sns[i].value, Settings.flag2.temperature_resolution, temperature);
if (json) { if (json) {
ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s}"), ds1624_sns[i].name, temperature); ResponseAppend_P(JSON_SNS_TEMP, ds1624_sns[i].name, temperature);
if ((0 == tele_period) && once) { if ((0 == tele_period) && once) {
#ifdef USE_DOMOTICZ #ifdef USE_DOMOTICZ
DomoticzSensor(DZ_TEMP, temperature); DomoticzSensor(DZ_TEMP, temperature);

8
tasmota/xsns_72_mcp9808.ino
View File

@ -55,9 +55,9 @@ float MCP9808Read(uint8_t addr) {
void MCP9808Detect(void) { void MCP9808Detect(void) {
for (uint8_t i = 0; i < MCP9808_MAX_SENSORS; i++) { for (uint8_t i = 0; i < MCP9808_MAX_SENSORS; i++) {
if (!I2cSetDevice(MCP9808_START_ADDRESS + i)) { continue; } if (!I2cSetDevice(MCP9808_START_ADDRESS + i)) { continue; }
if (mcp9808.begin(MCP9808_START_ADDRESS + i)) { if (mcp9808.begin(MCP9808_START_ADDRESS + i)) {
mcp9808_sensors[mcp9808_cfg.count].address = MCP9808_START_ADDRESS + i; mcp9808_sensors[mcp9808_cfg.count].address = MCP9808_START_ADDRESS + i;
I2cSetActiveFound(mcp9808_sensors[mcp9808_cfg.count].address, mcp9808_cfg.types); I2cSetActiveFound(mcp9808_sensors[mcp9808_cfg.count].address, mcp9808_cfg.types);
mcp9808.setResolution (mcp9808_sensors[mcp9808_cfg.count].address, 2); // Set Resolution to 0.125°C mcp9808.setResolution (mcp9808_sensors[mcp9808_cfg.count].address, 2); // Set Resolution to 0.125°C
@ -77,7 +77,7 @@ void MCP9808Show(bool json) {
for (uint32_t i = 0; i < mcp9808_cfg.count; i++) { for (uint32_t i = 0; i < mcp9808_cfg.count; i++) {
char temperature[33]; char temperature[33];
dtostrfd(mcp9808_sensors[i].temperature, Settings.flag2.temperature_resolution, temperature); dtostrfd(mcp9808_sensors[i].temperature, Settings.flag2.temperature_resolution, temperature);
char sensor_name[10]; char sensor_name[10];
strlcpy(sensor_name, mcp9808_cfg.types, sizeof(sensor_name)); strlcpy(sensor_name, mcp9808_cfg.types, sizeof(sensor_name));
if (mcp9808_cfg.count > 1) { if (mcp9808_cfg.count > 1) {
@ -85,7 +85,7 @@ void MCP9808Show(bool json) {
} }
if (json) { if (json) {
ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_TEMPERATURE "\":%s}"), sensor_name, temperature); ResponseAppend_P(JSON_SNS_TEMP, sensor_name, temperature);
if ((0 == tele_period) && (0 == i)) { if ((0 == tele_period) && (0 == i)) {
#ifdef USE_DOMOTICZ #ifdef USE_DOMOTICZ
DomoticzSensor(DZ_TEMP, temperature); DomoticzSensor(DZ_TEMP, temperature);