diff --git a/CMakeLists.txt b/CMakeLists.txt index dc4de8e5..64fd5d59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,5 @@ set(CORE_SRCS cores/esp32/esp32-hal-adc.c - cores/esp32/esp32-hal-bt.c cores/esp32/esp32-hal-cpu.c cores/esp32/esp32-hal-dac.c cores/esp32/esp32-hal-gpio.c diff --git a/cores/esp32/esp32-hal-bt.c b/cores/esp32/esp32-hal-bt.c deleted file mode 100644 index 99762243..00000000 --- a/cores/esp32/esp32-hal-bt.c +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at - -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "esp32-hal-bt.h" - -#ifdef CONFIG_BT_ENABLED - -bool btInUse(){ return true; } - -#ifdef CONFIG_BLUEDROID_ENABLED -#include "esp_bt.h" - -#ifdef CONFIG_CLASSIC_BT_ENABLED -#define BT_MODE ESP_BT_MODE_BTDM -#else -#define BT_MODE ESP_BT_MODE_BLE -#endif - -bool btStarted(){ - return (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED); -} - -bool btStart(){ - esp_bt_controller_config_t cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); - if(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED){ - return true; - } - if(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE){ - esp_bt_controller_init(&cfg); - while(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE){} - } - if(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_INITED){ - if (esp_bt_controller_enable(BT_MODE)) { - log_e("BT Enable failed"); - return false; - } - } - if(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED){ - return true; - } - log_e("BT Start failed"); - return false; -} - -bool btStop(){ - if(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE){ - return true; - } - if(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED){ - if (esp_bt_controller_disable()) { - log_e("BT Disable failed"); - return false; - } - while(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED); - } - if(esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_INITED){ - if (esp_bt_controller_deinit()) { - log_e("BT deint failed"); - return false; - } - vTaskDelay(1); - if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_IDLE) { - return false; - } - return true; - } - log_e("BT Stop failed"); - return false; -} - -#else -bool btStarted() -{ - return false; -} - -bool btStart() -{ - return false; -} - -bool btStop() -{ - return false; -} -#endif -#endif - diff --git a/cores/esp32/esp32-hal-bt.h b/cores/esp32/esp32-hal-bt.h deleted file mode 100644 index 56222da3..00000000 --- a/cores/esp32/esp32-hal-bt.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at - -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef _ESP32_ESP32_HAL_BT_H_ -#define _ESP32_ESP32_HAL_BT_H_ - -#include "esp32-hal.h" - -#ifdef __cplusplus -extern "C" { -#endif - -bool btStarted(); -bool btStart(); -bool btStop(); - -#ifdef __cplusplus -} -#endif - -#endif /* _ESP32_ESP32_HAL_BT_H_ */ diff --git a/cores/esp32/esp32-hal.h b/cores/esp32/esp32-hal.h index 577dc79e..129bb37a 100644 --- a/cores/esp32/esp32-hal.h +++ b/cores/esp32/esp32-hal.h @@ -73,7 +73,6 @@ void yield(void); #include "esp32-hal-rmt.h" #include "esp32-hal-sigmadelta.h" #include "esp32-hal-timer.h" -#include "esp32-hal-bt.h" #include "esp32-hal-psram.h" #include "esp32-hal-cpu.h"