thermferm/server.c

changeset 553
4091d4fe217f
parent 545
c382a6c58c20
child 554
ab9f22ab57b5
--- a/thermferm/server.c	Wed Jul 25 14:18:39 2018 +0200
+++ b/thermferm/server.c	Wed Jul 25 20:08:13 2018 +0200
@@ -1575,7 +1575,9 @@
 	simulator->volume_air = 150;
 	simulator->volume_beer = 50;
 	simulator->room_temperature = simulator->air_temperature = simulator->beer_temperature = simulator->s_cool_temp = simulator->s_heat_temp = 20.0;
-	simulator->cooler_temp = -3.0;	/* Cooling temperature */
+	simulator->room_humidity = 48.6;
+	simulator->chiller_temperature = 1.5;	/* Chiller temperature */
+	simulator->cooler_temp =  1.5;	/* Cooling temperature */
 	simulator->cooler_time = 720;	/* About 12 minutes for the cooler plate */
 	simulator->cooler_size = 0.8;	/* 0.8 square meter cooler plate */
 	simulator->heater_temp = 150.0;	/* Heating temperature */
@@ -1622,8 +1624,10 @@
 		srv_send((char *)"VOLUME_AIR,%d", simulator->volume_air);
 		srv_send((char *)"VOLUME_BEER,%d", simulator->volume_beer);
 		srv_send((char *)"ROOM_TEMPERATURE,%.1f", simulator->room_temperature);
+		srv_send((char *)"ROOM_HUMIDITY,%.1f", simulator->room_humidity);
 		srv_send((char *)"AIR_TEMPERATURE,%.3f", simulator->air_temperature);
 		srv_send((char *)"BEER_TEMPERATURE,%.3f", simulator->beer_temperature);
+		srv_send((char *)"CHILLER_TEMPERATURE,%.3f", simulator->chiller_temperature);
 		srv_send((char *)"COOLER_TEMP,%.1f", simulator->cooler_temp);
 		srv_send((char *)"COOLER_TIME,%d", simulator->cooler_time);
 		srv_send((char *)"COOLER_SIZE,%.3f", simulator->cooler_size);
@@ -1687,6 +1691,13 @@
 				    simulator->room_temperature = fval;
 				}
 
+			    } else if (strcmp(kwd, (char *)"ROOM_HUMIDITY") == 0) {
+				if (sscanf(val, "%f", &fval) == 1) {
+				    if (simulator->room_humidity != fval)
+					syslog(LOG_NOTICE, "Simulator %s room hunidity %.1f to %.1f", simulator->uuid, simulator->room_humidity, fval);
+				    simulator->room_humidity = fval;
+				}
+
 			    } else if (strcmp(kwd, (char *)"AIR_TEMPERATURE") == 0) {
 				if (sscanf(val, "%f", &fval) == 1) {
 				    if (simulator->air_temperature != fval)
@@ -1701,6 +1712,13 @@
 				    simulator->beer_temperature = fval;
 				}
 
+			    } else if (strcmp(kwd, (char *)"CHILLER_TEMPERATURE") == 0) {
+				if (sscanf(val, "%f", &fval) == 1) {
+				    if (simulator->chiller_temperature != fval)
+					syslog(LOG_NOTICE, "Simulator %s chiller temperature %.1f to %.1f", simulator->uuid, simulator->chiller_temperature, fval);
+				    simulator->chiller_temperature = fval;
+				}
+
 			    } else if (strcmp(kwd, (char *)"COOLER_TEMP") == 0) {
 				if (sscanf(val, "%f", &fval) == 1) {
 				    if (simulator->cooler_temp != fval)

mercurial