thermferm/server.c

changeset 284
9e6fb5aed618
parent 282
885e5243bb50
child 285
bbe73c2ecacf
--- a/thermferm/server.c	Tue Sep 02 16:54:18 2014 +0200
+++ b/thermferm/server.c	Wed Sep 03 15:02:09 2014 +0200
@@ -1458,6 +1458,7 @@
 	unit->idle_rangeH = 1.0;
 	unit->idle_rangeL = -1.0;
 	unit->prof_started = unit->prof_paused = (time_t)0;
+	unit->prof_percent = 0;
 	unit->PID_err_old = unit->PID_I_err = 0.0;
 
 	/*
@@ -1546,7 +1547,11 @@
 		srv_send((char *)"BEER_SET,%.1f", unit->beer_set);
 		srv_send((char *)"PROFILE,%s", unit->profile);
 		srv_send((char *)"PROF_STARTED,%d", (int)unit->prof_started);
-		srv_send((char *)"PROF_STATE,%s", PROFSTATE[unit->prof_state]);
+		if (unit->prof_state == PROFILE_RUN) {
+		    srv_send((char *)"PROF_STATE,%s %d%%", PROFSTATE[unit->prof_state], unit->prof_percent);
+		} else {
+		    srv_send((char *)"PROF_STATE,%s", PROFSTATE[unit->prof_state]);
+		}
 		srv_send((char *)"PROF_TARGET,%.3f", unit->prof_target);
 		srv_send((char *)"TEMP_SET_MIN,%.1f", unit->temp_set_min);
 		srv_send((char *)"TEMP_SET_MAX,%.1f", unit->temp_set_max);

mercurial