brewboard: comparison main/automation.c

-:8d0287a1a9e1
+:47253f294a9f
 extern SemaphoreHandle_t        xSemaphoreDriver;		///< Relays driver lock semaphore
 extern double                   Output;				///< Cakculated outpout power
 extern time_t			now;				///< Current time
 extern struct tm		timeinfo;			///< Current time structure
 #ifdef CONFIG_TEMP_SENSORS_SIMULATOR
 extern float                    Fake_MLT;
 extern float                    Fake_HLT;
 #endif
 #endif
 		if (recipe.Mashsteps > 1)
 		    LastMashStep = recipe.Mashsteps - 2;
 		else
 		    LastMashStep = 0;
-log_msg(TAG, "Last mash step %d", LastMashStep);
+ESP_LOGD(TAG, "Last mash step %d", LastMashStep);
 // Check for a crashed session.
 if (runtime.AutoModeStarted) {
 TopMessage((char *)"Brouwen hervatten?");
 Buttons_Add( 40, 100, 80, 40, (char *)"Ja", 0);
 		runtime.HopAddition = 0;
 		runtime.Logfile[0] = '\0';
 		runtime.PumpCooling = false;
 		runtime.MashStep = 0;
 		runtime.MaltAdded = false;
+		runtime.MLT_usage = 0;
+		runtime.HLT_usage = 0;
 		write_runtime();
 power_MLT = power_HLT = counts = 0;
 		log_clean();
 		vTaskDelay(250 / portTICK_PERIOD_MS);	// Allow some time
 break;
 driver_state->hlt_mode = HLT_MODE_NONE;
 driver_state->hlt_sp = 0.0;
 driver_state->pump_run = 0;
 xSemaphoreGive(xSemaphoreDriver);
 }
+		double mwu = (runtime.MLT_usage / 1000.0 / 60.0 / 60.0) * equipment.MLT_watt / 1000.0;
+		double hwu = (runtime.HLT_usage / 1000.0 / 60.0 / 60.0) * equipment.HLT_watt / 1000.0;
+		log_msg(TAG, "MLT usage %.3f KWU, HLT usage %.3f KWU, total %.3f KWU", mwu, hwu, mwu + hwu);
 _fg = TFT_YELLOW;
 TFT_setFont(DEJAVU24_FONT, NULL);
 if (Main_Screen == MAIN_AUTO_DONE) {
 TFT_print((char *)"Brouwen is gereed.", CENTER, CENTER);
 log_msg(TAG, "Brew is done");
 }
 runtime.UseHLT = _UseHLT;
 		} else {
 		    runtime.UseHLT = _UseHLT = false;
 		}
-		log_msg(TAG, "Use HLT %s", (_UseHLT)?"true":"false");
+		ESP_LOGD(TAG, "Use HLT %s", (_UseHLT)?"true":"false");
 updateRuntime = true;
 if (_UseHLT) {
 /*
 * Calculate HLT setpoint for pre-heat. Substract the
 * available Mash rest times, asume 0.5 degrees/minute
 HLT_info(71,150, true, false);
 if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) {
 if (driver_state->hlt_pv >= driver_state->hlt_sp) {
 Main_Screen = MAIN_AUTO_MASH;
 driver_state->hlt_sp = recipe.SpargeTemp;       // Set final setpoint
-			log_msg(TAG, "HLT preheat done");
+			ESP_LOGD(TAG, "HLT preheat done");
 }
 xSemaphoreGive(xSemaphoreDriver);
 }
 break;
 		    if ((recipe.MashStep[runtime.MashStep].Step_temp != recipe.MashStep[runtime.MashStep].End_temp) &&
 			(recipe.MashStep[runtime.MashStep].Type != MASHTYPE_DECOCTION) && (oldTimeLeft != TimeLeft)) {
 			float part = ((stageTime * 60.0) - TimeLeft) / (stageTime * 60.0);
 			newTemp = ((int)(((part * (recipe.MashStep[runtime.MashStep].End_temp - recipe.MashStep[runtime.MashStep].Step_temp)) +
 				  recipe.MashStep[runtime.MashStep].Step_temp) * 16)) / 16.0;
-			//newTemp = ((int)(newTemp * 16)) / 16.0;
 			if (newTemp != stageTemp) {
 			    stageTemp = newTemp;
 			    if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) {
 	driver_state->mlt_sp = stageTemp;
 	xSemaphoreGive(xSemaphoreDriver);
 	    }
-			ESP_LOGI(TAG, "Curent %7.4f new %7.4f part %7.4f", stageTemp, newTemp, part);
+			//ESP_LOGI(TAG, "Current %7.4f new %7.4f part %7.4f", stageTemp, newTemp, part);
 			}
 		    }
 		    oldTimeLeft = TimeLeft;
 if (TimeLeft == 0) {
 			runtime.StageTimeLeft = 0;
 			updateRuntime = true;
+			TFT_fillRect(0, 120, 320, 50, TFT_BLACK);
+			snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"\"}", Main_Screen, Sub_Screen);
+ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
 if (runtime.MashStep == 0 && ! runtime.MaltAdded && config.AskAdd) {
 /*
 * Add Mash prompt.
 */
 			    stageTemp = recipe.MashStep[runtime.MashStep].Step_temp; // Set normal step temperature
 	    if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) {
 	driver_state->mlt_sp = stageTemp;
 	xSemaphoreGive(xSemaphoreDriver);
 	    }
 			    log_annotation(ANNOTATION_EVENT, (char *)"Mout storten");
-			    TFT_fillRect(0, 120, 320, 50, TFT_BLACK);
 Buttons_Clear();
 Buttons_Add(  5,120, 60, 40, (char *)"Halt", 0);
 			    Buttons[0].dark = true;
 Buttons_Add(255,120, 60, 40, (char *)"Ok",   1);
 Buttons_Show();
 if ((runtime.MashStep == LastMashStep) && config.AskIodine) {
 /*
 * Iodone test prompt.
 */
 			    log_annotation(ANNOTATION_EVENT, (char *)"Jodium test");
-TFT_fillRect(0, 120, 320, 50, TFT_BLACK);
 Buttons_Clear();
 Buttons_Add(  5,120, 60, 40, (char *)"Halt", 0);
 			    Buttons[0].dark = true;
 Buttons_Add(255,120, 60, 40, (char *)"Ok",   1);
 Buttons_Show();
 if ((runtime.MashStep == (recipe.Mashsteps - 1)) && config.AskRemove) {
 /*
 * Mash remove prompt.
 */
 			    log_annotation(ANNOTATION_EVENT, (char *)"Mout verwijderen");
-TFT_fillRect(0, 120, 320, 50, TFT_BLACK);
 Buttons_Clear();
 Buttons_Add(  5,120, 60, 40, (char *)"Halt", 0);
 			    Buttons[0].dark = true;
 Buttons_Add(255,120, 60, 40, (char *)"Ok",   1);
 Buttons_Show();
 			 */
 			if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) {
 			    driver_state->pump_run = (driver_state->mlt_pv < equipment.PumpMaxTemp) ? 1 : 0;
 			    xSemaphoreGive(xSemaphoreDriver);
 			}
-			log_annotation(ANNOTATION_STAGE, (char *)"Whirlpool");
+			log_annotation(ANNOTATION_EVENT, (char *)"Whirlpool");
 			TimerSet(TimeWhirlPool * 60);
 			runtime.StageTimeLeft = TimeWhirlPool;
 			updateRuntime = true;
 			MLT_info(71, 26, false);

Mercurial > brewboard / file comparison

comparison: main/automation.c

main/automation.c