--- a/main/automation.c Mon Jul 01 08:38:57 2024 +0200
+++ b/main/automation.c Wed Jul 03 20:01:31 2024 +0200
@@ -243,7 +243,7 @@
}
MashState = Sub_Screen = MASH_NONE;
snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"\"}", Main_Screen, Sub_Screen);
- ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
+ ws_server_send_text_clients(msg);
pumpTime = 0;
pumpRest = false;
runtime.StageResume = Main_Screen;
@@ -454,7 +454,7 @@
read_recipe(config.RecipeRec);
snprintf(msg, 255, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"\",\"brew1\":\"%s\",\"brew2\":\"%s\"}",
Main_Screen, Sub_Screen, equipment.Name, recipe.Name);
- ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
+ ws_server_send_text_clients(msg);
y = 28;
TopMessage((char *)"Automaat");
TFT_setFont(DEFAULT_FONT, NULL);
@@ -674,7 +674,7 @@
}
MashState = Sub_Screen = MASH_WAITTEMP;
snprintf(msg, 255, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"\"}", Main_Screen, Sub_Screen);
- ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
+ ws_server_send_text_clients(msg);
log_msg(TAG, "Mash step %d type: %s time: %d sp: %6.4f-%6.4f sv: %6.4f",
runtime.MashStep, mashTypes[recipe.MashStep[runtime.MashStep].Type],
stageTime, recipe.MashStep[runtime.MashStep].Step_temp, recipe.MashStep[runtime.MashStep].End_temp, temp_MLT);
@@ -720,7 +720,7 @@
TFT_print(temp_buf, CENTER, 135);
SoundPlay(SOUND_Prompt);
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));
+ ws_server_send_text_clients(msg);
if (recipe.MashStep[runtime.MashStep].Type == MASHTYPE_INFUSION) {
if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) {
// No heating during the infusion.
@@ -746,7 +746,7 @@
newTemp = stageTemp;
MashState = Sub_Screen = MASH_REST;
snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"\"}", Main_Screen, Sub_Screen);
- ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
+ ws_server_send_text_clients(msg);
if (! runtime.MaltAdded && runtime.MashStep == 0) {
TimerSet(0);
} else {
@@ -839,7 +839,7 @@
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));
+ ws_server_send_text_clients(msg);
if (runtime.MashStep == 0 && ! runtime.MaltAdded && config.AskAdd) {
/*
@@ -863,7 +863,7 @@
SoundPlay(SOUND_Prompt);
MashState = Sub_Screen = MASH_ADD;
snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"Mout storten?\"}", Main_Screen, Sub_Screen);
- ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
+ ws_server_send_text_clients(msg);
log_msg(TAG, "Mash add prompt");
break;
}
@@ -886,7 +886,7 @@
TimerSet(config.IodineTime * 60);
MashState = Sub_Screen = MASH_IODINE;
snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"Jodium test?\"}", Main_Screen, Sub_Screen);
- ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
+ ws_server_send_text_clients(msg);
log_msg(TAG, "Mash iodine test prompt");
break;
}
@@ -907,7 +907,7 @@
SoundPlay(SOUND_Prompt);
MashState = Sub_Screen = MASH_REMOVE;
snprintf(msg, 127, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"Mout verwijderen?\"}", Main_Screen, Sub_Screen);
- ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
+ ws_server_send_text_clients(msg);
log_msg(TAG, "Mash remove prompt");
break;
}
@@ -1008,7 +1008,7 @@
}
MashState = Sub_Screen = MASH_WAITTEMP;
snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"\"}", Main_Screen, Sub_Screen);
- ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
+ ws_server_send_text_clients(msg);
break;
default: break;
}
@@ -1179,7 +1179,7 @@
stageTemp = recipe.CoolTemp;
}
snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"\"}", Main_Screen, Sub_Screen);
- ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
+ ws_server_send_text_clients(msg);
CoolBeep = false;
log_msg(TAG, "Start cooling from %6.2f to %4.1f", ds18b20_state->mlt_temperature, stageTemp);
if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) {
@@ -1232,7 +1232,7 @@
xSemaphoreGive(xSemaphoreDriver);
if (Sub_Screen == 2) {
snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"\"}", Main_Screen, Sub_Screen);
- ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
+ ws_server_send_text_clients(msg);
}
}
switch (Buttons_Scan()) {
@@ -1345,7 +1345,7 @@
TFT_fillScreen(_bg);
Sub_Screen = 1;
snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"\"}", Main_Screen, Sub_Screen);
- ws_server_send_text_clients((char *)"/ws", msg, strlen(msg));
+ ws_server_send_text_clients(msg);
if (Main_Screen == MAIN_AUTO_WHIRLPOOL9) {
TimeWhirlPool = recipe.Whirlpool9;
if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) {