diff -r 897bf2a43253 -r 29e7223e37ae bmsd/mysql.c --- a/bmsd/mysql.c Sat Jan 14 11:25:20 2023 +0100 +++ b/bmsd/mysql.c Sat Feb 11 15:53:16 2023 +0100 @@ -3,7 +3,7 @@ * @brief MySQL/MariaDB access. * @author Michiel Broek * - * Copyright (C) 2018-2022 + * Copyright (C) 2018-2023 * * This file is part of the bms (Brewery Management System) * @@ -306,6 +306,8 @@ ispindel->interval = atoi(row[13]); ispindel->mode = xstrcpy(row[14]); ispindel->og_gravity = atof(row[15]); + ispindel->yeast_lo = atof(row[16]); + ispindel->yeast_hi = atof(row[17]); if (ispindels == NULL) { ispindels = ispindel; @@ -714,9 +716,11 @@ snprintf(query, 2559, "INSERT INTO mon_ispindels SET uuid='%s', alias='%s', node='%s', online='%d', mode='%s', alarm='%d', " \ - "angle='%.6f', temperature='%.4f', battery='%.6f', gravity='%.6f', up_interval='%d', og_gravity='0.0'", + "angle='%.6f', temperature='%.4f', battery='%.6f', gravity='%.6f', up_interval='%d', og_gravity='0.0', " \ + "yeast_lo='%.1f', yeast_hi='%.1f'", ispindel->uuid, ispindel->alias, ispindel->node, ispindel->online ? 1:0, ispindel->mode, ispindel->alarm, - ispindel->angle, ispindel->temperature, ispindel->battery, ispindel->gravity, ispindel->interval); + ispindel->angle, ispindel->temperature, ispindel->battery, ispindel->gravity, ispindel->interval, + ispindel->yeast_lo, ispindel->yeast_hi); if (bms_mysql_query(query) == 0) { syslog(LOG_NOTICE, "MySQL: insert new ispindel %s", ispindel->node); @@ -732,9 +736,11 @@ snprintf(query, 2559, "UPDATE mon_ispindels SET online='%d', mode='%s', alias='%s', alarm='%d', " \ - "angle='%.6f', temperature='%.4f', battery='%.6f', gravity='%.6f', up_interval='%d', og_gravity=GREATEST(og_gravity, '%.6f') WHERE uuid='%s'", + "angle='%.6f', temperature='%.4f', battery='%.6f', gravity='%.6f', up_interval='%d', og_gravity=GREATEST(og_gravity, '%.6f'), " \ + "yeast_lo='%.1f', yeast_hi='%.1f' WHERE uuid='%s'", ispindel->online ? 1:0, ispindel->mode, ispindel->alias, ispindel->alarm, - ispindel->angle, ispindel->temperature, ispindel->battery, ispindel->gravity, ispindel->interval, ispindel->gravity, ispindel->uuid); + ispindel->angle, ispindel->temperature, ispindel->battery, ispindel->gravity, ispindel->interval, ispindel->gravity, + ispindel->yeast_lo, ispindel->yeast_hi, ispindel->uuid); bms_mysql_query(query); free(query); }