--- a/main/automation.c Sat Jun 06 13:28:46 2020 +0200
+++ b/main/automation.c Sat Jun 06 16:52:44 2020 +0200
@@ -228,9 +228,8 @@
MaxMash = 74.75;
}
MashState = Sub_Screen = MASH_NONE;
- snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"step\":\"%d\",\"timer\":\"\"}", Main_Screen, Sub_Screen, runtime.MashStep);
+ snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"\"}", Main_Screen, Sub_Screen);
ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
- ESP_LOGI(TAG, "%s", msg);
pumpTime = 0;
pumpRest = false;
runtime.StageResume = Main_Screen;
@@ -649,8 +648,7 @@
xSemaphoreGive(xSemaphoreDriver);
}
MashState = Sub_Screen = MASH_WAITTEMP;
- ESP_LOGI(TAG, "** Step %d Stage %d Malt %s", runtime.MashStep, MashState, runtime.MaltAdded ? (char *)"yes":(char *)"no");
- snprintf(msg, 255, "{\"main\":\"%d\",\"sub\":\"%d\",\"step\":\"%d\",\"timer\":\"\"}", Main_Screen, Sub_Screen, runtime.MashStep);
+ snprintf(msg, 255, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"\"}", Main_Screen, Sub_Screen);
ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
log_msg(TAG, "Mash step %d type: %s time: %d sp: %6.4f sv: %6.4f",
runtime.MashStep, mashTypes[recipe.MashStep[runtime.MashStep].Type],
@@ -667,7 +665,7 @@
}
if (! runtime.MaltAdded) {
- TopMessage((char *)"Opwarmen MLT");
+ TopMessage((char *)"Maischwater opwarmen");
} else if (strlen(recipe.MashStep[runtime.MashStep].Name)) {
TopMessage(recipe.MashStep[runtime.MashStep].Name);
} else {
@@ -696,8 +694,7 @@
}
TFT_print(temp_buf, CENTER, 135);
SoundPlay(SOUND_Prompt);
- snprintf(msg, 255, "{\"main\":\"%d\",\"sub\":\"%d\",\"step\":\"%d\",\"timer\":\"%s\"}",
- Main_Screen, Sub_Screen, runtime.MashStep, temp_buf);
+ snprintf(msg, 255, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"%s\"}", Main_Screen, Sub_Screen, temp_buf);
ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
if (recipe.MashStep[runtime.MashStep].Type == MASHTYPE_INFUSION) {
if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) {
@@ -722,8 +719,7 @@
SoundPlay(SOUND_TempReached);
TempReached = true;
MashState = Sub_Screen = MASH_REST;
- ESP_LOGI(TAG, "** Step %d Stage %d Malt %s", runtime.MashStep, MashState, runtime.MaltAdded ? (char *)"yes":(char *)"no");
- snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"step\":\"%d\",\"timer\":\"\"}", Main_Screen, Sub_Screen, runtime.MashStep);
+ snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"\"}", Main_Screen, Sub_Screen);
ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
if (! runtime.MaltAdded && runtime.MashStep == 0) {
TimerSet(0);
@@ -796,7 +792,6 @@
}
if (TimeLeft == 0) {
- ESP_LOGI(TAG, "** Step %d Stage %d Malt %s", runtime.MashStep, MashState, runtime.MaltAdded ? (char *)"yes":(char *)"no");
runtime.StageTimeLeft = 0;
updateRuntime = true;
if (runtime.MashStep == 0 && ! runtime.MaltAdded && config.AskAdd) {
@@ -821,8 +816,7 @@
TFT_print((char *)"Mout storten?", CENTER, 135);
SoundPlay(SOUND_Prompt);
MashState = Sub_Screen = MASH_ADD;
- snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"step\":\"%d\",\"timer\":\"Mout storten?\"}",
- Main_Screen, Sub_Screen, runtime.MashStep);
+ snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"Mout storten?\"}", Main_Screen, Sub_Screen);
ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
log_msg(TAG, "Mash add prompt");
break;
@@ -846,9 +840,7 @@
beeped = false;
TimerSet(config.IodineTime * 60);
MashState = Sub_Screen = MASH_IODINE;
- ESP_LOGI(TAG, "** Step %d Stage %d Malt %s", runtime.MashStep, MashState, runtime.MaltAdded ? (char *)"yes":(char *)"no");
- snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"step\":\"%d\",\"timer\":\"Jodium test?\"}",
- Main_Screen, Sub_Screen, runtime.MashStep);
+ snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"Jodium test?\"}", Main_Screen, Sub_Screen);
ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
log_msg(TAG, "Mash iodine test prompt");
break;
@@ -870,9 +862,7 @@
TFT_print((char *)"Mout verwijderen?", CENTER, 135);
SoundPlay(SOUND_Prompt);
MashState = Sub_Screen = MASH_REMOVE;
- ESP_LOGI(TAG, "** Step %d Stage %d Malt %s", runtime.MashStep, MashState, runtime.MaltAdded ? (char *)"yes":(char *)"no");
- snprintf(msg, 127, "{\"main\":\"%d\",\"sub\":\"%d\",\"step\":\"%d\",\"timer\":\"Mout verwijderen?\"}",
- Main_Screen, Sub_Screen, runtime.MashStep);
+ snprintf(msg, 127, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"Mout verwijderen?\"}", Main_Screen, Sub_Screen);
ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
log_msg(TAG, "Mash remove prompt");
break;
@@ -922,7 +912,6 @@
}
TFT_fillRect(0, 120, 320, 50, TFT_BLACK);
Buttons_Clear();
- ESP_LOGI(TAG, "** Step %d Stage %d Malt %s", runtime.MashStep, MashState, runtime.MaltAdded ? (char *)"yes":(char *)"no");
break;
default: break;
}
@@ -969,8 +958,7 @@
log_annotation(ANNOTATION_EVENT, (char *)"Eind decoctie");
}
MashState = Sub_Screen = MASH_WAITTEMP;
- snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"step\":\"%d\",\"timer\":\"\"}",
- Main_Screen, Sub_Screen, runtime.MashStep);
+ snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"\"}", Main_Screen, Sub_Screen);
ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
break;
default: break;