comparison: bmsd/mysql.c
bmsd/mysql.c
- changeset 299
- 047ead629d4a
- parent 194
- d202777ebae5
- child 334
- 26c6f8e5d58e
equal
deleted
inserted
replaced
| 298:307640ba6ab6 | 299:047ead629d4a |
|---|---|
| 203 fermenter->profile_inittemp_high = atof(row[40]); | 203 fermenter->profile_inittemp_high = atof(row[40]); |
| 204 fermenter->profile_inittemp_low = atof(row[41]); | 204 fermenter->profile_inittemp_low = atof(row[41]); |
| 205 fermenter->profile_steps = xstrcpy(row[42]); | 205 fermenter->profile_steps = xstrcpy(row[42]); |
| 206 } | 206 } |
| 207 fermenter->stage = xstrcpy(row[43]); | 207 fermenter->stage = xstrcpy(row[43]); |
| 208 fermenter->yeast_lo = atof(row[45]); | |
| 209 fermenter->yeast_hi = atof(row[46]); | |
| 208 | 210 |
| 209 if (fermenters == NULL) { | 211 if (fermenters == NULL) { |
| 210 fermenters = fermenter; | 212 fermenters = fermenter; |
| 211 } else { | 213 } else { |
| 212 for (tmpf = fermenters; tmpf; tmpf = tmpf->next) { | 214 for (tmpf = fermenters; tmpf; tmpf = tmpf->next) { |
| 416 "light_address='%s', light_state='%d', light_usage='%lu', " \ | 418 "light_address='%s', light_state='%d', light_usage='%lu', " \ |
| 417 "door_address='%s', door_state='%d', " \ | 419 "door_address='%s', door_state='%d', " \ |
| 418 "psu_address='%s', psu_state='%d', " \ | 420 "psu_address='%s', psu_state='%d', " \ |
| 419 "mode='%s', alarm='%d', setpoint_high='%.3f', setpoint_low='%.3f', " \ | 421 "mode='%s', alarm='%d', setpoint_high='%.3f', setpoint_low='%.3f', " \ |
| 420 "profile_uuid='%s', profile_name='%s', profile_state='%s', profile_percent='%d', " \ | 422 "profile_uuid='%s', profile_name='%s', profile_state='%s', profile_percent='%d', " \ |
| 421 "profile_inittemp_high='%.3f', profile_inittemp_low='%.3f', profile_steps='%s', stage='%s'", | 423 "profile_inittemp_high='%.3f', profile_inittemp_low='%.3f', profile_steps='%s', stage='%s', " \ |
| 424 "yeast_lo='%.1f', yeast_hi='%.1f'", | |
| 422 fermenter->uuid, fermenter->alias, fermenter->node, fermenter->online ? "Y":"N", | 425 fermenter->uuid, fermenter->alias, fermenter->node, fermenter->online ? "Y":"N", |
| 423 fermenter->beercode ? fermenter->beercode : "", fermenter->beername ? fermenter->beername : "", | 426 fermenter->beercode ? fermenter->beercode : "", fermenter->beername ? fermenter->beername : "", |
| 424 fermenter->beeruuid ? fermenter->beeruuid : "", | 427 fermenter->beeruuid ? fermenter->beeruuid : "", |
| 425 fermenter->air_address ? fermenter->air_address : "", fermenter->air_state ? fermenter->air_state : "", fermenter->air_temperature, | 428 fermenter->air_address ? fermenter->air_address : "", fermenter->air_state ? fermenter->air_state : "", fermenter->air_temperature, |
| 426 fermenter->beer_address ? fermenter->beer_address : "", fermenter->beer_state ? fermenter->beer_state : "", fermenter->beer_temperature, | 429 fermenter->beer_address ? fermenter->beer_address : "", fermenter->beer_state ? fermenter->beer_state : "", fermenter->beer_temperature, |
| 433 fermenter->psu_address ? fermenter->psu_address : "", fermenter->psu_state, | 436 fermenter->psu_address ? fermenter->psu_address : "", fermenter->psu_state, |
| 434 fermenter->mode, fermenter->alarm, fermenter->setpoint_high, fermenter->setpoint_low, | 437 fermenter->mode, fermenter->alarm, fermenter->setpoint_high, fermenter->setpoint_low, |
| 435 fermenter->profile_uuid ? fermenter->profile_uuid : "", fermenter->profile_name ? fermenter->profile_name : "", | 438 fermenter->profile_uuid ? fermenter->profile_uuid : "", fermenter->profile_name ? fermenter->profile_name : "", |
| 436 fermenter->profile_state ? fermenter->profile_state : "", fermenter->profile_percent, | 439 fermenter->profile_state ? fermenter->profile_state : "", fermenter->profile_percent, |
| 437 fermenter->profile_inittemp_high, fermenter->profile_inittemp_low, | 440 fermenter->profile_inittemp_high, fermenter->profile_inittemp_low, |
| 438 fermenter->profile_steps ? fermenter->profile_steps : "", fermenter->stage); | 441 fermenter->profile_steps ? fermenter->profile_steps : "", fermenter->stage, fermenter->yeast_lo, fermenter->yeast_hi); |
| 439 | 442 |
| 440 // printf("%s\n", query); | 443 // printf("%s\n", query); |
| 441 | 444 |
| 442 if (mysql_query(con, query)) { | 445 if (mysql_query(con, query)) { |
| 443 syslog(LOG_NOTICE, "MySQL: INSERT INTO mon_fermenters error %u (%s))", mysql_errno(con), mysql_error(con)); | 446 syslog(LOG_NOTICE, "MySQL: INSERT INTO mon_fermenters error %u (%s))", mysql_errno(con), mysql_error(con)); |
| 464 "light_address='%s', light_state='%d', light_usage='%lu', " \ | 467 "light_address='%s', light_state='%d', light_usage='%lu', " \ |
| 465 "door_address='%s', door_state='%d', " \ | 468 "door_address='%s', door_state='%d', " \ |
| 466 "psu_address='%s', psu_state='%d', " \ | 469 "psu_address='%s', psu_state='%d', " \ |
| 467 "mode='%s', alarm='%d', setpoint_high='%.3f', setpoint_low='%.3f', " \ | 470 "mode='%s', alarm='%d', setpoint_high='%.3f', setpoint_low='%.3f', " \ |
| 468 "profile_uuid='%s', profile_name='%s', profile_state='%s', profile_percent='%d', " \ | 471 "profile_uuid='%s', profile_name='%s', profile_state='%s', profile_percent='%d', " \ |
| 469 "profile_inittemp_high='%.3f', profile_inittemp_low='%.3f', profile_steps='%s', stage='%s' WHERE uuid='%s'", | 472 "profile_inittemp_high='%.3f', profile_inittemp_low='%.3f', profile_steps='%s', stage='%s', " \ |
| 473 "yeast_lo='%.1f', yeast_hi='%.1f' WHERE uuid='%s'", | |
| 470 fermenter->online ? "Y":"N", fermenter->beercode ? fermenter->beercode : "", fermenter->beername ? fermenter->beername : "", | 474 fermenter->online ? "Y":"N", fermenter->beercode ? fermenter->beercode : "", fermenter->beername ? fermenter->beername : "", |
| 471 fermenter->beeruuid ? fermenter->beeruuid : "", | 475 fermenter->beeruuid ? fermenter->beeruuid : "", |
| 472 fermenter->air_address ? fermenter->air_address : "", fermenter->air_state ? fermenter->air_state : "", fermenter->air_temperature, | 476 fermenter->air_address ? fermenter->air_address : "", fermenter->air_state ? fermenter->air_state : "", fermenter->air_temperature, |
| 473 fermenter->beer_address ? fermenter->beer_address : "", fermenter->beer_state ? fermenter->beer_state : "", fermenter->beer_temperature, | 477 fermenter->beer_address ? fermenter->beer_address : "", fermenter->beer_state ? fermenter->beer_state : "", fermenter->beer_temperature, |
| 474 fermenter->chiller_address ? fermenter->chiller_address : "", fermenter->chiller_state ? fermenter->chiller_state : "", fermenter->chiller_temperature, | 478 fermenter->chiller_address ? fermenter->chiller_address : "", fermenter->chiller_state ? fermenter->chiller_state : "", fermenter->chiller_temperature, |
| 480 fermenter->psu_address ? fermenter->psu_address : "", fermenter->psu_state, | 484 fermenter->psu_address ? fermenter->psu_address : "", fermenter->psu_state, |
| 481 fermenter->mode, fermenter->alarm, fermenter->setpoint_high, fermenter->setpoint_low, | 485 fermenter->mode, fermenter->alarm, fermenter->setpoint_high, fermenter->setpoint_low, |
| 482 fermenter->profile_uuid ? fermenter->profile_uuid : "", fermenter->profile_name ? fermenter->profile_name : "", | 486 fermenter->profile_uuid ? fermenter->profile_uuid : "", fermenter->profile_name ? fermenter->profile_name : "", |
| 483 fermenter->profile_state ? fermenter->profile_state : "", fermenter->profile_percent, | 487 fermenter->profile_state ? fermenter->profile_state : "", fermenter->profile_percent, |
| 484 fermenter->profile_inittemp_high, fermenter->profile_inittemp_low, | 488 fermenter->profile_inittemp_high, fermenter->profile_inittemp_low, |
| 485 fermenter->profile_steps ? fermenter->profile_steps : "", fermenter->stage, fermenter->uuid); | 489 fermenter->profile_steps ? fermenter->profile_steps : "", fermenter->stage, fermenter->yeast_lo, fermenter->yeast_hi, fermenter->uuid); |
| 486 | 490 |
| 487 // printf("%s\n", query); | 491 // printf("%s\n", query); |
| 488 | 492 |
| 489 if (mysql_query(con, query)) { | 493 if (mysql_query(con, query)) { |
| 490 syslog(LOG_NOTICE, "MySQL: UPDATE mon_fermenters error %u (%s))", mysql_errno(con), mysql_error(con)); | 494 syslog(LOG_NOTICE, "MySQL: UPDATE mon_fermenters error %u (%s))", mysql_errno(con), mysql_error(con)); |
