--- a/thermferm/rdconfig.c Mon Jun 26 13:58:11 2017 +0200
+++ b/thermferm/rdconfig.c Mon Jun 26 19:21:07 2017 +0200
@@ -81,6 +81,8 @@
free(tmp2->air_address);
if (tmp2->beer_address)
free(tmp2->beer_address);
+ if (tmp2->chiller_address)
+ free(tmp2->chiller_address);
if (tmp2->heater_address)
free(tmp2->heater_address);
if (tmp2->cooler_address)
@@ -383,6 +385,24 @@
return 1;
}
}
+ if (tmp3->chiller_address) {
+ if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "CHILLER_ADDRESS", "%s", tmp3->chiller_address)) < 0)) {
+ syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
+ return 1;
+ }
+ if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "CHILLER_STATE", "%d", tmp3->chiller_state)) < 0)) {
+ syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
+ return 1;
+ }
+ if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "CHILLER_TEMPERATURE", "%d", tmp3->chiller_temperature)) < 0)) {
+ syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
+ return 1;
+ }
+ if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "CHILLER_IDX", "%d", tmp3->chiller_idx)) < 0)) {
+ syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
+ return 1;
+ }
+ }
if (tmp3->heater_address) {
if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "HEATER_ADDRESS", "%s", tmp3->heater_address)) < 0)) {
syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
@@ -1069,15 +1089,15 @@
unit = (units_list *)malloc(sizeof(units_list));
unit->next = NULL;
unit->version = 1;
- unit->uuid = unit->name = unit->alias = unit->air_address = unit->beer_address = unit->heater_address = \
+ unit->uuid = unit->name = unit->alias = unit->air_address = unit->beer_address = unit->chiller_address = unit->heater_address = \
unit->cooler_address = unit->fan_address = unit->door_address = \
unit->light_address = unit->psu_address = unit->profile = NULL;
unit->volume = unit->prof_peak_abs = unit->prof_peak_rel = 0.0;
- unit->air_temperature = unit->beer_temperature = unit->beer_set = unit->fridge_set = 20.0;
- unit->air_state = unit->beer_state = 1; // missing
+ unit->air_temperature = unit->beer_temperature = unit->chiller_temperature = unit->beer_set = unit->fridge_set = 20.0;
+ unit->air_state = unit->beer_state = unit->chiller_state = 1; // missing
unit->heater_state = unit->cooler_state = unit->fan_state = unit->door_state = \
unit->light_state = unit->psu_state = unit->mode = unit->prof_state = 0;
- unit->air_idx = unit->beer_idx = unit->heater_idx = unit->cooler_idx = unit->fan_idx = \
+ unit->air_idx = unit->beer_idx = unit->chiller_idx = unit->heater_idx = unit->cooler_idx = unit->fan_idx = \
unit->door_idx = unit->light_idx = unit->psu_idx = 0;
unit->heater_delay = unit->cooler_delay = unit->fan_delay = 20; /* 5 minutes delay */
unit->light_delay = 1; /* 15 seconds delay */
@@ -1160,6 +1180,27 @@
unit->beer_temperature = ival;
xmlFree(key);
}
+ if ((!xmlStrcmp(cur->name, (const xmlChar *)"CHILLER_ADDRESS"))) {
+ unit->chiller_address = (char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+ }
+ if ((!xmlStrcmp(cur->name, (const xmlChar *)"CHILLER_STATE"))) {
+ key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+ if (sscanf((const char *)key, "%d", &ival) == 1)
+ unit->chiller_state = ival;
+ xmlFree(key);
+ }
+ if ((!xmlStrcmp(cur->name, (const xmlChar *)"CHILLER_IDX"))) {
+ key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+ if (sscanf((const char *)key, "%d", &ival) == 1)
+ unit->chiller_idx = ival;
+ xmlFree(key);
+ }
+ if ((!xmlStrcmp(cur->name, (const xmlChar *)"CHILLER_TEMPERATURE"))) {
+ key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+ if (sscanf((const char *)key, "%d", &ival) == 1)
+ unit->chiller_temperature = ival;
+ xmlFree(key);
+ }
if ((!xmlStrcmp(cur->name, (const xmlChar *)"HEATER_ADDRESS"))) {
unit->heater_address = (char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
}