anc: Fix enable/disable from slave bud
Switching ANC on or off from master bud has always worked since we could just straight up enable it and no command had to be sent. When switching from slave bud we had to send the command to enable or disable it via app_anc_key. Issue is the handling of this request is from app_anc_cmd_receive_process which is not called without APP_ANC being defined. This commit cleans up the way ANC is enabled and also fixes slave bud ANC switching by implementing the actual code path :)
This commit is contained in:
parent
15fe2d36ea
commit
daaaadc56d
|
@ -1531,13 +1531,6 @@ void app_anc_key(APP_KEY_STATUS *status, void *param) {
|
||||||
bool flag = app_anc_work_status();
|
bool flag = app_anc_work_status();
|
||||||
|
|
||||||
#if defined(IBRT)
|
#if defined(IBRT)
|
||||||
ibrt_ctrl_t *p_ibrt_ctrl = app_tws_ibrt_get_bt_ctrl_ctx();
|
|
||||||
|
|
||||||
TRACE(2, "[%s] current_role: %d", __func__, p_ibrt_ctrl->current_role);
|
|
||||||
if (p_ibrt_ctrl->current_role == IBRT_SLAVE) {
|
|
||||||
app_anc_notify_master_to_exchange_coef(0, 0);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
app_anc_status_sync(!flag);
|
app_anc_status_sync(!flag);
|
||||||
#endif
|
#endif
|
||||||
app_anc_status_post(!flag);
|
app_anc_status_post(!flag);
|
||||||
|
|
|
@ -118,6 +118,12 @@ void send_prev_track(void) {
|
||||||
uint8_t action[] = {IBRT_ACTION_BACKWARD};
|
uint8_t action[] = {IBRT_ACTION_BACKWARD};
|
||||||
app_ibrt_if_start_user_action(action, sizeof(action));
|
app_ibrt_if_start_user_action(action, sizeof(action));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void send_enable_disable_anc(void) {
|
||||||
|
uint8_t action[] = {IBRT_ACTION_ANC_NOTIRY_MASTER_EXCHANGE_COEF};
|
||||||
|
app_ibrt_if_start_user_action(action, sizeof(action));
|
||||||
|
}
|
||||||
|
|
||||||
void app_key_single_tap(APP_KEY_STATUS *status, void *param) {
|
void app_key_single_tap(APP_KEY_STATUS *status, void *param) {
|
||||||
TRACE(2, "%s event %d", __func__, status->event);
|
TRACE(2, "%s event %d", __func__, status->event);
|
||||||
|
|
||||||
|
@ -138,6 +144,7 @@ void app_key_single_tap(APP_KEY_STATUS *status, void *param) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void app_key_double_tap(APP_KEY_STATUS *status, void *param) {
|
void app_key_double_tap(APP_KEY_STATUS *status, void *param) {
|
||||||
TRACE(2, "%s event %d", __func__, status->event);
|
TRACE(2, "%s event %d", __func__, status->event);
|
||||||
|
|
||||||
|
@ -179,6 +186,7 @@ void app_key_triple_tap(APP_KEY_STATUS *status, void *param) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void app_key_quad_tap(APP_KEY_STATUS *status, void *param) {
|
void app_key_quad_tap(APP_KEY_STATUS *status, void *param) {
|
||||||
TRACE(2, "%s event %d", __func__, status->event);
|
TRACE(2, "%s event %d", __func__, status->event);
|
||||||
|
|
||||||
|
@ -207,7 +215,7 @@ void app_key_long_press_down(APP_KEY_STATUS *status, void *param) {
|
||||||
send_prev_track();
|
send_prev_track();
|
||||||
} else {
|
} else {
|
||||||
// Bud's are working as a pair
|
// Bud's are working as a pair
|
||||||
app_anc_key(status, param);
|
send_enable_disable_anc();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -268,4 +276,4 @@ void app_key_init_on_charging(void) {
|
||||||
for (i = 0; i < (sizeof(key_cfg) / sizeof(APP_KEY_HANDLE)); i++) {
|
for (i = 0; i < (sizeof(key_cfg) / sizeof(APP_KEY_HANDLE)); i++) {
|
||||||
app_key_handle_registration(&key_cfg[i]);
|
app_key_handle_registration(&key_cfg[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -279,6 +279,7 @@ void app_ibrt_ui_perform_user_action(uint8_t *p_buff, uint16_t length) {
|
||||||
ibrt_ctrl_t *p_ibrt_ctrl = app_tws_ibrt_get_bt_ctrl_ctx();
|
ibrt_ctrl_t *p_ibrt_ctrl = app_tws_ibrt_get_bt_ctrl_ctx();
|
||||||
|
|
||||||
#ifdef ANC_APP
|
#ifdef ANC_APP
|
||||||
|
//Doesnt actully get used!!!
|
||||||
app_anc_cmd_receive_process(p_buff, length);
|
app_anc_cmd_receive_process(p_buff, length);
|
||||||
#endif
|
#endif
|
||||||
#ifdef ANC_WNR_ENABLED
|
#ifdef ANC_WNR_ENABLED
|
||||||
|
@ -352,6 +353,9 @@ void app_ibrt_ui_perform_user_action(uint8_t *p_buff, uint16_t length) {
|
||||||
app_bt_volumedown();
|
app_bt_volumedown();
|
||||||
app_ibrt_sync_volume_info();
|
app_ibrt_sync_volume_info();
|
||||||
break;
|
break;
|
||||||
|
case IBRT_ACTION_ANC_NOTIRY_MASTER_EXCHANGE_COEF:
|
||||||
|
app_anc_key(NULL, NULL);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
TRACE(2, "%s unknown user action %d\n", __func__, p_buff[0]);
|
TRACE(2, "%s unknown user action %d\n", __func__, p_buff[0]);
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue