comparison: bmsd/fermenters.c
bmsd/fermenters.c
- changeset 299
- 047ead629d4a
- parent 194
- d202777ebae5
- child 558
- a8e065a9f851
equal
deleted
inserted
replaced
| 298:307640ba6ab6 | 299:047ead629d4a |
|---|---|
| 129 if (json_object_object_get_ex(sensor, "uuid", &val)) { | 129 if (json_object_object_get_ex(sensor, "uuid", &val)) { |
| 130 if (fermenter->beeruuid) | 130 if (fermenter->beeruuid) |
| 131 free(fermenter->beeruuid); | 131 free(fermenter->beeruuid); |
| 132 fermenter->beeruuid = xstrcpy((char *)json_object_get_string(val)); | 132 fermenter->beeruuid = xstrcpy((char *)json_object_get_string(val)); |
| 133 } | 133 } |
| 134 if (json_object_object_get_ex(sensor, "yeast_lo", &val)) { | |
| 135 fermenter->yeast_lo = json_object_get_double(val); | |
| 136 } | |
| 137 if (json_object_object_get_ex(sensor, "yeast_hi", &val)) { | |
| 138 fermenter->yeast_hi = json_object_get_double(val); | |
| 139 } | |
| 134 } | 140 } |
| 135 if (json_object_object_get_ex(jobj, "air", &sensor)) { | 141 if (json_object_object_get_ex(jobj, "air", &sensor)) { |
| 136 if (json_object_object_get_ex(sensor, "address", &val)) { | 142 if (json_object_object_get_ex(sensor, "address", &val)) { |
| 137 if (fermenter->air_address) | 143 if (fermenter->air_address) |
| 138 free(fermenter->air_address); | 144 free(fermenter->air_address); |
| 304 if (fermenter->profile_steps) | 310 if (fermenter->profile_steps) |
| 305 free(fermenter->profile_steps); | 311 free(fermenter->profile_steps); |
| 306 fermenter->profile_uuid = fermenter->profile_name = fermenter->profile_state = fermenter->profile_steps = NULL; | 312 fermenter->profile_uuid = fermenter->profile_name = fermenter->profile_state = fermenter->profile_steps = NULL; |
| 307 fermenter->profile_percent = 0; | 313 fermenter->profile_percent = 0; |
| 308 fermenter->profile_inittemp_high = fermenter->profile_inittemp_low = 0.0; | 314 fermenter->profile_inittemp_high = fermenter->profile_inittemp_low = 0.0; |
| 315 fermenter->yeast_lo = 12; | |
| 316 fermenter->yeast_hi = 24; | |
| 309 } | 317 } |
| 310 } | 318 } |
| 311 json_object_put(jobj); | 319 json_object_put(jobj); |
| 312 | 320 |
| 313 // fermenter_dump(fermenter); | 321 // fermenter_dump(fermenter); |
