--- a/thermferm/rdconfig.c Thu Jan 10 16:33:42 2019 +0100
+++ b/thermferm/rdconfig.c Mon Jan 14 22:46:27 2019 +0100
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2014-2018
+ * Copyright (C) 2014-2019
*
* Michiel Broek <mbroek at mbse dot eu>
*
@@ -41,11 +41,13 @@
const char PIDMODE[3][5] = { "NONE", "AUTO", "BOO" };
+
+int parseSteps(xmlDocPtr doc, xmlNodePtr cur, prof_step **step);
+
void killconfig(void)
{
units_list *tmp2, *oldtmp2;
- profiles_list *tmp3, *oldtmp3;
- prof_step *tmp4, *oldtmp4;
+ prof_step *step, *oldstep;
devices_list *device, *olddev;
#ifdef USE_SIMULATOR
simulator_list *simulator, *oldsim;
@@ -108,8 +110,18 @@
free(tmp2->door_address);
if (tmp2->psu_address)
free(tmp2->psu_address);
- if (tmp2->profile)
- free(tmp2->profile);
+ if (tmp2->profile_uuid)
+ free(tmp2->profile_uuid);
+ if (tmp2->profile_name)
+ free(tmp2->profile_name);
+ if (tmp2->profile_steps) {
+ for (step = tmp2->profile_steps; step; step = oldstep) {
+ if (step->name)
+ free(step->name);
+ oldstep = step->next;
+ free(step);
+ }
+ }
if (tmp2->PID_cool)
free(tmp2->PID_cool);
if (tmp2->PID_heat)
@@ -118,22 +130,6 @@
}
Config.units = NULL;
- for (tmp3 = Config.profiles; tmp3; tmp3 = oldtmp3) {
- oldtmp3 = tmp3->next;
- if (tmp3->uuid)
- free(tmp3->uuid);
- if (tmp3->name)
- free(tmp3->name);
- if (tmp3->steps) {
- for (tmp4 = tmp3->steps; tmp4; tmp4 = oldtmp4) {
- oldtmp4 = tmp4->next;
- free(tmp4);
- }
- }
- free(tmp3);
- }
- Config.profiles = NULL;
-
for (device = Config.devices; device; device = olddev) {
olddev = device->next;
if (device->uuid)
@@ -175,7 +171,6 @@
xmlTextWriterPtr writer;
xmlBufferPtr buf;
units_list *tmp3;
- profiles_list *tmp4;
prof_step *tmp5;
devices_list *device;
#ifdef USE_SIMULATOR
@@ -208,823 +203,253 @@
/*
* Start the document with the xml default for the version,
- * encoding ISO 8859-1 and the default for the standalone
- * declaration.
+ * encoding UTF-8 and the default for the standalone declaration.
*/
- if ((rc = xmlTextWriterStartDocument(writer, NULL, MY_ENCODING, NULL)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterStartDocument");
- return 1;
- }
+ xmlTextWriterStartDocument(writer, NULL, MY_ENCODING, NULL);
/*
* Start an element named "THERMFERM". Since thist is the first
* element, this will be the root element of the document.
*/
- if ((rc = xmlTextWriterStartElement(writer, BAD_CAST "THERMFERM")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterStartElement");
- return 1;
- }
+ xmlTextWriterStartElement(writer, BAD_CAST "THERMFERM");
+
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "NAME", "%s", Config.name);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "UUID", "%s", Config.uuid);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "LISTEN_PORT", "%d", Config.my_port);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "TEMPFORMAT", "%c", Config.tempFormat);
- /*
- * Add an attribute with name "VERSION" and value "1" to THERMFERM.
- */
- if ((rc = xmlTextWriterWriteElement(writer, BAD_CAST "VERSION", BAD_CAST "1")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "NAME", "%s", Config.name)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "UUID", "%s", Config.uuid)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "LISTEN_PORT", "%d", Config.my_port)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "TEMPFORMAT", "%c", Config.tempFormat)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "TEMP_ADDRESS", "%s", Config.temp_address)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "TEMP_STATE", "%d", Config.temp_state)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "TEMP_VALUE", "%d", Config.temp_value)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "HUM_ADDRESS", "%s", Config.hum_address)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "HUM_STATE", "%d", Config.hum_state)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "HUM_VALUE", "%d", Config.hum_value)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "TEMP_HUM_IDX", "%d", Config.temp_hum_idx)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "NEXT_UNIT", "%d", Config.next_unit)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "MQTT_HOST", "%s", Config.mqtt_host)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "MQTT_PORT", "%d", Config.mqtt_port)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "TEMP_ADDRESS", "%s", Config.temp_address);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "TEMP_STATE", "%d", Config.temp_state);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "TEMP_VALUE", "%d", Config.temp_value);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "HUM_ADDRESS", "%s", Config.hum_address);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "HUM_STATE", "%d", Config.hum_state);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "HUM_VALUE", "%d", Config.hum_value);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "TEMP_HUM_IDX", "%d", Config.temp_hum_idx);
+
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "NEXT_UNIT", "%d", Config.next_unit);
+
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "MQTT_HOST", "%s", Config.mqtt_host);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "MQTT_PORT", "%d", Config.mqtt_port);
if (Config.mqtt_username && Config.mqtt_password) {
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "MQTT_USER", "%s", Config.mqtt_username)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "MQTT_PASS", "%s", Config.mqtt_password)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "MQTT_USER", "%s", Config.mqtt_username);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "MQTT_PASS", "%s", Config.mqtt_password);
}
/*
* Start an element named "LCDS" as child of THERMFERM.
*/
- if ((rc = xmlTextWriterStartElement(writer, BAD_CAST "LCDS")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterStartElement");
- return 1;
- }
+ xmlTextWriterStartElement(writer, BAD_CAST "LCDS");
/*
* Start one LCD. It is possible to connect 7 LCD displays on the i2c bus.
* However this program doesn't use more then one yet.
*/
- if ((rc = xmlTextWriterStartElement(writer, BAD_CAST "LCD")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterStartElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteElement(writer, BAD_CAST "VERSION", BAD_CAST "1")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "ADDRESS", "0x%x", Config.lcd_address)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "COLUMNS", "%d", Config.lcd_cols)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "ROWS", "%d", Config.lcd_rows)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- /*
- * Close the element named LCD.
- */
- if ((rc = xmlTextWriterEndElement(writer)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterEndElement");
- return 1;
- }
- /*
- * Close the element LCDS.
- */
- if ((rc = xmlTextWriterEndElement(writer)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterEndElement");
- return 1;
- }
+ xmlTextWriterStartElement(writer, BAD_CAST "LCD");
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "ADDRESS", "0x%x", Config.lcd_address);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "COLUMNS", "%d", Config.lcd_cols);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "ROWS", "%d", Config.lcd_rows);
+ xmlTextWriterEndElement(writer); // close LCD
+ xmlTextWriterEndElement(writer); // close LCDS
/*
* Fermenter units
*/
if (Config.units) {
- if ((rc = xmlTextWriterStartElement(writer, BAD_CAST "FERMENTERS")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterStartElement");
- return 1;
- }
+ xmlTextWriterStartElement(writer, BAD_CAST "FERMENTERS");
for (tmp3 = Config.units; tmp3; tmp3 = tmp3->next) {
- /*
- * Only configuration items are written, measured values and states
- * are written to a state file.
- */
- if ((rc = xmlTextWriterStartElement(writer, BAD_CAST "UNIT")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterStartElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteElement(writer, BAD_CAST "VERSION", BAD_CAST "1")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "UUID", "%s", tmp3->uuid)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PRODUCT_UUID", "%s", tmp3->product_uuid)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PRODUCT_CODE", "%s", tmp3->product_code)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PRODUCT_NAME", "%s", tmp3->product_name)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "ALIAS", "%s", tmp3->alias)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "VOLUME", "%.1f", tmp3->volume)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
+ xmlTextWriterStartElement(writer, BAD_CAST "FERMENTER");
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "UUID", "%s", tmp3->uuid);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PRODUCT_UUID", "%s", tmp3->product_uuid);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PRODUCT_CODE", "%s", tmp3->product_code);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PRODUCT_NAME", "%s", tmp3->product_name);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "ALIAS", "%s", tmp3->alias);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "VOLUME", "%.1f", tmp3->volume);
+
if (tmp3->air_address) {
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "AIR_ADDRESS", "%s", tmp3->air_address)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "AIR_STATE", "%d", tmp3->air_state)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "AIR_TEMPERATURE", "%d", tmp3->air_temperature)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "AIR_IDX", "%d", tmp3->air_idx)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "AIR_ADDRESS", "%s", tmp3->air_address);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "AIR_STATE", "%d", tmp3->air_state);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "AIR_TEMPERATURE", "%d", tmp3->air_temperature);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "AIR_IDX", "%d", tmp3->air_idx);
}
if (tmp3->beer_address) {
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "BEER_ADDRESS", "%s", tmp3->beer_address)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "BEER_STATE", "%d", tmp3->beer_state)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "BEER_TEMPERATURE", "%d", tmp3->beer_temperature)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "BEER_IDX", "%d", tmp3->beer_idx)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "BEER_ADDRESS", "%s", tmp3->beer_address);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "BEER_STATE", "%d", tmp3->beer_state);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "BEER_TEMPERATURE", "%d", tmp3->beer_temperature);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "BEER_IDX", "%d", tmp3->beer_idx);
}
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;
- }
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "CHILLER_ADDRESS", "%s", tmp3->chiller_address);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "CHILLER_STATE", "%d", tmp3->chiller_state);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "CHILLER_TEMPERATURE", "%d", tmp3->chiller_temperature);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "CHILLER_IDX", "%d", tmp3->chiller_idx);
}
if (tmp3->heater_address) {
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "HEATER_ADDRESS", "%s", tmp3->heater_address)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "HEATER_STATE", "%d", tmp3->heater_state)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "HEATER_DELAY", "%d", tmp3->heater_delay)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "HEATER_USAGE", "%d", tmp3->heater_usage)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "HEATER_IDX", "%d", tmp3->heater_idx)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "HEATER_ADDRESS", "%s", tmp3->heater_address);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "HEATER_STATE", "%d", tmp3->heater_state);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "HEATER_DELAY", "%d", tmp3->heater_delay);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "HEATER_USAGE", "%d", tmp3->heater_usage);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "HEATER_IDX", "%d", tmp3->heater_idx);
}
if (tmp3->cooler_address) {
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "COOLER_ADDRESS", "%s", tmp3->cooler_address)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "COOLER_STATE", "%d", tmp3->cooler_state)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "COOLER_DELAY", "%d", tmp3->cooler_delay)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "COOLER_USAGE", "%d", tmp3->cooler_usage)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "COOLER_IDX", "%d", tmp3->cooler_idx)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "COOLER_ADDRESS", "%s", tmp3->cooler_address);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "COOLER_STATE", "%d", tmp3->cooler_state);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "COOLER_DELAY", "%d", tmp3->cooler_delay);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "COOLER_USAGE", "%d", tmp3->cooler_usage);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "COOLER_IDX", "%d", tmp3->cooler_idx);
}
if (tmp3->fan_address) {
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "FAN_ADDRESS", "%s", tmp3->fan_address)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "FAN_STATE", "%d", tmp3->fan_state)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "FAN_DELAY", "%d", tmp3->fan_delay)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "FAN_USAGE", "%d", tmp3->fan_usage)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "FAN_IDX", "%d", tmp3->fan_idx)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "FAN_ADDRESS", "%s", tmp3->fan_address);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "FAN_STATE", "%d", tmp3->fan_state);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "FAN_DELAY", "%d", tmp3->fan_delay);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "FAN_USAGE", "%d", tmp3->fan_usage);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "FAN_IDX", "%d", tmp3->fan_idx);
}
if (tmp3->light_address) {
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "LIGHT_ADDRESS", "%s", tmp3->light_address)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "LIGHT_STATE", "%d", tmp3->light_state)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "LIGHT_DELAY", "%d", tmp3->light_delay)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "LIGHT_USAGE", "%d", tmp3->light_usage)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "LIGHT_IDX", "%d", tmp3->light_idx)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "LIGHT_ADDRESS", "%s", tmp3->light_address);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "LIGHT_STATE", "%d", tmp3->light_state);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "LIGHT_DELAY", "%d", tmp3->light_delay);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "LIGHT_USAGE", "%d", tmp3->light_usage);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "LIGHT_IDX", "%d", tmp3->light_idx);
}
if (tmp3->door_address) {
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "DOOR_ADDRESS", "%s", tmp3->door_address)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "DOOR_STATE", "%d", tmp3->door_state)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "DOOR_IDX", "%d", tmp3->door_idx)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "DOOR_ADDRESS", "%s", tmp3->door_address);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "DOOR_STATE", "%d", tmp3->door_state);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "DOOR_IDX", "%d", tmp3->door_idx);
}
if (tmp3->psu_address) {
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PSU_ADDRESS", "%s", tmp3->psu_address)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PSU_STATE", "%d", tmp3->psu_state)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PSU_IDX", "%d", tmp3->psu_idx)) < 0)) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "MODE", "%s", UNITMODE[tmp3->mode] )) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "STAGE", "%s", UNITSTAGE[tmp3->stage] )) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "BEER_SET", "%.1f", tmp3->beer_set)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "FRIDGE_SET", "%.1f", tmp3->fridge_set)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "TEMP_SET_MIN", "%.1f", tmp3->temp_set_min)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PSU_ADDRESS", "%s", tmp3->psu_address);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PSU_STATE", "%d", tmp3->psu_state);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PSU_IDX", "%d", tmp3->psu_idx);
}
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "TEMP_SET_MAX", "%.1f", tmp3->temp_set_max)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (tmp3->profile) {
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROFILE", "%s", tmp3->profile)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROF_STARTED", "%d", (unsigned int)tmp3->prof_started)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROF_PAUSED", "%d", (unsigned int)tmp3->prof_paused)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "MODE", "%s", UNITMODE[tmp3->mode] );
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "STAGE", "%s", UNITSTAGE[tmp3->stage] );
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "BEER_SET", "%.1f", tmp3->beer_set);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "FRIDGE_SET", "%.1f", tmp3->fridge_set);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "TEMP_SET_MIN", "%.1f", tmp3->temp_set_min);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "TEMP_SET_MAX", "%.1f", tmp3->temp_set_max);
+
+ if (tmp3->profile_uuid) {
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROFILE_UUID", "%s", tmp3->profile_uuid);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROFILE_NAME", "%s", tmp3->profile_name);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROFILE_INITTEMP_LO", "%.1f", tmp3->profile_inittemp_lo);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROFILE_INITTEMP_HI", "%.1f", tmp3->profile_inittemp_hi);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROFILE_FRIDGE_MODE", "%d", tmp3->profile_fridge_mode);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROFILE_DURATION", "%d", tmp3->profile_duration);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROFILE_TOTALSTEPS", "%d", tmp3->profile_totalsteps);
+ if (tmp3->profile_steps) {
+ xmlTextWriterStartElement(writer, BAD_CAST "PROFILE_STEPS");
+ for (tmp5 = tmp3->profile_steps; tmp5; tmp5 = tmp5->next) {
+ xmlTextWriterStartElement(writer, BAD_CAST "PROFILE_STEP");
+ if (tmp5->name)
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "NAME", "%s", tmp5->name);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "RESTTIME", "%d", tmp5->resttime);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "STEPTIME", "%d", tmp5->steptime);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "TARGET_LO", "%.1f", tmp5->target_lo);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "TARGET_HI", "%.1f", tmp5->target_hi);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "FRIDGE_MODE", "%d", tmp5->fridge_mode);
+ xmlTextWriterEndElement(writer); // close PROFILE_STEP
+ }
+ xmlTextWriterEndElement(writer); // close PROFILE_STEPS
}
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROF_STATE", "%s", PROFSTATE[tmp3->prof_state] )) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROF_PEAK_ABS", "%.3f", tmp3->prof_peak_abs)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROF_PEAK_REL", "%.3f", tmp3->prof_peak_rel)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROF_PRIMARY_DONE", "%d", (unsigned int)tmp3->prof_primary_done)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROF_STARTED", "%d", (unsigned int)tmp3->prof_started);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROF_PAUSED", "%d", (unsigned int)tmp3->prof_paused);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROF_STATE", "%s", PROFSTATE[tmp3->prof_state] );
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROF_PEAK_ABS", "%.3f", tmp3->prof_peak_abs);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROF_PEAK_REL", "%.3f", tmp3->prof_peak_rel);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PROF_PRIMARY_DONE", "%d", (unsigned int)tmp3->prof_primary_done);
}
if (tmp3->PID_cool) {
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_IMAX", "%.2f", tmp3->PID_cool->iMax)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_IGAIN", "%.3f", tmp3->PID_cool->iGain)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_PGAIN", "%.3f", tmp3->PID_cool->pGain)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_DGAIN", "%.3f", tmp3->PID_cool->dGain)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_IDLERANGE", "%.2f", tmp3->PID_cool->idleRange)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_INPUT", "%.2f", tmp3->PID_cool->Input)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_ERR", "%.2f", tmp3->PID_cool->Err)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_ISTATE", "%.2f", tmp3->PID_cool->iState)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_SETP", "%.2f", tmp3->PID_cool->SetP)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_OUTP", "%.2f", tmp3->PID_cool->OutP)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_MODE", "%s", PIDMODE[tmp3->PID_cool->Mode])) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_TYPE", "COOL")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_IMAX", "%.2f", tmp3->PID_cool->iMax);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_IGAIN", "%.3f", tmp3->PID_cool->iGain);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_PGAIN", "%.3f", tmp3->PID_cool->pGain);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_DGAIN", "%.3f", tmp3->PID_cool->dGain);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_IDLERANGE", "%.2f", tmp3->PID_cool->idleRange);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_INPUT", "%.2f", tmp3->PID_cool->Input);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_ERR", "%.2f", tmp3->PID_cool->Err);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_ISTATE", "%.2f", tmp3->PID_cool->iState);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_SETP", "%.2f", tmp3->PID_cool->SetP);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_OUTP", "%.2f", tmp3->PID_cool->OutP);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_MODE", "%s", PIDMODE[tmp3->PID_cool->Mode]);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDC_TYPE", "COOL");
}
if (tmp3->PID_heat) {
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_IMAX", "%.2f", tmp3->PID_heat->iMax)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_IDLERANGE", "%.2f", tmp3->PID_heat->idleRange)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_IGAIN", "%.3f", tmp3->PID_heat->iGain)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_PGAIN", "%.3f", tmp3->PID_heat->pGain)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_DGAIN", "%.3f", tmp3->PID_heat->dGain)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_INPUT", "%.2f", tmp3->PID_heat->Input)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_ERR", "%.2f", tmp3->PID_heat->Err)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_ISTATE", "%.2f", tmp3->PID_heat->iState)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_SETP", "%.2f", tmp3->PID_heat->SetP)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_OUTP", "%.2f", tmp3->PID_heat->OutP)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_MODE", "%s", PIDMODE[tmp3->PID_heat->Mode])) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_TYPE", "HEAT")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- }
- if ((rc = xmlTextWriterEndElement(writer)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterEndElement");
- return 1;
- }
- }
- if ((rc = xmlTextWriterEndElement(writer)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterEndElement");
- return 1;
- }
- }
-
- /*
- * Fermenting profiles
- */
- if (Config.profiles) {
- if ((rc = xmlTextWriterStartElement(writer, BAD_CAST "PROFILES")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterStartElement");
- return 1;
- }
- for (tmp4 = Config.profiles; tmp4; tmp4 = tmp4->next) {
- if ((rc = xmlTextWriterStartElement(writer, BAD_CAST "PROFILE")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterStartElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteElement(writer, BAD_CAST "VERSION", BAD_CAST "1")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_IMAX", "%.2f", tmp3->PID_heat->iMax);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_IGAIN", "%.3f", tmp3->PID_heat->iGain);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_PGAIN", "%.3f", tmp3->PID_heat->pGain);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_DGAIN", "%.3f", tmp3->PID_heat->dGain);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_IDLERANGE", "%.2f", tmp3->PID_heat->idleRange);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_INPUT", "%.2f", tmp3->PID_heat->Input);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_ERR", "%.2f", tmp3->PID_heat->Err);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_ISTATE", "%.2f", tmp3->PID_heat->iState);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_SETP", "%.2f", tmp3->PID_heat->SetP);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_OUTP", "%.2f", tmp3->PID_heat->OutP);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_MODE", "%s", PIDMODE[tmp3->PID_heat->Mode]);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PIDH_TYPE", "HEAT");
}
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "UUID", "%s", tmp4->uuid)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "NAME", "%s", tmp4->name)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "BUSY", "%d", tmp4->busy)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "INITTEMP_LO", "%.1f", tmp4->inittemp_lo)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "INITTEMP_HI", "%.1f", tmp4->inittemp_hi)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "FRIDGE_MODE", "%d", tmp4->fridge_mode)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if (tmp4->steps) {
- if ((rc = xmlTextWriterStartElement(writer, BAD_CAST "STEPS")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterStartElement");
- return 1;
- }
- for (tmp5 = tmp4->steps; tmp5; tmp5 = tmp5->next) {
- if ((rc = xmlTextWriterStartElement(writer, BAD_CAST "STEP")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterStartElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteElement(writer, BAD_CAST "VERSION", BAD_CAST "1")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "RESTTIME", "%d", tmp5->resttime)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "STEPTIME", "%d", tmp5->steptime)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "TARGET_LO", "%.1f", tmp5->target_lo)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "TARGET_HI", "%.1f", tmp5->target_hi)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "FRIDGE_MODE", "%d", tmp5->fridge_mode)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterEndElement(writer)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterEndElement");
- return 1;
- }
- }
- if ((rc = xmlTextWriterEndElement(writer)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterEndElement");
- return 1;
- }
- }
- if ((rc = xmlTextWriterEndElement(writer)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterEndElement");
- return 1;
- }
+ xmlTextWriterEndElement(writer); // close FERMENTER
}
- if ((rc = xmlTextWriterEndElement(writer)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterEndElement");
- return 1;
- }
+ xmlTextWriterEndElement(writer); // close FERMENTERS
}
if (Config.devices) {
- if ((rc = xmlTextWriterStartElement(writer, BAD_CAST "DEVICES")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterStartElement");
- return 1;
- }
+ xmlTextWriterStartElement(writer, BAD_CAST "DEVICES");
#ifdef HAVE_WIRINGPI_H
piLock(LOCK_DEVICES);
#endif
for (device = Config.devices; device; device = device->next) {
- if ((rc = xmlTextWriterStartElement(writer, BAD_CAST "DEVICE")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterStartElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "VERSION", "%d", device->version)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "UUID", "%s", device->uuid)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "TYPE", "%s", DEVTYPE[device->type])) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "DIRECTION", "%s", DEVDIR[device->direction])) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "VALUE", "%d", device->value)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "OFFSET", "%d", device->offset)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "PRESENT", "%s", DEVPRESENT[device->present])) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "ADDRESS", "%s", device->address)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "SUBDEVICE", "%d", device->subdevice)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "GPIOPIN", "%d", device->gpiopin)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "DESCRIPTION", "%s", device->description)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "INUSE", "%d", device->inuse)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "COMMENT", "%s", device->comment)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "TIMESTAMP", "%d", (int)device->timestamp)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterEndElement(writer)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterEndElement");
- return 1;
- }
+ xmlTextWriterStartElement(writer, BAD_CAST "DEVICE");
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "UUID", "%s", device->uuid);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "TYPE", "%s", DEVTYPE[device->type]);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "DIRECTION", "%s", DEVDIR[device->direction]);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "VALUE", "%d", device->value);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "OFFSET", "%d", device->offset);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "PRESENT", "%s", DEVPRESENT[device->present]);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "ADDRESS", "%s", device->address);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "SUBDEVICE", "%d", device->subdevice);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "GPIOPIN", "%d", device->gpiopin);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "DESCRIPTION", "%s", device->description);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "INUSE", "%d", device->inuse);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "COMMENT", "%s", device->comment);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "TIMESTAMP", "%d", (int)device->timestamp);
+ xmlTextWriterEndElement(writer); // close DEVICE
}
#ifdef HAVE_WIRINGPI_H
piUnlock(LOCK_DEVICES);
#endif
-
- if ((rc = xmlTextWriterEndElement(writer)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterEndElement");
- return 1;
- }
+ xmlTextWriterEndElement(writer); // close DEVICES
}
#ifdef USE_SIMULATOR
if (Config.simulators) {
- if ((rc = xmlTextWriterStartElement(writer, BAD_CAST "SIMULATORS")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterStartElement");
- return 1;
- }
+ xmlTextWriterStartElement(writer, BAD_CAST "SIMULATORS");
for (simulator = Config.simulators; simulator; simulator = simulator->next) {
- if ((rc = xmlTextWriterStartElement(writer, BAD_CAST "SIMULATOR")) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterStartElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "VERSION", "%d", simulator->version)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "UUID", "%s", simulator->uuid)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "NAME", "%s", simulator->name)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteFormatElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "VOLUME_AIR", "%d", simulator->volume_air)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "VOLUME_BEER", "%d", simulator->volume_beer)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "ROOM_TEMPERATURE", "%.1f", simulator->room_temperature)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "ROOM_HUMIDITY", "%.1f", simulator->room_humidity)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "AIR_TEMPERATURE", "%f", simulator->air_temperature)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "BEER_TEMPERATURE", "%f", simulator->beer_temperature)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "CHILLER_TEMPERATURE", "%f", simulator->chiller_temperature)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "COOLER_TEMP", "%f", simulator->cooler_temp)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "COOLER_TIME", "%d", simulator->cooler_time)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "COOLER_SIZE", "%.3f", simulator->cooler_size)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "HEATER_TEMP", "%f", simulator->heater_temp)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "HEATER_TIME", "%d", simulator->heater_time)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "HEATER_SIZE", "%.3f", simulator->heater_size)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "HEATER_STATE", "%d", simulator->heater_state)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "COOLER_STATE", "%d", simulator->cooler_state)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "FRIGO_ISOLATION", "%.3f", simulator->frigo_isolation)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "S_YEAST_HEAT", "%f", simulator->s_yeast_heat)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "S_YEAST_STARTED", "%d", (int)simulator->s_yeast_started)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "S_COOL_TEMP", "%f", simulator->s_cool_temp)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "S_HEAT_TEMP", "%f", simulator->s_heat_temp)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "S_COOL_CHANGED", "%d", (int)simulator->s_cool_changed)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterWriteFormatElement(writer, BAD_CAST "S_HEAT_CHANGED", "%d", (int)simulator->s_heat_changed)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterWriteElement");
- return 1;
- }
- if ((rc = xmlTextWriterEndElement(writer)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterEndElement");
- return 1;
- }
+ xmlTextWriterStartElement(writer, BAD_CAST "SIMULATOR");
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "UUID", "%s", simulator->uuid);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "NAME", "%s", simulator->name);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "VOLUME_AIR", "%d", simulator->volume_air);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "VOLUME_BEER", "%d", simulator->volume_beer);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "ROOM_TEMPERATURE", "%.1f", simulator->room_temperature);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "ROOM_HUMIDITY", "%.1f", simulator->room_humidity);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "AIR_TEMPERATURE", "%f", simulator->air_temperature);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "BEER_TEMPERATURE", "%f", simulator->beer_temperature);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "CHILLER_TEMPERATURE", "%f", simulator->chiller_temperature);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "COOLER_TEMP", "%f", simulator->cooler_temp);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "COOLER_TIME", "%d", simulator->cooler_time);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "COOLER_SIZE", "%.3f", simulator->cooler_size);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "HEATER_TEMP", "%f", simulator->heater_temp);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "HEATER_TIME", "%d", simulator->heater_time);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "HEATER_SIZE", "%.3f", simulator->heater_size);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "HEATER_STATE", "%d", simulator->heater_state);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "COOLER_STATE", "%d", simulator->cooler_state);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "FRIGO_ISOLATION", "%.3f", simulator->frigo_isolation);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "S_YEAST_HEAT", "%f", simulator->s_yeast_heat);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "S_YEAST_STARTED", "%d", (int)simulator->s_yeast_started);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "S_COOL_TEMP", "%f", simulator->s_cool_temp);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "S_HEAT_TEMP", "%f", simulator->s_heat_temp);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "S_COOL_CHANGED", "%d", (int)simulator->s_cool_changed);
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "S_HEAT_CHANGED", "%d", (int)simulator->s_heat_changed);
+ xmlTextWriterEndElement(writer);
}
- if ((rc = xmlTextWriterEndElement(writer)) < 0) {
- syslog(LOG_NOTICE, "wrconfig: error at xmlTextWriterEndElement");
- return 1;
- }
+ xmlTextWriterEndElement(writer);
}
#endif
@@ -1070,9 +495,7 @@
int wrconfig(void)
{
- int rc;
-
- rc = do_wrconfig();
+ int rc = do_wrconfig();
syslog(LOG_NOTICE, "Rewritten configuration, rc=%d", rc);
return rc;
}
@@ -1141,18 +564,20 @@
unit = (units_list *)malloc(sizeof(units_list));
unit->next = NULL;
- unit->version = 1;
unit->uuid = unit->product_uuid = unit->product_code = unit->product_name = unit->event_msg = \
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->light_address = unit->psu_address = unit->profile_uuid = unit->profile_name = NULL;
unit->volume = unit->prof_peak_abs = unit->prof_peak_rel = 0.0;
- unit->air_temperature = unit->beer_temperature = unit->chiller_temperature = unit->beer_set = unit->fridge_set = 20.0;
+ unit->air_temperature = unit->beer_temperature = unit->chiller_temperature = unit->beer_set = \
+ unit->fridge_set = unit->profile_inittemp_lo = unit->profile_inittemp_hi = 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 = unit->stage = 0;
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->door_idx = unit->light_idx = unit->psu_idx = unit->profile_fridge_mode = \
+ unit->profile_duration = unit->profile_totalsteps = 0;
+ unit->profile_steps = NULL;
unit->heater_delay = unit->cooler_delay = unit->fan_delay = 20; /* 5 minutes delay */
unit->light_delay = 1; /* 15 seconds delay */
unit->heater_wait = unit->cooler_wait = unit->fan_wait = unit->light_wait = 0;
@@ -1168,31 +593,9 @@
cur = cur->xmlChildrenNode;
while (cur != NULL) {
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"VERSION"))) {
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
- if (xmlStrcmp(key, (const xmlChar *)"1")) {
- xmlFree(key);
- return 1;
- }
- unit->version = 1;
- xmlFree(key);
- }
if ((!xmlStrcmp(cur->name, (const xmlChar *)"UUID"))) {
unit->uuid = (char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
}
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"NAME"))) {
- /*
- * Upgrade to product code and name
- */
- char *oldname = (char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
- if (strstr(oldname, (char *)" ")) {
- unit->product_code = xstrcpy(strtok(oldname, " "));
- unit->product_name = xstrcpy(strtok(NULL, "\0"));
- } else {
- unit->product_code = xstrcpy((char *)"000000");
- unit->product_name = xstrcpy(oldname);
- }
- }
if ((!xmlStrcmp(cur->name, (const xmlChar *)"PRODUCT_UUID"))) {
unit->product_uuid = (char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
}
@@ -1420,24 +823,24 @@
unit->temp_set_max = val;
xmlFree(key);
}
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"PID_KP"))) {
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
- if (sscanf((const char *)key, "%f", &val) == 1)
- unit->PID_cool->pGain = unit->PID_heat->pGain = val; /* Upgrade config */
- xmlFree(key);
- }
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"PID_KD"))) {
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
- if (sscanf((const char *)key, "%f", &val) == 1)
- unit->PID_cool->dGain = unit->PID_heat->dGain = val; /* Upgrade config */
- xmlFree(key);
- }
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"PID_KI"))) {
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
- if (sscanf((const char *)key, "%f", &val) == 1)
- unit->PID_cool->iGain = unit->PID_heat->iGain = val; /* Upgrade config */
- xmlFree(key);
- }
+// if ((!xmlStrcmp(cur->name, (const xmlChar *)"PID_KP"))) {
+// key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+// if (sscanf((const char *)key, "%f", &val) == 1)
+// unit->PID_cool->pGain = unit->PID_heat->pGain = val; /* Upgrade config */
+// xmlFree(key);
+// }
+// if ((!xmlStrcmp(cur->name, (const xmlChar *)"PID_KD"))) {
+// key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+// if (sscanf((const char *)key, "%f", &val) == 1)
+// unit->PID_cool->dGain = unit->PID_heat->dGain = val; /* Upgrade config */
+// xmlFree(key);
+// }
+// if ((!xmlStrcmp(cur->name, (const xmlChar *)"PID_KI"))) {
+// key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+// if (sscanf((const char *)key, "%f", &val) == 1)
+// unit->PID_cool->iGain = unit->PID_heat->iGain = val; /* Upgrade config */
+// xmlFree(key);
+// }
if ((!xmlStrcmp(cur->name, (const xmlChar *)"PIDC_IMAX"))) {
key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
if (sscanf((const char *)key, "%f", &val) == 1)
@@ -1578,9 +981,46 @@
}
xmlFree(key);
}
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"PROFILE"))) {
- unit->profile = (char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+ if ((!xmlStrcmp(cur->name, (const xmlChar *)"PROFILE_UUID"))) {
+ unit->profile_uuid = (char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+ }
+ if ((!xmlStrcmp(cur->name, (const xmlChar *)"PROFILE_NAME"))) {
+ unit->profile_name = (char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+ }
+ if ((!xmlStrcmp(cur->name, (const xmlChar *)"PROFILE_INITTEMP_LO"))) {
+ key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+ if (sscanf((const char *)key, "%f", &val) == 1)
+ unit->profile_inittemp_lo = val;
+ xmlFree(key);
+ }
+ if ((!xmlStrcmp(cur->name, (const xmlChar *)"PROFILE_INITTEMP_HI"))) {
+ key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+ if (sscanf((const char *)key, "%f", &val) == 1)
+ unit->profile_inittemp_hi = val;
+ xmlFree(key);
}
+ if ((!xmlStrcmp(cur->name, (const xmlChar *)"PROFILE_FRIDGE_MODE"))) {
+ key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+ if (sscanf((const char *)key, "%d", &ival) == 1)
+ unit->profile_fridge_mode = ival;
+ xmlFree(key);
+ }
+ if ((!xmlStrcmp(cur->name, (const xmlChar *)"PROFILE_DURATION"))) {
+ key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+ if (sscanf((const char *)key, "%d", &ival) == 1)
+ unit->profile_duration = ival;
+ xmlFree(key);
+ }
+ if ((!xmlStrcmp(cur->name, (const xmlChar *)"PROFILE_TOTALSTEPS"))) {
+ key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+ if (sscanf((const char *)key, "%d", &ival) == 1)
+ unit->profile_totalsteps = ival;
+ xmlFree(key);
+ }
+ if ((!xmlStrcmp(cur->name, (const xmlChar *)"PROFILE_STEPS"))) {
+ parseSteps(doc, cur, &(unit)->profile_steps);
+ }
+
if ((!xmlStrcmp(cur->name, (const xmlChar *)"PROF_STARTED"))) {
key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
if (sscanf((const char *)key, "%d", &ival) == 1)
@@ -1644,7 +1084,8 @@
{
cur = cur->xmlChildrenNode;
while (cur != NULL) {
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"UNIT"))) {
+ // Accept the wrong UNIT name as well as FERMENTER
+ if ((!xmlStrcmp(cur->name, (const xmlChar *)"UNIT")) || (!xmlStrcmp(cur->name, (const xmlChar *)"FERMENTER"))) {
parseUnit(doc, cur);
}
cur = cur->next;
@@ -1663,20 +1104,14 @@
step = (prof_step *)malloc(sizeof(prof_step));
step->next = NULL;
- step->version = 1;
+ step->name = NULL;
step->steptime = step->resttime = step->fridge_mode = 0;
step->target_lo = step->target_hi = 20.0;
cur = cur->xmlChildrenNode;
while (cur != NULL) {
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"VERSION"))) {
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
- if (xmlStrcmp(key, (const xmlChar *)"1")) {
- xmlFree(key);
- return 1;
- }
- step->version = 1;
- xmlFree(key);
+ if ((!xmlStrcmp(cur->name, (const xmlChar *)"NAME"))) {
+ step->name = (char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
}
if ((!xmlStrcmp(cur->name, (const xmlChar *)"RESTTIME"))) {
key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
@@ -1690,14 +1125,6 @@
step->steptime = ival;
xmlFree(key);
}
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"TARGET"))) { /* Upgrade from single values */
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
- if (sscanf((const char *)key, "%f", &val) == 1) {
- step->target_lo = val - 0.2;
- step->target_hi = val + 0.2;
- }
- xmlFree(key);
- }
if ((!xmlStrcmp(cur->name, (const xmlChar *)"TARGET_LO"))) {
key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
if (sscanf((const char *)key, "%f", &val) == 1)
@@ -1738,7 +1165,7 @@
{
cur = cur->xmlChildrenNode;
while (cur != NULL) {
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"STEP"))) {
+ if ((!xmlStrcmp(cur->name, (const xmlChar *)"PROFILE_STEP"))) {
parseStep(doc, cur, step);
}
cur = cur->next;
@@ -1748,106 +1175,6 @@
-int parseProfile(xmlDocPtr doc, xmlNodePtr cur)
-{
- xmlChar *key;
- profiles_list *profile, *tmp;
- int ival;
- float fval;
-
- profile = (profiles_list *)malloc(sizeof(profiles_list));
- profile->next = NULL;
- profile->version = 1;
- profile->uuid = profile->name = NULL;
- profile->busy = profile->fridge_mode = 0;
- profile->inittemp_lo = profile->inittemp_hi = 20.0;
- profile->steps = NULL;
-
- cur = cur->xmlChildrenNode;
- while (cur != NULL) {
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"VERSION"))) {
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
- if (xmlStrcmp(key, (const xmlChar *)"1")) {
- xmlFree(key);
- return 1;
- }
- profile->version = 1;
- xmlFree(key);
- }
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"UUID"))) {
- profile->uuid = (char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
- }
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"NAME"))) {
- profile->name = (char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
- }
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"BUSY"))) {
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
- if (sscanf((const char *)key, "%d", &ival) == 1)
- profile->busy = ival;
- xmlFree(key);
- }
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"INITTEMP"))) { /* Upgrade from single temp */
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
- if (sscanf((const char *)key, "%f", &fval) == 1) {
- profile->inittemp_lo = fval - 0.2;
- profile->inittemp_hi = fval + 0.2;
- }
- xmlFree(key);
- }
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"INITTEMP_LO"))) {
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
- if (sscanf((const char *)key, "%f", &fval) == 1)
- profile->inittemp_lo = fval;
- xmlFree(key);
- }
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"INITTEMP_HI"))) {
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
- if (sscanf((const char *)key, "%f", &fval) == 1)
- profile->inittemp_hi = fval;
- xmlFree(key);
- }
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"FRIDGE_MODE"))) {
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
- if (sscanf((const char *)key, "%d", &ival) == 1)
- profile->fridge_mode = ival;
- xmlFree(key);
- }
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"STEPS"))) {
- parseSteps(doc, cur, &(profile)->steps);
- }
- cur = cur->next;
- }
-
- if (Config.profiles == NULL) {
- Config.profiles = profile;
- } else {
- for (tmp = Config.profiles; tmp; tmp = tmp->next) {
- if (tmp->next == NULL) {
- tmp->next = profile;
- break;
- }
- }
- }
-
- return 0;
-}
-
-
-
-int parseProfiles(xmlDocPtr doc, xmlNodePtr cur)
-{
- cur = cur->xmlChildrenNode;
- while (cur != NULL) {
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"PROFILE"))) {
- parseProfile(doc, cur);
- }
- cur = cur->next;
- }
- return 0;
-}
-
-
-
int parseDevice(xmlDocPtr doc, xmlNodePtr cur)
{
xmlChar *key;
@@ -1856,7 +1183,6 @@
device = (devices_list *)malloc(sizeof(devices_list));
device->next = NULL;
- device->version = 1;
device->uuid = device->address = device->description = device->comment = NULL;
device->type = device->direction = device->present = device->subdevice = device->inuse = device->offset = 0;
device->gpiopin = -1;
@@ -1864,15 +1190,6 @@
cur = cur->xmlChildrenNode;
while (cur != NULL) {
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"VERSION"))) {
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
- if (xmlStrcmp(key, (const xmlChar *)"1")) {
- xmlFree(key);
- return 1;
- }
- device->version = 1;
- xmlFree(key);
- }
if ((!xmlStrcmp(cur->name, (const xmlChar *)"UUID"))) {
device->uuid = (char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
}
@@ -1995,7 +1312,6 @@
simulator = (simulator_list *)malloc(sizeof(simulator_list));
simulator->next = NULL;
- simulator->version = 1;
simulator->uuid = simulator->name = NULL;
simulator->volume_air = simulator->volume_beer = 0;
simulator->room_temperature = simulator->air_temperature = simulator->beer_temperature = simulator->s_cool_temp = simulator->s_heat_temp = 20.0;
@@ -2008,15 +1324,6 @@
cur = cur->xmlChildrenNode;
while (cur != NULL) {
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"VERSION"))) {
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
- if (xmlStrcmp(key, (const xmlChar *)"1")) {
- xmlFree(key);
- return 1;
- }
- simulator->version = 1;
- xmlFree(key);
- }
if ((!xmlStrcmp(cur->name, (const xmlChar *)"UUID"))) {
simulator->uuid = (char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
}
@@ -2248,15 +1555,6 @@
*/
cur = cur->xmlChildrenNode;
while (cur != NULL) {
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"VERSION"))) {
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
- if (xmlStrcmp(key, (const xmlChar *)"1")) {
- xmlFree(key);
- syslog(LOG_NOTICE, "XML file %s is not a valid version", mypath);
- return 1;
- }
- xmlFree(key);
- }
if ((!xmlStrcmp(cur->name, (const xmlChar *)"NAME"))) {
Config.name = (char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
}
@@ -2315,9 +1613,6 @@
if ((!xmlStrcmp(cur->name, (const xmlChar *)"FERMENTERS"))) {
parseFermenters(doc, cur);
}
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"PROFILES"))) {
- parseProfiles(doc, cur);
- }
if ((!xmlStrcmp(cur->name, (const xmlChar *)"DEVICES"))) {
parseDevices(doc, cur);
}