--- a/thermferm/thermferm.c Mon May 02 16:15:37 2016 +0200
+++ b/thermferm/thermferm.c Mon May 09 21:35:55 2016 +0200
@@ -1068,15 +1068,15 @@
unit->mqtt_flag = MQTT_FLAG_MODE;
unit->heater_state = unit->cooler_state = unit->fan_state = unit->door_state = unit->light_state = 0;
unit->heater_wait = unit->cooler_wait = unit->fan_wait = unit->light_wait = 0;
- mqtt_publish_int(unit->uuid, (char *)"state", (unit->mode != UNITMODE_OFF) ? 1 : 0);
+ mqtt_publish_int(unit->alias, (char *)"state", (unit->mode != UNITMODE_OFF) ? 1 : 0);
if (unit->name)
- mqtt_publish_str(unit->uuid, (char *)"name", unit->name);
+ mqtt_publish_str(unit->alias, (char *)"name", unit->name);
if (unit->heater_address)
- mqtt_publish_int(unit->uuid, (char *)"heater", 0);
+ mqtt_publish_int(unit->alias, (char *)"heater", 0);
if (unit->cooler_address)
- mqtt_publish_int(unit->uuid, (char *)"cooler", 0);
+ mqtt_publish_int(unit->alias, (char *)"cooler", 0);
if (unit->fan_address)
- mqtt_publish_int(unit->uuid, (char *)"fan", 0);
+ mqtt_publish_int(unit->alias, (char *)"fan", 0);
if (unit->air_address)
unit->mqtt_flag |= MQTT_FLAG_AIR;
if (unit->beer_address)
@@ -1290,13 +1290,13 @@
if (unit->door_state == 0) {
syslog(LOG_NOTICE, "Unit `%s' door closed", unit->name);
unit->door_state = 1;
- mqtt_publish_str(unit->uuid, (char *)"door", (char *)"closed");
+ mqtt_publish_str(unit->alias, (char *)"door", (char *)"closed");
}
} else {
if (unit->door_state) {
syslog(LOG_NOTICE, "Unit `%s' door opened", unit->name);
unit->door_state = 0;
- mqtt_publish_str(unit->uuid, (char *)"door", (char *)"open");
+ mqtt_publish_str(unit->alias, (char *)"door", (char *)"open");
}
}
}
@@ -1313,13 +1313,13 @@
if (unit->psu_state == 0) {
syslog(LOG_NOTICE, "Unit `%s' PSU (12 volt) is on", unit->name);
unit->psu_state = 1;
- mqtt_publish_str(unit->uuid, (char *)"12volt", (char *)"on");
+ mqtt_publish_str(unit->alias, (char *)"12volt", (char *)"on");
}
} else {
if (unit->psu_state) {
syslog(LOG_NOTICE, "Unit `%s' PSU (12 volt) is off", unit->name);
unit->psu_state = 0;
- mqtt_publish_str(unit->uuid, (char *)"12volt", (char *)"off");
+ mqtt_publish_str(unit->alias, (char *)"12volt", (char *)"off");
}
}
}
@@ -1653,7 +1653,7 @@
syslog(LOG_NOTICE, "Unit `%s' heater %d%% => %d%%", unit->name, unit->heater_state, power);
unit->heater_state = power;
if (unit->heater_address)
- mqtt_publish_int(unit->uuid, (char *)"heater", unit->heater_state);
+ mqtt_publish_int(unit->alias, (char *)"heater", unit->heater_state);
}
}
} else {
@@ -1664,7 +1664,7 @@
syslog(LOG_NOTICE, "Unit `%s' heater On => Off", unit->name);
unit->heater_state = 0;
if (unit->heater_address)
- mqtt_publish_int(unit->uuid, (char *)"heater", 0);
+ mqtt_publish_int(unit->alias, (char *)"heater", 0);
}
}
}
@@ -1684,7 +1684,7 @@
syslog(LOG_NOTICE, "Unit `%s' cooler %d%% => %d%%", unit->name, unit->cooler_state, power);
unit->cooler_state = power;
if (unit->cooler_address)
- mqtt_publish_int(unit->uuid, (char *)"cooler", unit->cooler_state);
+ mqtt_publish_int(unit->alias, (char *)"cooler", unit->cooler_state);
}
}
} else {
@@ -1695,7 +1695,7 @@
syslog(LOG_NOTICE, "Unit `%s' cooler On => Off", unit->name);
unit->cooler_state = 0;
if (unit->cooler_address)
- mqtt_publish_int(unit->uuid, (char *)"cooler", 0);
+ mqtt_publish_int(unit->alias, (char *)"cooler", 0);
}
}
}
@@ -1721,7 +1721,7 @@
syslog(LOG_NOTICE, "Unit `%s' Fan Off => On", unit->name);
unit->fan_state = 100;
if (unit->fan_address)
- mqtt_publish_int(unit->uuid, (char *)"fan", 100);
+ mqtt_publish_int(unit->alias, (char *)"fan", 100);
}
}
} else {
@@ -1732,7 +1732,7 @@
syslog(LOG_NOTICE, "Unit `%s' Fan On => Off", unit->name);
unit->fan_state = 0;
if (unit->fan_address)
- mqtt_publish_int(unit->uuid, (char *)"fan", 0);
+ mqtt_publish_int(unit->alias, (char *)"fan", 0);
}
}
}
@@ -1793,24 +1793,24 @@
* Publish MQTT messages set in flag
*/
if (unit->mqtt_flag & MQTT_FLAG_SP) {
- mqtt_publish_float(unit->uuid, (char *)"setpoint/high", LCDspH, 1);
- mqtt_publish_float(unit->uuid, (char *)"setpoint/low", LCDspL, 1);
+ mqtt_publish_float(unit->alias, (char *)"setpoint/high", LCDspH, 1);
+ mqtt_publish_float(unit->alias, (char *)"setpoint/low", LCDspL, 1);
}
if (unit->mqtt_flag & MQTT_FLAG_AIR) {
- mqtt_publish_float(unit->uuid, (char *)"air/temperature", unit->air_temperature / 1000.0, 3);
+ mqtt_publish_float(unit->alias, (char *)"air/temperature", unit->air_temperature / 1000.0, 3);
}
if (unit->mqtt_flag & MQTT_FLAG_BEER) {
- mqtt_publish_float(unit->uuid, (char *)"beer/temperature", unit->beer_temperature / 1000.0, 3);
+ mqtt_publish_float(unit->alias, (char *)"beer/temperature", unit->beer_temperature / 1000.0, 3);
}
if (unit->mqtt_flag & MQTT_FLAG_MODE) {
- mqtt_publish_str(unit->uuid, (char *)"mode", (char *)UNITMODE[unit->mode]);
+ mqtt_publish_str(unit->alias, (char *)"mode", (char *)UNITMODE[unit->mode]);
}
if (unit->mqtt_flag & MQTT_FLAG_PROFILE) {
- mqtt_publish_str(unit->uuid, (char *)"profile/uuid", unit->profile);
- mqtt_publish_str(unit->uuid, (char *)"profile/state", (char *)PROFSTATE[unit->prof_state]);
+ mqtt_publish_str(unit->alias, (char *)"profile/uuid", unit->profile);
+ mqtt_publish_str(unit->alias, (char *)"profile/state", (char *)PROFSTATE[unit->prof_state]);
}
if (unit->mqtt_flag & MQTT_FLAG_PERCENT) {
- mqtt_publish_int(unit->uuid, (char *)"profile/percent", unit->prof_percent);
+ mqtt_publish_int(unit->alias, (char *)"profile/percent", unit->prof_percent);
}
unit->mqtt_flag = 0;
} /* for units */
@@ -1928,12 +1928,12 @@
if (unit->mode != UNITMODE_OFF) {
if (unit->heater_address)
- mqtt_publish_int(unit->uuid, (char *)"heater", 0);
+ mqtt_publish_int(unit->alias, (char *)"heater", 0);
if (unit->cooler_address)
- mqtt_publish_int(unit->uuid, (char *)"cooler", 0);
+ mqtt_publish_int(unit->alias, (char *)"cooler", 0);
if (unit->fan_address)
- mqtt_publish_int(unit->uuid, (char *)"fan", 0);
- mqtt_publish_int(unit->uuid, (char *)"state", 0);
+ mqtt_publish_int(unit->alias, (char *)"fan", 0);
+ mqtt_publish_int(unit->alias, (char *)"state", 0);
}
/*