Skip to content

RIP endpoints and multinet #458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stintel merged 2 commits into from
Jul 22, 2026
Merged

RIP endpoints and multinet #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
972ff2f
treewide: remove Multinet support
stintel Jul 22, 2026
180ef7e
endpoint: remove direct endpoint support
stintel Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
# CMakeLists in this exact order for cmake to work correctly
cmake_minimum_required(VERSION 3.5)

if($ENV{MULTINET})
message("Enabling MultiNet support. Please note we will not provide support. Issues related to MultiNet will be closed without resolution.")
add_definitions(-DWILLOW_SUPPORT_MULTINET)
endif()

if(DEFINED ENV{WILLOW_VERSION})
add_definitions(-DWILLOW_USER_AGENT="Willow/$ENV{WILLOW_VERSION}")
else()
Expand Down
1 change: 0 additions & 1 deletion main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ endif()
idf_component_register(
SRC_DIRS
"."
"endpoint"
"${WILLOW_ETHERNET_SRC_DIRS}"
INCLUDE_DIRS
"."
Expand Down
153 changes: 7 additions & 146 deletions main/audio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include "esp_http_client.h"
#include "esp_log.h"
#include "esp_lvgl_port.h"
#include "esp_task_wdt.h"
#include "esp_timer.h"
#include "filter_resample.h"
#include "flac_decoder.h"
Expand All @@ -34,23 +33,10 @@
#include "ui.h"
#include "was.h"

#include "endpoint/hass.h"
#include "endpoint/openhab.h"
#include "endpoint/rest.h"

#if !defined(CONFIG_TASK_WDT_PANIC)
#define CONFIG_TASK_WDT_PANIC 10
#endif

#if defined(WILLOW_SUPPORT_MULTINET)
#include "generated_cmd_multinet.h"
#endif

#define DEFAULT_AUDIO_CODEC "PCM"
#define DEFAULT_AUDIO_RESPONSE_TYPE "None"
#define DEFAULT_RECORD_BUFFER 12
#define DEFAULT_SPEAKER_VOLUME 60
#define DEFAULT_SPEECH_REC_MODE "WIS"
#define DEFAULT_STREAM_TIMEOUT 5
#define DEFAULT_VAD_MODE 3
#define DEFAULT_VAD_TIMEOUT 300
Expand All @@ -61,7 +47,6 @@

#define HTTP_STREAM_TIMEOUT_MS 10 * 1000

#define MULTINET_TWDT 30
#define STR_WAKE_LEN 25
#define WIS_URL_TTS_ARG "?format=WAV&speaker=CLB&text="

Expand Down Expand Up @@ -360,11 +345,7 @@ static void init_esp_audio(void)

static esp_err_t cb_ar_event(audio_rec_evt_t *are, void *data)
{
char *speech_rec_mode = NULL;
int msg = -1;
#if defined(WILLOW_SUPPORT_MULTINET)
int command_id = 0;
#endif

switch (are->type) {
case AUDIO_REC_VAD_END:
Expand All @@ -381,31 +362,9 @@ static esp_err_t cb_ar_event(audio_rec_evt_t *are, void *data)
recording = true;
}

speech_rec_mode = config_get_char("speech_rec_mode", DEFAULT_SPEECH_REC_MODE);
if (strcmp(speech_rec_mode, "Multinet") == 0) {
msg = MSG_START_LOCAL;
} else if (strcmp(speech_rec_mode, "WIS") == 0) {
msg = MSG_START;
} else {
free(speech_rec_mode);
return ESP_ERR_INVALID_ARG;
}
free(speech_rec_mode);
msg = MSG_START;
xQueueSend(q_rec, &msg, 0);
break;
case AUDIO_REC_COMMAND_DECT:
// Multinet timeout
ESP_LOGI(TAG, "AUDIO_REC_COMMAND_DECT");
war.fn_err("unrecognized command");
if (lvgl_port_lock(lvgl_lock_timeout)) {
lv_obj_clear_flag(lbl_ln4, LV_OBJ_FLAG_HIDDEN);
lv_obj_set_style_text_align(lbl_ln4, LV_TEXT_ALIGN_LEFT, 0);
lv_label_set_text(lbl_ln4, "#ff0000 Unrecognized Command");
lvgl_port_unlock();
}

reset_timer(hdl_display_timer, config_get_int("display_timeout", DEFAULT_DISPLAY_TIMEOUT), false);
break;
case AUDIO_REC_WAKEUP_END:
ESP_LOGI(TAG, "AUDIO_REC_WAKEUP_END");
msg = MSG_STOP;
Expand All @@ -428,12 +387,7 @@ static esp_err_t cb_ar_event(audio_rec_evt_t *are, void *data)
ESP_LOGI(TAG, "wake volume: %f", wake_data->data_volume);
send_wake_start(wake_data->data_volume);
reset_timer(hdl_display_timer, config_get_int("display_timeout", DEFAULT_DISPLAY_TIMEOUT), true);

speech_rec_mode = config_get_char("speech_rec_mode", DEFAULT_SPEECH_REC_MODE);

if (strcmp(speech_rec_mode, "WIS") == 0) {
reset_timer(hdl_sess_timer, config_get_int("stream_timeout", DEFAULT_STREAM_TIMEOUT), false);
}
reset_timer(hdl_sess_timer, config_get_int("stream_timeout", DEFAULT_STREAM_TIMEOUT), false);
if (lvgl_port_lock(lvgl_lock_timeout)) {
lv_obj_add_flag(lbl_ln1, LV_OBJ_FLAG_HIDDEN);
lv_obj_add_flag(lbl_ln2, LV_OBJ_FLAG_HIDDEN);
Expand All @@ -442,62 +396,15 @@ static esp_err_t cb_ar_event(audio_rec_evt_t *are, void *data)
lv_obj_clear_flag(btn_cancel, LV_OBJ_FLAG_HIDDEN);
lv_obj_clear_flag(lbl_ln3, LV_OBJ_FLAG_HIDDEN);

if (strcmp(speech_rec_mode, "Multinet") == 0) {
lv_label_set_text_static(lbl_ln3, "Say local command...");
} else if (strcmp(speech_rec_mode, "WIS") == 0) {
lv_label_set_text_static(lbl_ln3, "Say command...");
} else {
return ESP_ERR_INVALID_ARG;
}
lv_label_set_text_static(lbl_ln3, "Say command...");

lv_obj_add_event_cb(btn_cancel, cb_btn_cancel, LV_EVENT_PRESSED, NULL);
lvgl_port_unlock();
}
free(speech_rec_mode);
display_set_backlight(true, false);
break;
default:
speech_rec_mode = config_get_char("speech_rec_mode", DEFAULT_SPEECH_REC_MODE);
if (strcmp(speech_rec_mode, "Multinet") == 0) {
#if defined(WILLOW_SUPPORT_MULTINET)
// Catch all for local commands
command_id = are->type;
bool was_mode = config_get_bool("was_mode", DEFAULT_WAS_MODE);
char *command_endpoint = config_get_char("command_endpoint", DEFAULT_COMMAND_ENDPOINT);
char *json;
json = calloc(29 + strlen(lookup_cmd_multinet(command_id)), sizeof(char));
snprintf(json, 29 + strlen(lookup_cmd_multinet(command_id)), "{\"text\":\"%s\",\"language\":\"en\"}",
lookup_cmd_multinet(command_id));
if (was_mode) {
was_send_endpoint(json, false);
} else if (strcmp(command_endpoint, "Home Assistant") == 0) {
hass_send(json);
} else if (strcmp(command_endpoint, "openHAB") == 0) {
openhab_send(lookup_cmd_multinet(command_id));
} else if (strcmp(command_endpoint, "REST") == 0) {
rest_send(json);
}
free(command_endpoint);
free(json);

ESP_LOGI(TAG, "Got local command ID: '%d'", command_id);
if (lvgl_port_lock(lvgl_lock_timeout)) {
lv_obj_clear_flag(lbl_ln1, LV_OBJ_FLAG_HIDDEN);
lv_obj_clear_flag(lbl_ln2, LV_OBJ_FLAG_HIDDEN);
lv_obj_add_flag(lbl_ln3, LV_OBJ_FLAG_HIDDEN);

lv_label_set_text_static(lbl_ln1, "I heard command:");
lv_label_set_text(lbl_ln2, lookup_cmd_multinet(command_id));
lvgl_port_unlock();
}
reset_timer(hdl_display_timer, config_get_int("display_timeout", DEFAULT_DISPLAY_TIMEOUT), false);
#else
ESP_LOGE(TAG, "multinet not supported but enabled in config");
#endif
} else {
ESP_LOGI(TAG, "cb_ar_event: unhandled event: '%d'", are->type);
}
free(speech_rec_mode);
ESP_LOGI(TAG, "cb_ar_event: unhandled event: '%d'", are->type);
break;
}

Expand Down Expand Up @@ -615,18 +522,7 @@ static esp_err_t hdl_ev_hs_to_api(http_stream_event_msg_t *msg)
lv_obj_add_flag(lbl_ln4, LV_OBJ_FLAG_HIDDEN);
lvgl_port_unlock();
}
bool was_mode = config_get_bool("was_mode", DEFAULT_WAS_MODE);
char *command_endpoint = config_get_char("command_endpoint", DEFAULT_COMMAND_ENDPOINT);
if (was_mode) {
was_send_endpoint(buf, false);
} else if (strcmp(command_endpoint, "Home Assistant") == 0) {
hass_send(buf);
} else if (strcmp(command_endpoint, "openHAB") == 0) {
openhab_send(buf);
} else if (strcmp(command_endpoint, "REST") == 0) {
rest_send(buf);
}
free(command_endpoint);
was_send_endpoint(buf, false);

