diff -r 64cd9865bd11 -r 8b7ef338bf49 thermferm/server.c --- a/thermferm/server.c Thu Apr 02 22:08:15 2015 +0200 +++ b/thermferm/server.c Thu Apr 02 22:23:18 2015 +0200 @@ -1057,11 +1057,12 @@ int cmd_list(char *buf) { char *opt, *param, *filename, q[5], buffer[256], outbuf[256]; - char *date_n, *mode_n, *air_n, *beer_n, *target_n, *heater_n, *cooler_n; + char *date_n, *mode_n, *air_n, *beer_n, *target_n, *heater_n, *cooler_n, *room_n; char *heater_u, *cooler_u; int heater_l = 0, cooler_l = 0, h = 0, c = 0, heat_used = 0, cool_used = 0, lines = 0, graphstep = 0; units_list *unit; FILE *fp; + float room_t; opt = strtok(buf, " \0"); opt = strtok(NULL, " \0"); @@ -1143,6 +1144,8 @@ heater_u = strtok(NULL, ",\0"); /* current door state */ heater_u = strtok(NULL, ",\0"); /* heater use counter */ cooler_u = strtok(NULL, ",\0"); /* cooler use counter */ + room_n = strtok(NULL, ",\0"); /* fan use counter */ + room_n = strtok(NULL, ",\0"); /* room temperature */ if (strncmp(mode_n, (char *)"Mode", 4)) { /* @@ -1164,8 +1167,12 @@ cool_used = ((c - cooler_l) * 100) / (GRAPH_INTERVAL[graphstep] * 60); } } - snprintf(outbuf, 255, "%s,%s,%s,%s,%s,%s,%s,%d,%d", - date_n, mode_n, air_n, beer_n, target_n, heater_n, cooler_n, heat_used, cool_used); + if (room_n) + sscanf(room_n, "%f", &room_t); + else + room_t = 0.0; + snprintf(outbuf, 255, "%s,%s,%s,%s,%s,%s,%s,%d,%d,%.1f", + date_n, mode_n, air_n, beer_n, target_n, heater_n, cooler_n, heat_used, cool_used, room_t); srv_send(outbuf); if (h && strcmp(heater_u, "NA")) heater_l = h;