cJSON *cjson = cJSON_Parse(buf);
cJSON *text = cJSON_GetObjectItemCaseSensitive(cjson, "text");
Expand Down Expand Up @@ -825,7 +721,6 @@ static esp_err_t start_rec(void)
recorder_sr_cfg_t cfg_srr = {
.afe_cfg = cfg_afe,
.input_order = INPUT_ORDER_DEFAULT(),
.multinet_init = false,
.feed_task_core = FEED_TASK_PINNED_CORE,
.feed_task_prio = FEED_TASK_PRIO,
.feed_task_stack = FEED_TASK_STACK_SZ,
Expand All @@ -834,37 +729,12 @@ static esp_err_t start_rec(void)
.fetch_task_stack = FETCH_TASK_STACK_SZ,
.rb_size = 12 * 1024, // default is 6 * 1024
.partition_label = "model",
.mn_language = ESP_MN_ENGLISH,
.wn_wakeword = wake_word,
};

ESP_LOGI(TAG, "Using record buffer '%d'", config_get_int("record_buffer", DEFAULT_RECORD_BUFFER));
cfg_srr.rb_size = config_get_int("record_buffer", DEFAULT_RECORD_BUFFER) * 1024;

char *speech_rec_mode = config_get_char("speech_rec_mode", DEFAULT_SPEECH_REC_MODE);
if (strcmp(speech_rec_mode, "Multinet") == 0) {
#if defined(WILLOW_SUPPORT_MULTINET)
esp_task_wdt_config_t twdt_config = {
.timeout_ms = MULTINET_TWDT,
.idle_core_mask = 0,
.trigger_panic = CONFIG_TASK_WDT_PANIC ? true : false,
};

ESP_LOGI(TAG, "Using local multinet");
ESP_LOGI(TAG, "cmd_multinet[] size: %u bytes", get_cmd_multinet_size());
#if defined(CONFIG_ESP_TASK_WDT_INIT)
esp_task_wdt_reconfigure(&twdt_config);
#else
esp_task_wdt_init(&twdt_config);
#endif
cfg_srr.multinet_init = true;
cfg_srr.rb_size = 6 * 1024;
#else
ESP_LOGE(TAG, "multinet not supported but enabled in config");
#endif
}
free(speech_rec_mode);

recorder_encoder_cfg_t recorder_encoder_cfg = {0};

char *audio_codec = config_get_char("audio_codec", DEFAULT_AUDIO_CODEC);
Expand Down Expand Up @@ -944,9 +814,6 @@ static void at_read(void *data)
stream_to_api = true;
// this confirms that the URL is still set correctly
ESP_LOGI(TAG, "Using WIS URL '%s'", audio_element_get_uri(hdl_ae_hs));
__attribute__((fallthrough));
case MSG_START_LOCAL:
recording = true;
break;
case MSG_STOP:
delay = portMAX_DELAY;
Expand Down Expand Up @@ -1020,7 +887,6 @@ void init_adc(void)

esp_err_t init_audio(void)
{
char *speech_rec_mode = config_get_char("speech_rec_mode", DEFAULT_SPEECH_REC_MODE);
char *wake_word = config_get_char("wake_word", DEFAULT_WAKE_WORD);
esp_err_t ret = ESP_OK;

Expand All @@ -1039,10 +905,7 @@ esp_err_t init_audio(void)

init_audio_response();
init_session_timer();
if (strcmp(speech_rec_mode, "WIS") == 0) {
init_ap_to_api();
}
free(speech_rec_mode);
init_ap_to_api();
ESP_RETURN_ON_ERROR(start_rec(), TAG, "start_rec failed");
hdl_aha->audio_codec_set_volume(config_get_int("mic_gain", DEFAULT_MIC_GAIN));

Expand Down Expand Up @@ -1101,13 +964,11 @@ void deinit_audio(void)
audio_pipeline_wait_for_stop(hdl_ap);
audio_pipeline_terminate(hdl_ap);
}
char *speech_rec_mode = config_get_char("speech_rec_mode", DEFAULT_SPEECH_REC_MODE);
if (strcmp(speech_rec_mode, "WIS") && hdl_ap_to_api != NULL) {
if (hdl_ap_to_api != NULL) {
audio_pipeline_stop(hdl_ap_to_api);
audio_pipeline_wait_for_stop(hdl_ap_to_api);
audio_pipeline_terminate(hdl_ap_to_api);
}
free(speech_rec_mode);
if (hdl_ea != NULL) {
esp_audio_destroy(hdl_ea);
}
Expand Down
1 change: 0 additions & 1 deletion main/audio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ struct willow_audio_response {
typedef enum {
MSG_STOP,
MSG_START,
MSG_START_LOCAL,
} q_msg;

extern audio_rec_handle_t hdl_ar;
Expand Down
2 changes: 0 additions & 2 deletions main/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "audio.h"
#include "config.h"
#include "display.h"
#include "endpoint/hass.h"
#include "shared.h"
#include "slvgl.h"
#include "system.h"
Expand Down Expand Up @@ -133,7 +132,6 @@ void config_write(const char *data)
{
deinit_was();
deinit_audio();
deinit_hass();

FILE *f = fopen(CONFIG_PATH, "w");
if (f == NULL) {
Expand Down
Loading
Loading