From e462fa5e477112ff6b406109e10a3af11807b489 Mon Sep 17 00:00:00 2001 From: MiroZ Date: Tue, 28 May 2024 18:54:41 -0700 Subject: [PATCH] working ble --- components/system/CMakeLists.txt | 16 + components/system/Mutex.cpp | 25 ++ components/system/Mutex.h | 22 ++ main/App.cpp | 20 +- main/App.h | 2 + main/Ble.cpp | 105 +++++++ main/Ble.h | 41 +++ main/CMakeLists.txt | 9 +- main/Led.cpp | 3 +- main/Mqtt.cpp | 2 +- main/{OTA.cpp => Ota.cpp} | 12 +- main/{OTA.h => Ota.h} | 6 +- main/ProvisionSoftAP.cpp | 6 +- main/ReaderWriter.cpp | 2 +- main/ReaderWriter.h | 2 +- main/Settings.cpp | 36 +-- main/Settings.h | 18 +- main/TaskMgr.cpp | 2 + main/Wifi.cpp | 8 +- main/app_config.h | 24 +- main/errors.h | 4 +- main/main.cpp | 2 - main/main.h | 5 + mosquitto.org.crt | 24 -- sdkconfig | 484 ++++++++++++++++++++++++++++++- sdkconfig.old | 280 +++++++++++++++++- wellhub.code-workspace | 80 +++++ 27 files changed, 1135 insertions(+), 105 deletions(-) create mode 100755 components/system/CMakeLists.txt create mode 100644 components/system/Mutex.cpp create mode 100644 components/system/Mutex.h create mode 100644 main/Ble.cpp create mode 100644 main/Ble.h rename main/{OTA.cpp => Ota.cpp} (98%) rename main/{OTA.h => Ota.h} (89%) create mode 100644 main/main.h delete mode 100755 mosquitto.org.crt create mode 100644 wellhub.code-workspace diff --git a/components/system/CMakeLists.txt b/components/system/CMakeLists.txt new file mode 100755 index 0000000..8eec434 --- /dev/null +++ b/components/system/CMakeLists.txt @@ -0,0 +1,16 @@ +set(COMPONENT_SRCDIRS + "." +) + +set(COMPONENT_ADD_INCLUDEDIRS + "." +) + +set(COMPONENT_REQUIRES + +) + +register_component() + +target_compile_definitions(${COMPONENT_TARGET} PUBLIC -DESP32) +#target_compile_options(${COMPONENT_TARGET} PRIVATE -fno-rtti) diff --git a/components/system/Mutex.cpp b/components/system/Mutex.cpp new file mode 100644 index 0000000..e5b721c --- /dev/null +++ b/components/system/Mutex.cpp @@ -0,0 +1,25 @@ +/// © MiroZ 2024 + +#include "Mutex.h" +#include + + +Mutex::Mutex() +{ + assert(m_mutex = xSemaphoreCreateMutex()); +} + +Mutex::Mutex(SemaphoreHandle_t mutex) +{ + m_mutex = mutex; +} + +bool Mutex::take(uint32_t ticks) +{ + return xSemaphoreTake(m_mutex, ticks); +} + +bool Mutex::give() +{ + return xSemaphoreGive(m_mutex); +} \ No newline at end of file diff --git a/components/system/Mutex.h b/components/system/Mutex.h new file mode 100644 index 0000000..ab5e467 --- /dev/null +++ b/components/system/Mutex.h @@ -0,0 +1,22 @@ +/// © MiroZ 2024 + +#ifndef __MUTEX_H__ +#define __MUTEX_H__ + +#include +#include + +class Mutex +{ +protected: + SemaphoreHandle_t m_mutex = NULL; + +public: + Mutex(); + Mutex(SemaphoreHandle_t mutex); + + bool take(uint32_t ticks = portMAX_DELAY); + bool give(); +}; + +#endif \ No newline at end of file diff --git a/main/App.cpp b/main/App.cpp index 6a92780..181fdd5 100644 --- a/main/App.cpp +++ b/main/App.cpp @@ -6,13 +6,9 @@ #include "Settings.h" #include "errors.h" -#include "OTA.h" +#include "Ota.h" #include "ProvisionSoftAP.h" -#include - -#include "Mqtt.h" -#include #define LED_PIN 26 @@ -25,6 +21,8 @@ App::App() void App::init() { + ESP_LOGW(TAG, "Starting the app..."); + m_led = new Led(LED_PIN); m_wifi = new Wifi(); @@ -37,19 +35,19 @@ void App::init() m_wifi->start(); Wifi::WIFI_STATUS wifi_status = m_wifi->waitForConnection(); - + if(wifi_status == Wifi::WIFI_STATUS::CONNECTED) { ESP_LOGI(TAG, "Getting local time..."); struct tm timeinfo; - configTime(0, 0, "pool.ntp.org"); + + configTime(0, 0, "pool.ntp.org"); // needed? + if(getLocalTime(&timeinfo)) ESP_LOGI(TAG, "ok"); else ESP_LOGE(TAG, "Failed"); - // m_led->setColor(0, 0, 0); - MDNS.begin("esp32"); needs_provision = false; } } @@ -68,11 +66,13 @@ void App::init() m_mqtt = new Mqtt(); m_mqtt->start(); + m_ble = new Ble(*this); + m_ble->start(); } void App::otaCheck() { - OTA ota(*this); + Ota ota(*this); ota.start(); } diff --git a/main/App.h b/main/App.h index 246d522..06909a0 100644 --- a/main/App.h +++ b/main/App.h @@ -9,12 +9,14 @@ #include "Led.h" #include "Wifi.h" #include "Mqtt.h" +#include "Ble.h" class App { protected: Wifi * m_wifi = nullptr; Mqtt * m_mqtt = nullptr; + Ble * m_ble = nullptr; public: Led * m_led = nullptr; diff --git a/main/Ble.cpp b/main/Ble.cpp new file mode 100644 index 0000000..160c61a --- /dev/null +++ b/main/Ble.cpp @@ -0,0 +1,105 @@ +/// © MiroZ 2024 + +#include "App.h" +#include "Settings.h" +#include +#include "ReaderWriter.h" + +#include "Ble.h" + +static const char * TAG = "ble"; + +#define SERVICE_UUID "4fafc201-1fb5-459e-8fcc-c5c9c331914b" +#define CHARACTERISTIC_UUID "beb5483e-36e1-4688-b7f5-ea07361b26a8" + +Ble::Ble(App & app) : m_app(app) +{ + m_rw = new ReaderWriter(256); +} + +void Ble::start() +{ + ESP_LOGW(TAG, "Starting BLE..."); + + uint8_t wifi_mac[8]; + esp_read_mac(wifi_mac, ESP_MAC_WIFI_STA); + + sprintf(m_name, "WP_%u_%02x%02x%02x", SETTINGS.device.id, wifi_mac[3], wifi_mac[4], wifi_mac[5]); + + BLEDevice::init(m_name); + + assert(m_server = BLEDevice::createServer()); + m_server->setCallbacks(this); + assert(m_service = m_server->createService(SERVICE_UUID)); + + m_characteristic = m_service->createCharacteristic(CHARACTERISTIC_UUID, + BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE | BLECharacteristic::PROPERTY_NOTIFY); + + m_characteristic->addDescriptor(new BLE2902()); + m_characteristic->setCallbacks(this); + m_service->start(); + + assert(m_advertising = m_server->getAdvertising()); + m_advertising->addServiceUUID(SERVICE_UUID); + m_advertising->start(); +} + +void Ble::onConnect(BLEServer* pServer) +{ + uint16_t id = pServer->getConnId(); + ESP_LOGI(TAG, "%d connected", id); +} + +void Ble::onDisconnect(BLEServer* pServer) +{ + uint16_t id = pServer->getConnId(); + ESP_LOGI(TAG, "%d disconnected", id); + m_advertising->start(); +} + +void Ble::onRead(BLECharacteristic *pCharacteristic) +{ + int a = 1234; + pCharacteristic->setValue(a); + ESP_LOGI(TAG, "onRead hello"); +} + +void Ble::onWrite(BLECharacteristic *pCharacteristic) +{ + uint32_t len = pCharacteristic->getLength(); + uint8_t * data = pCharacteristic->getData(); + data[len] = 0; + + Parser p((char *)data, "|"); + char buffer[80]; + p.getElementAt(0, buffer, sizeof(buffer)); + + ESP_LOGI(TAG, "command '%s'", buffer); + + if(buffer[0] == 'w') + { + ESP_LOGI(TAG, "Scanning wifi networks..."); + + int num_networks = WiFi.scanNetworks(false, false, false, 0); + + m_rw->reset(); + m_rw->appendf("w|%d|", num_networks); + for(int n = 0; n < num_networks; n++) + { + m_rw->append(WiFi.SSID(n).c_str()); + m_rw->append(","); + m_rw->appendf("%d", WiFi.RSSI(n)); + if(n < num_networks-1) + m_rw->append("|"); + } + ESP_LOGI(TAG, "'%s'", m_rw->getBuffer()); + m_characteristic->setValue(m_rw->getBuffer()); + m_characteristic->notify(); + } + else if(buffer[0] == 'd') + { + SETTINGS.wifi.num = 0; + SETTINGS_SAVE; + esp_restart(); + } +} diff --git a/main/Ble.h b/main/Ble.h new file mode 100644 index 0000000..677033a --- /dev/null +++ b/main/Ble.h @@ -0,0 +1,41 @@ +/// © MiroZ 2024 + +#ifndef __BLE_H__ +#define __BLE_H__ + +#include +#include +#include "ReaderWriter.h" +#include +#include +#include + +class App; + +class Ble : public BLEServerCallbacks, BLECharacteristicCallbacks +{ +protected: + App & m_app; + + char m_name[32]; + + BLEServer *m_server = nullptr; + BLEService *m_service = nullptr; + BLEAdvertising *m_advertising = nullptr; + BLECharacteristic *m_characteristic = nullptr; + + ReaderWriter *m_rw = nullptr; + + void onConnect(BLEServer* pServer) override; + void onDisconnect(BLEServer* pServer) override; + void onRead(BLECharacteristic *pCharacteristic) override; + void onWrite(BLECharacteristic *pCharacteristic) override; + + +public: + Ble(App & app); + void start(); +}; + + +#endif \ No newline at end of file diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 1d3ad1c..92e9656 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -1,5 +1,5 @@ idf_component_register(SRCS main.cpp App.cpp Settings.cpp Led.cpp TaskMgr.cpp Wifi.cpp utilities.cpp - ProvisionSoftAP.cpp ReaderWriter.cpp OTA.cpp Mqtt.cpp + ProvisionSoftAP.cpp ReaderWriter.cpp Ota.cpp Mqtt.cpp Ble.cpp INCLUDE_DIRS "." EMBED_TXTFILES ../html/logo.png ../html/provision.html EMBED_TXTFILES ../certs/eventgrid.azure.pem ../certs/client1-authn-ID.key ../certs/client1-authn-ID.pem ../certs/bigfoot-inc.pem @@ -8,7 +8,12 @@ idf_component_register(SRCS main.cpp App.cpp Settings.cpp Led.cpp TaskMgr.cpp Wi #message(FATAL_ERROR "error ${ROLE}") #if(ROLE EQUAL 1) -target_compile_options(${COMPONENT_LIB} PRIVATE -frtti) +target_compile_options(${COMPONENT_LIB} PRIVATE) +#target_compile_options(${COMPONENT_LIB} PRIVATE -frtti) +#target_compile_options(${COMPONENT_LIB} PRIVATE -frtti) +#target_compile_options(${COMPONENT_LIB} PRIVATE) +#target_compile_options(${COMPONENT_TARGET} PRIVATE -frtti) + #if("${ROLE}" STREQUAL "SENDER") # add_compile_definitions(ROLE_SENDER) diff --git a/main/Led.cpp b/main/Led.cpp index a3fdc14..b155508 100644 --- a/main/Led.cpp +++ b/main/Led.cpp @@ -97,6 +97,8 @@ void Led::run() Led::Led(uint32_t pin) { + ESP_LOGW("led", "Starting led..."); + m_strip = new Adafruit_NeoPixel(1, pin, NEO_GRB + NEO_KHZ800); m_strip->begin(); @@ -121,7 +123,6 @@ Led::~Led() /// @param r red value 0-255 /// @param g green value 0-255 /// @param b blue value 0-255 -/// @param brightness brightness 0-100 (%). Default is 100% void Led::setColor(uint8_t r, uint8_t g, uint8_t b) { struct LED_QUEUE msg; diff --git a/main/Mqtt.cpp b/main/Mqtt.cpp index af5aca4..71854cb 100644 --- a/main/Mqtt.cpp +++ b/main/Mqtt.cpp @@ -61,7 +61,7 @@ void Mqtt::task() void Mqtt::start() { - ESP_LOGW(TAG, "Starting mqtt"); + ESP_LOGW(TAG, "Starting mqtt..."); m_esp_client = new WiFiClientSecure(); m_mqtt_client = new PubSubClient(*m_esp_client); diff --git a/main/OTA.cpp b/main/Ota.cpp similarity index 98% rename from main/OTA.cpp rename to main/Ota.cpp index 2f5e04c..958165d 100644 --- a/main/OTA.cpp +++ b/main/Ota.cpp @@ -16,24 +16,22 @@ #include "esp_partition.h" #include "string.h" -#include "OTA.h" +#include "Ota.h" #include #define OTA_URL "https://bigfoot-inc.com/fw/wellhub.bin" - extern const uint8_t server_cert[] asm("_binary_bigfoot_inc_pem_start"); - static const char *TAG = "OTA"; -OTA::OTA(App & app) : m_app(app) +Ota::Ota(App & app) : m_app(app) { } -void OTA::taskFatalError() +void Ota::taskFatalError() { ESP_LOGE(TAG, "Exiting task due to fatal error..."); (void) vTaskDelete(NULL); @@ -44,7 +42,7 @@ void OTA::taskFatalError() } } -void OTA::start() +void Ota::start() { esp_err_t err; /* update handle : set by esp_ota_begin(), must be freed via esp_ota_end() */ @@ -231,6 +229,6 @@ void OTA::start() return; } -OTA::~OTA() +Ota::~Ota() { } \ No newline at end of file diff --git a/main/OTA.h b/main/Ota.h similarity index 89% rename from main/OTA.h rename to main/Ota.h index 4b77de8..8a52f02 100644 --- a/main/OTA.h +++ b/main/Ota.h @@ -15,7 +15,7 @@ #include "App.h" -class OTA +class Ota { public: void start(); @@ -28,8 +28,8 @@ private: void taskFatalError(); public: - OTA(App & app); - virtual ~OTA(); + Ota(App & app); + virtual ~Ota(); }; #endif /* __OTA_H__ */ \ No newline at end of file diff --git a/main/ProvisionSoftAP.cpp b/main/ProvisionSoftAP.cpp index e9a72db..1d95db8 100755 --- a/main/ProvisionSoftAP.cpp +++ b/main/ProvisionSoftAP.cpp @@ -104,7 +104,7 @@ void ProvisionSoftAP::start(const char * ssid, const char * password) { // start AP - ESP_LOGW(TAG, "Starting provision"); + ESP_LOGW(TAG, "Starting provision..."); /* Soft AP network parameters */ IPAddress apIP(sta_ip); @@ -147,10 +147,10 @@ void ProvisionSoftAP::start(const char * ssid, const char * password) ESP_LOGI(TAG, "Found %d networks", num_networks); m_rwriter->reset(); m_rwriter->append("command:scan_wifi|"); - m_rwriter->fappend("num:%d|", num_networks); + m_rwriter->appendf("num:%d|", num_networks); for (int n = 0; n < num_networks; n++) { - m_rwriter->fappend("%s,%d,%d", WiFi.SSID(n), WiFi.encryptionType(n) == WIFI_AUTH_OPEN ? 0 : 1, WiFi.RSSI(n)); + m_rwriter->appendf("%s,%d,%d", WiFi.SSID(n), WiFi.encryptionType(n) == WIFI_AUTH_OPEN ? 0 : 1, WiFi.RSSI(n)); if(n != num_networks - 1) m_rwriter->append('|'); } diff --git a/main/ReaderWriter.cpp b/main/ReaderWriter.cpp index 348ad86..a6d80d0 100644 --- a/main/ReaderWriter.cpp +++ b/main/ReaderWriter.cpp @@ -43,7 +43,7 @@ uint32_t ReaderWriter::append(const char * str) return m_available; } -uint32_t ReaderWriter::fappend(const char * format, ... ) +uint32_t ReaderWriter::appendf(const char * format, ... ) { va_list arg; char buf[256]; diff --git a/main/ReaderWriter.h b/main/ReaderWriter.h index 1b72ce1..970e53d 100644 --- a/main/ReaderWriter.h +++ b/main/ReaderWriter.h @@ -140,7 +140,7 @@ protected: public: void reset(); uint32_t append(const char * str); - uint32_t fappend(const char * format, ... ); + uint32_t appendf(const char * format, ... ); uint32_t append(int32_t value, uint32_t base = 10); uint32_t append(char c); char * getBuffer(); diff --git a/main/Settings.cpp b/main/Settings.cpp index 9408a75..0a41184 100644 --- a/main/Settings.cpp +++ b/main/Settings.cpp @@ -20,9 +20,10 @@ Settings & Settings::getInstance() Settings::Settings() { - ESP_LOGI(TAG, "Starting settings..."); + ESP_LOGW(TAG, "Starting settings..."); + m_data = (struct NV_DATA *)malloc(sizeof(struct NV_DATA)); loadData(); - if(m_data.version != SETTINGS_VERSION) + if(m_data->version != SETTINGS_VERSION) setDefaults(); } @@ -51,17 +52,17 @@ uint32_t Settings::loadData() abort(); } - if(key_size != sizeof(m_data)) + if(key_size != sizeof(struct NV_DATA)) { ESP_LOGI(TAG, "Stored len (%d) doesn't match expected (%d), using default settings", - key_size, sizeof(m_data)); + key_size, sizeof(struct NV_DATA)); setDefaults(); - ESP_ERROR_CHECK(nvs_set_blob(handle, m_dataname, &m_data, sizeof(m_data))); + ESP_ERROR_CHECK(nvs_set_blob(handle, m_dataname, m_data, sizeof(m_data))); } else { ESP_LOGI(TAG, "reading blob"); - ESP_ERROR_CHECK(nvs_get_blob(handle, m_dataname, &m_data, &key_size)); + ESP_ERROR_CHECK(nvs_get_blob(handle, m_dataname, m_data, &key_size)); } nvs_close(handle); @@ -73,7 +74,7 @@ uint32_t Settings::saveData() { nvs_handle handle; ESP_ERROR_CHECK(nvs_open(m_namespace, NVS_READWRITE, &handle)); - ESP_ERROR_CHECK(nvs_set_blob(handle, m_dataname, &m_data, sizeof(m_data))); + ESP_ERROR_CHECK(nvs_set_blob(handle, m_dataname, m_data, sizeof(struct NV_DATA))); nvs_close(handle); return WH_OK; } @@ -81,19 +82,14 @@ uint32_t Settings::saveData() void Settings::setDefaults() { ESP_LOGI(TAG, "Setting defaults"); - memset(&m_data, 0, sizeof(m_data)); - m_data.version = SETTINGS_VERSION; + memset(m_data, 0, sizeof(struct NV_DATA)); + m_data->version = SETTINGS_VERSION; - m_data.led.brightness = 25; // 25 % - m_data.wifi.subnet_mask = PP_HTONL(LWIP_MAKEU32(255, 255, 255, 0)); - m_data.wifi.dns_primary = PP_HTONL(LWIP_MAKEU32(8, 8, 8, 8)); - m_data.wifi.dns_secondary = PP_HTONL(LWIP_MAKEU32(8, 8, 4, 4)); + m_data->led.brightness = 25; // 25 % + m_data->wifi.subnet_mask = PP_HTONL(LWIP_MAKEU32(255, 255, 255, 0)); + m_data->wifi.dns_primary = PP_HTONL(LWIP_MAKEU32(8, 8, 8, 8)); + m_data->wifi.dns_secondary = PP_HTONL(LWIP_MAKEU32(8, 8, 4, 4)); - // strcpy(m_data.wifi.entry[0].ssid, "gumball"); - // strcpy(m_data.wifi.entry[0].pwd, "mikelemembe"); - // strcpy(m_data.wifi.entry[1].ssid, "miro"); - // strcpy(m_data.wifi.entry[1].pwd, "mikelemembe"); - - // m_data.wifi.num = 2; - // m_data.wifi.selected = 0xff; + m_data->device.id = 101; + m_data->device.group_id = 5101; } \ No newline at end of file diff --git a/main/Settings.h b/main/Settings.h index 1eb102e..bc966a9 100644 --- a/main/Settings.h +++ b/main/Settings.h @@ -70,7 +70,7 @@ struct SETTINGS_LEGACY uint32_t TEMP_OFFSET; }; -#define SETTINGS_VERSION 2 // cannot be 0 +#define SETTINGS_VERSION 3 // cannot be 0 #define SETTINGS_NUM_WIFI_ENTRIES 8 // wifi definitions @@ -101,11 +101,23 @@ struct LED uint8_t brightness; }; +// + +// general device level settings +struct DEVICE +{ + uint32_t id; + uint32_t group_id; +}; + +// + struct NV_DATA { uint32_t version; struct LED led; struct WIFI wifi; + struct DEVICE device; }; #pragma pack(pop) @@ -116,7 +128,7 @@ protected: const char * m_namespace = "nv_data"; const char * m_dataname = "data_01"; - struct NV_DATA m_data; + struct NV_DATA * m_data; void setDefaults(); private: @@ -126,7 +138,7 @@ public: static Settings & getInstance(); public: - inline struct NV_DATA & data() {return m_data;}; + inline struct NV_DATA & data() {return * m_data;}; uint32_t loadData(); uint32_t saveData(); }; diff --git a/main/TaskMgr.cpp b/main/TaskMgr.cpp index eac25c0..202656c 100644 --- a/main/TaskMgr.cpp +++ b/main/TaskMgr.cpp @@ -11,6 +11,8 @@ TaskMgr::TaskMgr() { m_xMutex = xSemaphoreCreateMutex(); assert(m_xMutex); + ESP_LOGW(TAG, "Starting task manager..."); + #ifdef TASKMGR_TASK_NAME createTask(std::bind(&TaskMgr::task, this), TASKMGR_TASK_NAME, TASKMGR_TASK_STACK_SIZE, TASKMGR_TASK_PRIORITY, TASKMGR_TASK_CORE); #endif diff --git a/main/Wifi.cpp b/main/Wifi.cpp index 432d52c..2cab67f 100644 --- a/main/Wifi.cpp +++ b/main/Wifi.cpp @@ -101,7 +101,7 @@ int Wifi::start() { if(m_task == nullptr) { - ESP_LOGW(TAG, "Starting wifi"); + ESP_LOGW(TAG, "Starting wifi..."); m_task = TaskMgr::getInstance().createTask(std::bind(&Wifi::task, this), WIFI_TASK_NAME, WIFI_TASK_STACK_SIZE, WIFI_TASK_PRIORITY, WIFI_TASK_CORE); } return 0; @@ -157,7 +157,7 @@ Wifi::WIFI_STATUS Wifi::startConnecting() if(ssid_ix < 0) return WIFI_STATUS::NOT_PROVISIONED; - if(connectTo(ssid_ix) == WH_OK) + if(connectTo(ssid_ix) == WIFI_STATUS::CONNECTED) { SETTINGS.wifi.selected = ssid_ix; return WIFI_STATUS::CONNECTED; @@ -172,7 +172,7 @@ Wifi::WIFI_STATUS Wifi::startConnecting() ssid_ix = scan(); if(ssid_ix >= 0) { - if(connectTo(ssid_ix) == WH_OK) + if(connectTo(ssid_ix) == WIFI_STATUS::CONNECTED) return WIFI_STATUS::CONNECTED; else m_ignored[ssid_ix] = IGNORE_SSID_MINS; @@ -188,7 +188,7 @@ Wifi::WIFI_STATUS Wifi::startConnecting() { for(int n = 0; n < SETTINGS.wifi.num; n++) { - if(connectTo(n) == WH_OK) + if(connectTo(n) == WIFI_STATUS::CONNECTED) return WIFI_STATUS::CONNECTED; } } diff --git a/main/app_config.h b/main/app_config.h index 31ec673..671502c 100644 --- a/main/app_config.h +++ b/main/app_config.h @@ -4,22 +4,22 @@ #define __APP_CONFIG_H__ // LED task -#define LED_TASK_NAME "led" -#define LED_TASK_STACK_SIZE 2096 -#define LED_TASK_PRIORITY 5 -#define LED_TASK_CORE 0 +#define LED_TASK_NAME "led" +#define LED_TASK_STACK_SIZE 2096 +#define LED_TASK_PRIORITY 5 +#define LED_TASK_CORE 0 // WIFI task -#define WIFI_TASK_NAME "wifi" -#define WIFI_TASK_STACK_SIZE 4096 -#define WIFI_TASK_PRIORITY 5 -#define WIFI_TASK_CORE 0 +#define WIFI_TASK_NAME "wifi" +#define WIFI_TASK_STACK_SIZE 4096 +#define WIFI_TASK_PRIORITY 5 +#define WIFI_TASK_CORE 0 // MQTT task -#define MQTT_TASK_NAME "mqtt" -#define MQTT_TASK_STACK_SIZE 6144 -#define MQTT_TASK_PRIORITY 5 -#define MQTT_TASK_CORE 0 +#define MQTT_TASK_NAME "mqtt" +#define MQTT_TASK_STACK_SIZE 6144 +#define MQTT_TASK_PRIORITY 5 +#define MQTT_TASK_CORE 0 // task mgr task #define TASKMGR_TASK_NAME "task mgr" diff --git a/main/errors.h b/main/errors.h index c909a50..4f153e4 100644 --- a/main/errors.h +++ b/main/errors.h @@ -3,8 +3,6 @@ #ifndef __ERRORS_H__ #define __ERRORS_H__ -#define WH_OK 0 -#define WH_ERR_WIFI_NOT_PROVISIONED 1 -#define WH_ERR_WIFI_NOT_CONNECTED 2 +#define WH_OK 0 #endif \ No newline at end of file diff --git a/main/main.cpp b/main/main.cpp index e6f2a46..f9e1aa9 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -20,8 +20,6 @@ extern "C" void app_main(void) ESP_ERROR_CHECK(esp_task_wdt_init(15, false)); - ESP_LOGW(TAG, "Starting the app..."); - App * app = new App(); app->init(); app->start(); diff --git a/main/main.h b/main/main.h new file mode 100644 index 0000000..7e1eaa7 --- /dev/null +++ b/main/main.h @@ -0,0 +1,5 @@ +#ifndef __MAIN_H__ +#define __MAIN_H__ + + +#endif \ No newline at end of file diff --git a/mosquitto.org.crt b/mosquitto.org.crt deleted file mode 100755 index e76dbd8..0000000 --- a/mosquitto.org.crt +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEAzCCAuugAwIBAgIUBY1hlCGvdj4NhBXkZ/uLUZNILAwwDQYJKoZIhvcNAQEL -BQAwgZAxCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5Vbml0ZWQgS2luZ2RvbTEOMAwG -A1UEBwwFRGVyYnkxEjAQBgNVBAoMCU1vc3F1aXR0bzELMAkGA1UECwwCQ0ExFjAU -BgNVBAMMDW1vc3F1aXR0by5vcmcxHzAdBgkqhkiG9w0BCQEWEHJvZ2VyQGF0Y2hv -by5vcmcwHhcNMjAwNjA5MTEwNjM5WhcNMzAwNjA3MTEwNjM5WjCBkDELMAkGA1UE -BhMCR0IxFzAVBgNVBAgMDlVuaXRlZCBLaW5nZG9tMQ4wDAYDVQQHDAVEZXJieTES -MBAGA1UECgwJTW9zcXVpdHRvMQswCQYDVQQLDAJDQTEWMBQGA1UEAwwNbW9zcXVp -dHRvLm9yZzEfMB0GCSqGSIb3DQEJARYQcm9nZXJAYXRjaG9vLm9yZzCCASIwDQYJ -KoZIhvcNAQEBBQADggEPADCCAQoCggEBAME0HKmIzfTOwkKLT3THHe+ObdizamPg -UZmD64Tf3zJdNeYGYn4CEXbyP6fy3tWc8S2boW6dzrH8SdFf9uo320GJA9B7U1FW -Te3xda/Lm3JFfaHjkWw7jBwcauQZjpGINHapHRlpiCZsquAthOgxW9SgDgYlGzEA -s06pkEFiMw+qDfLo/sxFKB6vQlFekMeCymjLCbNwPJyqyhFmPWwio/PDMruBTzPH -3cioBnrJWKXc3OjXdLGFJOfj7pP0j/dr2LH72eSvv3PQQFl90CZPFhrCUcRHSSxo -E6yjGOdnz7f6PveLIB574kQORwt8ePn0yidrTC1ictikED3nHYhMUOUCAwEAAaNT -MFEwHQYDVR0OBBYEFPVV6xBUFPiGKDyo5V3+Hbh4N9YSMB8GA1UdIwQYMBaAFPVV -6xBUFPiGKDyo5V3+Hbh4N9YSMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL -BQADggEBAGa9kS21N70ThM6/Hj9D7mbVxKLBjVWe2TPsGfbl3rEDfZ+OKRZ2j6AC -6r7jb4TZO3dzF2p6dgbrlU71Y/4K0TdzIjRj3cQ3KSm41JvUQ0hZ/c04iGDg/xWf -+pp58nfPAYwuerruPNWmlStWAXf0UTqRtg4hQDWBuUFDJTuWuuBvEXudz74eh/wK -sMwfu1HFvjy5Z0iMDU8PUDepjVolOCue9ashlS4EB5IECdSR2TItnAIiIwimx839 -LdUdRudafMu5T5Xma182OC0/u/xRlEm+tvKGGmfFcN0piqVl8OrSPBgIlb+1IKJE -m/XriWr/Cq4h/JfB7NTsezVslgkBaoU= ------END CERTIFICATE----- diff --git a/sdkconfig b/sdkconfig index 19bc774..b99f2aa 100644 --- a/sdkconfig +++ b/sdkconfig @@ -245,9 +245,280 @@ CONFIG_APPTRACE_LOCK_ENABLE=y # # Bluetooth # -# CONFIG_BT_ENABLED is not set +CONFIG_BT_ENABLED=y + +# +# Bluetooth controller +# +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +# CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set +# CONFIG_BTDM_CTRL_MODE_BTDM is not set +CONFIG_BTDM_CTRL_BLE_MAX_CONN=3 +CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0 +CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0 +CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0 +CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=3 +CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=0 +CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0 +CONFIG_BTDM_CTRL_PINNED_TO_CORE_0=y +# CONFIG_BTDM_CTRL_PINNED_TO_CORE_1 is not set +CONFIG_BTDM_CTRL_PINNED_TO_CORE=0 +CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y +# CONFIG_BTDM_CTRL_HCI_MODE_UART_H4 is not set + +# +# MODEM SLEEP Options +# +CONFIG_BTDM_CTRL_MODEM_SLEEP=y +CONFIG_BTDM_CTRL_MODEM_SLEEP_MODE_ORIG=y +# CONFIG_BTDM_CTRL_MODEM_SLEEP_MODE_EVED is not set +CONFIG_BTDM_CTRL_LPCLK_SEL_MAIN_XTAL=y +# end of MODEM SLEEP Options + +CONFIG_BTDM_BLE_DEFAULT_SCA_250PPM=y +CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1 +CONFIG_BTDM_BLE_SCAN_DUPL=y +CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE=y +# CONFIG_BTDM_SCAN_DUPL_TYPE_DATA is not set +# CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE is not set +CONFIG_BTDM_SCAN_DUPL_TYPE=0 +CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=100 +CONFIG_BTDM_SCAN_DUPL_CACHE_REFRESH_PERIOD=0 +# CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN is not set +CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED=y +CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y +CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100 +CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20 +CONFIG_BTDM_RESERVE_DRAM=0xdb5c +CONFIG_BTDM_CTRL_HLI=y +# end of Bluetooth controller + +CONFIG_BT_BLUEDROID_ENABLED=y +# CONFIG_BT_NIMBLE_ENABLED is not set +# CONFIG_BT_CONTROLLER_ONLY is not set + +# +# Bluedroid Options +# +CONFIG_BT_BTC_TASK_STACK_SIZE=3072 +CONFIG_BT_BLUEDROID_PINNED_TO_CORE_0=y +# CONFIG_BT_BLUEDROID_PINNED_TO_CORE_1 is not set +CONFIG_BT_BLUEDROID_PINNED_TO_CORE=0 +CONFIG_BT_BTU_TASK_STACK_SIZE=4352 +# CONFIG_BT_BLUEDROID_MEM_DEBUG is not set +# CONFIG_BT_CLASSIC_ENABLED is not set +CONFIG_BT_BLE_ENABLED=y +CONFIG_BT_GATTS_ENABLE=y +# CONFIG_BT_GATTS_PPCP_CHAR_GAP is not set +# CONFIG_BT_BLE_BLUFI_ENABLE is not set +CONFIG_BT_GATT_MAX_SR_PROFILES=8 +CONFIG_BT_GATT_MAX_SR_ATTRIBUTES=100 +# CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL is not set +CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_AUTO=y +CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MODE=0 +# CONFIG_BT_GATTS_ROBUST_CACHING_ENABLED is not set +# CONFIG_BT_GATTS_DEVICE_NAME_WRITABLE is not set +# CONFIG_BT_GATTS_APPEARANCE_WRITABLE is not set +CONFIG_BT_GATTC_ENABLE=y +CONFIG_BT_GATTC_MAX_CACHE_CHAR=40 +CONFIG_BT_GATTC_NOTIF_REG_MAX=5 +# CONFIG_BT_GATTC_CACHE_NVS_FLASH is not set +CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=3 +CONFIG_BT_BLE_SMP_ENABLE=y +# CONFIG_BT_SMP_SLAVE_CON_PARAMS_UPD_ENABLE is not set +# CONFIG_BT_STACK_NO_LOG is not set + +# +# BT DEBUG LOG LEVEL +# +# CONFIG_BT_LOG_HCI_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_HCI_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_HCI_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_HCI_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_HCI_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_HCI_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_HCI_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_HCI_TRACE_LEVEL=2 +# CONFIG_BT_LOG_BTM_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_BTM_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_BTM_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_BTM_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_BTM_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_BTM_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_BTM_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_BTM_TRACE_LEVEL=2 +# CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_L2CAP_TRACE_LEVEL=2 +# CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL=2 +# CONFIG_BT_LOG_SDP_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_SDP_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_SDP_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_SDP_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_SDP_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_SDP_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_SDP_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_SDP_TRACE_LEVEL=2 +# CONFIG_BT_LOG_GAP_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_GAP_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_GAP_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_GAP_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_GAP_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_GAP_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_GAP_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_GAP_TRACE_LEVEL=2 +# CONFIG_BT_LOG_BNEP_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_BNEP_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_BNEP_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_BNEP_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_BNEP_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_BNEP_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_BNEP_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_BNEP_TRACE_LEVEL=2 +# CONFIG_BT_LOG_PAN_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_PAN_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_PAN_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_PAN_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_PAN_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_PAN_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_PAN_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_PAN_TRACE_LEVEL=2 +# CONFIG_BT_LOG_A2D_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_A2D_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_A2D_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_A2D_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_A2D_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_A2D_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_A2D_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_A2D_TRACE_LEVEL=2 +# CONFIG_BT_LOG_AVDT_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_AVDT_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_AVDT_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_AVDT_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_AVDT_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_AVDT_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_AVDT_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_AVDT_TRACE_LEVEL=2 +# CONFIG_BT_LOG_AVCT_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_AVCT_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_AVCT_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_AVCT_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_AVCT_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_AVCT_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_AVCT_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_AVCT_TRACE_LEVEL=2 +# CONFIG_BT_LOG_AVRC_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_AVRC_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_AVRC_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_AVRC_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_AVRC_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_AVRC_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_AVRC_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_AVRC_TRACE_LEVEL=2 +# CONFIG_BT_LOG_MCA_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_MCA_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_MCA_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_MCA_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_MCA_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_MCA_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_MCA_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_MCA_TRACE_LEVEL=2 +# CONFIG_BT_LOG_HID_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_HID_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_HID_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_HID_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_HID_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_HID_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_HID_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_HID_TRACE_LEVEL=2 +# CONFIG_BT_LOG_APPL_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_APPL_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_APPL_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_APPL_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_APPL_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_APPL_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_APPL_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_APPL_TRACE_LEVEL=2 +# CONFIG_BT_LOG_GATT_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_GATT_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_GATT_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_GATT_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_GATT_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_GATT_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_GATT_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_GATT_TRACE_LEVEL=2 +# CONFIG_BT_LOG_SMP_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_SMP_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_SMP_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_SMP_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_SMP_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_SMP_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_SMP_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_SMP_TRACE_LEVEL=2 +# CONFIG_BT_LOG_BTIF_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_BTIF_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_BTIF_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_BTIF_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_BTIF_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_BTIF_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_BTIF_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_BTIF_TRACE_LEVEL=2 +# CONFIG_BT_LOG_BTC_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_BTC_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_BTC_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_BTC_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_BTC_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_BTC_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_BTC_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_BTC_TRACE_LEVEL=2 +# CONFIG_BT_LOG_OSI_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_OSI_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_OSI_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_OSI_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_OSI_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_OSI_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_OSI_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_OSI_TRACE_LEVEL=2 +# CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_ERROR is not set +CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_WARNING=y +# CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_DEBUG is not set +# CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_VERBOSE is not set +CONFIG_BT_LOG_BLUFI_TRACE_LEVEL=2 +# end of BT DEBUG LOG LEVEL + +CONFIG_BT_ACL_CONNECTIONS=4 +CONFIG_BT_MULTI_CONNECTION_ENBALE=y +# CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST is not set +# CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY is not set +# CONFIG_BT_BLE_HOST_QUEUE_CONG_CHECK is not set +CONFIG_BT_SMP_ENABLE=y +CONFIG_BT_SMP_MAX_BONDS=15 +# CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set +CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30 +CONFIG_BT_MAX_DEVICE_NAME_LEN=32 +# CONFIG_BT_BLE_RPA_SUPPORTED is not set +CONFIG_BT_BLE_RPA_TIMEOUT=900 +# CONFIG_BT_BLE_HIGH_DUTY_ADV_INTERVAL is not set +# end of Bluedroid Options # end of Bluetooth +# CONFIG_BLE_MESH is not set + # # CoAP Configuration # @@ -394,7 +665,6 @@ CONFIG_ESP32_XTAL_FREQ_40=y # CONFIG_ESP32_XTAL_FREQ_AUTO is not set CONFIG_ESP32_XTAL_FREQ=40 # CONFIG_ESP32_DISABLE_BASIC_ROM_CONSOLE is not set -# CONFIG_ESP32_NO_BLOBS is not set # CONFIG_ESP32_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set # CONFIG_ESP32_COMPATIBLE_PRE_V3_1_BOOTLOADERS is not set # CONFIG_ESP32_USE_FIXED_STATIC_RAM_SIZE is not set @@ -615,7 +885,6 @@ CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=y # CONFIG_ESP_PANIC_HANDLER_IRAM is not set # CONFIG_ESP_DEBUG_STUBS_ENABLE is not set CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5=y -# CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_4 is not set # end of ESP System Settings # @@ -635,6 +904,7 @@ CONFIG_ESP_TIMER_IMPL_TG0_LAC=y # Wi-Fi # CONFIG_ESP32_WIFI_ENABLED=y +CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32 # CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set @@ -1347,7 +1617,9 @@ CONFIG_WL_SECTOR_SIZE=4096 # CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30 +# CONFIG_WIFI_PROV_BLE_BONDING is not set # CONFIG_WIFI_PROV_BLE_FORCE_ENCRYPTION is not set +# CONFIG_WIFI_PROV_KEEP_BLE_ON_AFTER_PROV is not set # end of Wi-Fi Provisioning Manager # @@ -1411,6 +1683,210 @@ CONFIG_STACK_CHECK_NONE=y # CONFIG_ESP32_APPTRACE_DEST_TRAX is not set CONFIG_ESP32_APPTRACE_DEST_NONE=y CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y +CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y +# CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY is not set +# CONFIG_BTDM_CONTROLLER_MODE_BTDM is not set +CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN=3 +CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=3 +CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0 +CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0 +CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0 +CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI=y +# CONFIG_BTDM_CONTROLLER_HCI_MODE_UART_H4 is not set +CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=y +CONFIG_BLE_SCAN_DUPLICATE=y +CONFIG_SCAN_DUPLICATE_BY_DEVICE_ADDR=y +# CONFIG_SCAN_DUPLICATE_BY_ADV_DATA is not set +# CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR is not set +CONFIG_SCAN_DUPLICATE_TYPE=0 +CONFIG_DUPLICATE_SCAN_CACHE_SIZE=100 +# CONFIG_BLE_MESH_SCAN_DUPLICATE_EN is not set +CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y +CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y +CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM=100 +CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD=20 +CONFIG_BLUEDROID_ENABLED=y +# CONFIG_NIMBLE_ENABLED is not set +CONFIG_BTC_TASK_STACK_SIZE=3072 +CONFIG_BLUEDROID_PINNED_TO_CORE_0=y +# CONFIG_BLUEDROID_PINNED_TO_CORE_1 is not set +CONFIG_BLUEDROID_PINNED_TO_CORE=0 +CONFIG_BTU_TASK_STACK_SIZE=4352 +# CONFIG_BLUEDROID_MEM_DEBUG is not set +# CONFIG_CLASSIC_BT_ENABLED is not set +CONFIG_GATTS_ENABLE=y +# CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL is not set +CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO=y +CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE=0 +CONFIG_GATTC_ENABLE=y +# CONFIG_GATTC_CACHE_NVS_FLASH is not set +CONFIG_BLE_SMP_ENABLE=y +# CONFIG_SMP_SLAVE_CON_PARAMS_UPD_ENABLE is not set +# CONFIG_HCI_TRACE_LEVEL_NONE is not set +# CONFIG_HCI_TRACE_LEVEL_ERROR is not set +CONFIG_HCI_TRACE_LEVEL_WARNING=y +# CONFIG_HCI_TRACE_LEVEL_API is not set +# CONFIG_HCI_TRACE_LEVEL_EVENT is not set +# CONFIG_HCI_TRACE_LEVEL_DEBUG is not set +# CONFIG_HCI_TRACE_LEVEL_VERBOSE is not set +CONFIG_HCI_INITIAL_TRACE_LEVEL=2 +# CONFIG_BTM_TRACE_LEVEL_NONE is not set +# CONFIG_BTM_TRACE_LEVEL_ERROR is not set +CONFIG_BTM_TRACE_LEVEL_WARNING=y +# CONFIG_BTM_TRACE_LEVEL_API is not set +# CONFIG_BTM_TRACE_LEVEL_EVENT is not set +# CONFIG_BTM_TRACE_LEVEL_DEBUG is not set +# CONFIG_BTM_TRACE_LEVEL_VERBOSE is not set +CONFIG_BTM_INITIAL_TRACE_LEVEL=2 +# CONFIG_L2CAP_TRACE_LEVEL_NONE is not set +# CONFIG_L2CAP_TRACE_LEVEL_ERROR is not set +CONFIG_L2CAP_TRACE_LEVEL_WARNING=y +# CONFIG_L2CAP_TRACE_LEVEL_API is not set +# CONFIG_L2CAP_TRACE_LEVEL_EVENT is not set +# CONFIG_L2CAP_TRACE_LEVEL_DEBUG is not set +# CONFIG_L2CAP_TRACE_LEVEL_VERBOSE is not set +CONFIG_L2CAP_INITIAL_TRACE_LEVEL=2 +# CONFIG_RFCOMM_TRACE_LEVEL_NONE is not set +# CONFIG_RFCOMM_TRACE_LEVEL_ERROR is not set +CONFIG_RFCOMM_TRACE_LEVEL_WARNING=y +# CONFIG_RFCOMM_TRACE_LEVEL_API is not set +# CONFIG_RFCOMM_TRACE_LEVEL_EVENT is not set +# CONFIG_RFCOMM_TRACE_LEVEL_DEBUG is not set +# CONFIG_RFCOMM_TRACE_LEVEL_VERBOSE is not set +CONFIG_RFCOMM_INITIAL_TRACE_LEVEL=2 +# CONFIG_SDP_TRACE_LEVEL_NONE is not set +# CONFIG_SDP_TRACE_LEVEL_ERROR is not set +CONFIG_SDP_TRACE_LEVEL_WARNING=y +# CONFIG_SDP_TRACE_LEVEL_API is not set +# CONFIG_SDP_TRACE_LEVEL_EVENT is not set +# CONFIG_SDP_TRACE_LEVEL_DEBUG is not set +# CONFIG_SDP_TRACE_LEVEL_VERBOSE is not set +CONFIG_BTH_LOG_SDP_INITIAL_TRACE_LEVEL=2 +# CONFIG_GAP_TRACE_LEVEL_NONE is not set +# CONFIG_GAP_TRACE_LEVEL_ERROR is not set +CONFIG_GAP_TRACE_LEVEL_WARNING=y +# CONFIG_GAP_TRACE_LEVEL_API is not set +# CONFIG_GAP_TRACE_LEVEL_EVENT is not set +# CONFIG_GAP_TRACE_LEVEL_DEBUG is not set +# CONFIG_GAP_TRACE_LEVEL_VERBOSE is not set +CONFIG_GAP_INITIAL_TRACE_LEVEL=2 +CONFIG_BNEP_INITIAL_TRACE_LEVEL=2 +# CONFIG_PAN_TRACE_LEVEL_NONE is not set +# CONFIG_PAN_TRACE_LEVEL_ERROR is not set +CONFIG_PAN_TRACE_LEVEL_WARNING=y +# CONFIG_PAN_TRACE_LEVEL_API is not set +# CONFIG_PAN_TRACE_LEVEL_EVENT is not set +# CONFIG_PAN_TRACE_LEVEL_DEBUG is not set +# CONFIG_PAN_TRACE_LEVEL_VERBOSE is not set +CONFIG_PAN_INITIAL_TRACE_LEVEL=2 +# CONFIG_A2D_TRACE_LEVEL_NONE is not set +# CONFIG_A2D_TRACE_LEVEL_ERROR is not set +CONFIG_A2D_TRACE_LEVEL_WARNING=y +# CONFIG_A2D_TRACE_LEVEL_API is not set +# CONFIG_A2D_TRACE_LEVEL_EVENT is not set +# CONFIG_A2D_TRACE_LEVEL_DEBUG is not set +# CONFIG_A2D_TRACE_LEVEL_VERBOSE is not set +CONFIG_A2D_INITIAL_TRACE_LEVEL=2 +# CONFIG_AVDT_TRACE_LEVEL_NONE is not set +# CONFIG_AVDT_TRACE_LEVEL_ERROR is not set +CONFIG_AVDT_TRACE_LEVEL_WARNING=y +# CONFIG_AVDT_TRACE_LEVEL_API is not set +# CONFIG_AVDT_TRACE_LEVEL_EVENT is not set +# CONFIG_AVDT_TRACE_LEVEL_DEBUG is not set +# CONFIG_AVDT_TRACE_LEVEL_VERBOSE is not set +CONFIG_AVDT_INITIAL_TRACE_LEVEL=2 +# CONFIG_AVCT_TRACE_LEVEL_NONE is not set +# CONFIG_AVCT_TRACE_LEVEL_ERROR is not set +CONFIG_AVCT_TRACE_LEVEL_WARNING=y +# CONFIG_AVCT_TRACE_LEVEL_API is not set +# CONFIG_AVCT_TRACE_LEVEL_EVENT is not set +# CONFIG_AVCT_TRACE_LEVEL_DEBUG is not set +# CONFIG_AVCT_TRACE_LEVEL_VERBOSE is not set +CONFIG_AVCT_INITIAL_TRACE_LEVEL=2 +# CONFIG_AVRC_TRACE_LEVEL_NONE is not set +# CONFIG_AVRC_TRACE_LEVEL_ERROR is not set +CONFIG_AVRC_TRACE_LEVEL_WARNING=y +# CONFIG_AVRC_TRACE_LEVEL_API is not set +# CONFIG_AVRC_TRACE_LEVEL_EVENT is not set +# CONFIG_AVRC_TRACE_LEVEL_DEBUG is not set +# CONFIG_AVRC_TRACE_LEVEL_VERBOSE is not set +CONFIG_AVRC_INITIAL_TRACE_LEVEL=2 +# CONFIG_MCA_TRACE_LEVEL_NONE is not set +# CONFIG_MCA_TRACE_LEVEL_ERROR is not set +CONFIG_MCA_TRACE_LEVEL_WARNING=y +# CONFIG_MCA_TRACE_LEVEL_API is not set +# CONFIG_MCA_TRACE_LEVEL_EVENT is not set +# CONFIG_MCA_TRACE_LEVEL_DEBUG is not set +# CONFIG_MCA_TRACE_LEVEL_VERBOSE is not set +CONFIG_MCA_INITIAL_TRACE_LEVEL=2 +# CONFIG_HID_TRACE_LEVEL_NONE is not set +# CONFIG_HID_TRACE_LEVEL_ERROR is not set +CONFIG_HID_TRACE_LEVEL_WARNING=y +# CONFIG_HID_TRACE_LEVEL_API is not set +# CONFIG_HID_TRACE_LEVEL_EVENT is not set +# CONFIG_HID_TRACE_LEVEL_DEBUG is not set +# CONFIG_HID_TRACE_LEVEL_VERBOSE is not set +CONFIG_HID_INITIAL_TRACE_LEVEL=2 +# CONFIG_APPL_TRACE_LEVEL_NONE is not set +# CONFIG_APPL_TRACE_LEVEL_ERROR is not set +CONFIG_APPL_TRACE_LEVEL_WARNING=y +# CONFIG_APPL_TRACE_LEVEL_API is not set +# CONFIG_APPL_TRACE_LEVEL_EVENT is not set +# CONFIG_APPL_TRACE_LEVEL_DEBUG is not set +# CONFIG_APPL_TRACE_LEVEL_VERBOSE is not set +CONFIG_APPL_INITIAL_TRACE_LEVEL=2 +# CONFIG_GATT_TRACE_LEVEL_NONE is not set +# CONFIG_GATT_TRACE_LEVEL_ERROR is not set +CONFIG_GATT_TRACE_LEVEL_WARNING=y +# CONFIG_GATT_TRACE_LEVEL_API is not set +# CONFIG_GATT_TRACE_LEVEL_EVENT is not set +# CONFIG_GATT_TRACE_LEVEL_DEBUG is not set +# CONFIG_GATT_TRACE_LEVEL_VERBOSE is not set +CONFIG_GATT_INITIAL_TRACE_LEVEL=2 +# CONFIG_SMP_TRACE_LEVEL_NONE is not set +# CONFIG_SMP_TRACE_LEVEL_ERROR is not set +CONFIG_SMP_TRACE_LEVEL_WARNING=y +# CONFIG_SMP_TRACE_LEVEL_API is not set +# CONFIG_SMP_TRACE_LEVEL_EVENT is not set +# CONFIG_SMP_TRACE_LEVEL_DEBUG is not set +# CONFIG_SMP_TRACE_LEVEL_VERBOSE is not set +CONFIG_SMP_INITIAL_TRACE_LEVEL=2 +# CONFIG_BTIF_TRACE_LEVEL_NONE is not set +# CONFIG_BTIF_TRACE_LEVEL_ERROR is not set +CONFIG_BTIF_TRACE_LEVEL_WARNING=y +# CONFIG_BTIF_TRACE_LEVEL_API is not set +# CONFIG_BTIF_TRACE_LEVEL_EVENT is not set +# CONFIG_BTIF_TRACE_LEVEL_DEBUG is not set +# CONFIG_BTIF_TRACE_LEVEL_VERBOSE is not set +CONFIG_BTIF_INITIAL_TRACE_LEVEL=2 +# CONFIG_BTC_TRACE_LEVEL_NONE is not set +# CONFIG_BTC_TRACE_LEVEL_ERROR is not set +CONFIG_BTC_TRACE_LEVEL_WARNING=y +# CONFIG_BTC_TRACE_LEVEL_API is not set +# CONFIG_BTC_TRACE_LEVEL_EVENT is not set +# CONFIG_BTC_TRACE_LEVEL_DEBUG is not set +# CONFIG_BTC_TRACE_LEVEL_VERBOSE is not set +CONFIG_BTC_INITIAL_TRACE_LEVEL=2 +# CONFIG_OSI_TRACE_LEVEL_NONE is not set +# CONFIG_OSI_TRACE_LEVEL_ERROR is not set +CONFIG_OSI_TRACE_LEVEL_WARNING=y +# CONFIG_OSI_TRACE_LEVEL_API is not set +# CONFIG_OSI_TRACE_LEVEL_EVENT is not set +# CONFIG_OSI_TRACE_LEVEL_DEBUG is not set +# CONFIG_OSI_TRACE_LEVEL_VERBOSE is not set +CONFIG_OSI_INITIAL_TRACE_LEVEL=2 +# CONFIG_BLUFI_TRACE_LEVEL_NONE is not set +# CONFIG_BLUFI_TRACE_LEVEL_ERROR is not set +CONFIG_BLUFI_TRACE_LEVEL_WARNING=y +# CONFIG_BLUFI_TRACE_LEVEL_API is not set +# CONFIG_BLUFI_TRACE_LEVEL_EVENT is not set +# CONFIG_BLUFI_TRACE_LEVEL_DEBUG is not set +# CONFIG_BLUFI_TRACE_LEVEL_VERBOSE is not set +CONFIG_BLUFI_INITIAL_TRACE_LEVEL=2 +# CONFIG_BLE_HOST_QUEUE_CONGESTION_CHECK is not set +CONFIG_SMP_ENABLE=y +# CONFIG_BLE_ACTIVE_SCAN_REPORT_ADV_SCAN_RSP_INDIVIDUALLY is not set +CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT=30 CONFIG_ADC2_DISABLE_DAC=y # CONFIG_SPIRAM_SUPPORT is not set CONFIG_TRACEMEM_RESERVE_DRAM=0x0 @@ -1431,7 +1907,6 @@ CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y # CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_OSC is not set # CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256 is not set # CONFIG_DISABLE_BASIC_ROM_CONSOLE is not set -# CONFIG_NO_BLOBS is not set # CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set # CONFIG_EVENT_LOOP_PROFILING is not set CONFIG_POST_EVENTS_FROM_ISR=y @@ -1474,6 +1949,7 @@ CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1=y # CONFIG_ESP32_DEBUG_STUBS_ENABLE is not set CONFIG_TIMER_TASK_STACK_SIZE=3584 +CONFIG_SW_COEXIST_ENABLE=y # CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set # CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y diff --git a/sdkconfig.old b/sdkconfig.old index 5a1e309..549de33 100644 --- a/sdkconfig.old +++ b/sdkconfig.old @@ -245,9 +245,280 @@ CONFIG_APPTRACE_LOCK_ENABLE=y # # Bluetooth # -# CONFIG_BT_ENABLED is not set +CONFIG_BT_ENABLED=y + +# +# Bluetooth controller +# +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +# CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set +# CONFIG_BTDM_CTRL_MODE_BTDM is not set +CONFIG_BTDM_CTRL_BLE_MAX_CONN=3 +CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0 +CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0 +CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0 +CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=3 +CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=0 +CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0 +CONFIG_BTDM_CTRL_PINNED_TO_CORE_0=y +# CONFIG_BTDM_CTRL_PINNED_TO_CORE_1 is not set +CONFIG_BTDM_CTRL_PINNED_TO_CORE=0 +CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y +# CONFIG_BTDM_CTRL_HCI_MODE_UART_H4 is not set + +# +# MODEM SLEEP Options +# +CONFIG_BTDM_CTRL_MODEM_SLEEP=y +CONFIG_BTDM_CTRL_MODEM_SLEEP_MODE_ORIG=y +# CONFIG_BTDM_CTRL_MODEM_SLEEP_MODE_EVED is not set +CONFIG_BTDM_CTRL_LPCLK_SEL_MAIN_XTAL=y +# end of MODEM SLEEP Options + +CONFIG_BTDM_BLE_DEFAULT_SCA_250PPM=y +CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1 +CONFIG_BTDM_BLE_SCAN_DUPL=y +CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE=y +# CONFIG_BTDM_SCAN_DUPL_TYPE_DATA is not set +# CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE is not set +CONFIG_BTDM_SCAN_DUPL_TYPE=0 +CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=100 +CONFIG_BTDM_SCAN_DUPL_CACHE_REFRESH_PERIOD=0 +# CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN is not set +CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED=y +CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y +CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100 +CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20 +CONFIG_BTDM_RESERVE_DRAM=0xdb5c +CONFIG_BTDM_CTRL_HLI=y +# end of Bluetooth controller + +CONFIG_BT_BLUEDROID_ENABLED=y +# CONFIG_BT_NIMBLE_ENABLED is not set +# CONFIG_BT_CONTROLLER_ONLY is not set + +# +# Bluedroid Options +# +CONFIG_BT_BTC_TASK_STACK_SIZE=3072 +CONFIG_BT_BLUEDROID_PINNED_TO_CORE_0=y +# CONFIG_BT_BLUEDROID_PINNED_TO_CORE_1 is not set +CONFIG_BT_BLUEDROID_PINNED_TO_CORE=0 +CONFIG_BT_BTU_TASK_STACK_SIZE=4352 +# CONFIG_BT_BLUEDROID_MEM_DEBUG is not set +# CONFIG_BT_CLASSIC_ENABLED is not set +CONFIG_BT_BLE_ENABLED=y +CONFIG_BT_GATTS_ENABLE=y +# CONFIG_BT_GATTS_PPCP_CHAR_GAP is not set +# CONFIG_BT_BLE_BLUFI_ENABLE is not set +CONFIG_BT_GATT_MAX_SR_PROFILES=8 +CONFIG_BT_GATT_MAX_SR_ATTRIBUTES=100 +# CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL is not set +CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_AUTO=y +CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MODE=0 +# CONFIG_BT_GATTS_ROBUST_CACHING_ENABLED is not set +# CONFIG_BT_GATTS_DEVICE_NAME_WRITABLE is not set +# CONFIG_BT_GATTS_APPEARANCE_WRITABLE is not set +CONFIG_BT_GATTC_ENABLE=y +CONFIG_BT_GATTC_MAX_CACHE_CHAR=40 +CONFIG_BT_GATTC_NOTIF_REG_MAX=5 +# CONFIG_BT_GATTC_CACHE_NVS_FLASH is not set +CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=3 +CONFIG_BT_BLE_SMP_ENABLE=y +# CONFIG_BT_SMP_SLAVE_CON_PARAMS_UPD_ENABLE is not set +# CONFIG_BT_STACK_NO_LOG is not set + +# +# BT DEBUG LOG LEVEL +# +# CONFIG_BT_LOG_HCI_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_HCI_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_HCI_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_HCI_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_HCI_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_HCI_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_HCI_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_HCI_TRACE_LEVEL=6 +# CONFIG_BT_LOG_BTM_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_BTM_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_BTM_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_BTM_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_BTM_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_BTM_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_BTM_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_BTM_TRACE_LEVEL=6 +# CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_L2CAP_TRACE_LEVEL=6 +# CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL=6 +# CONFIG_BT_LOG_SDP_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_SDP_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_SDP_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_SDP_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_SDP_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_SDP_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_SDP_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_SDP_TRACE_LEVEL=6 +# CONFIG_BT_LOG_GAP_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_GAP_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_GAP_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_GAP_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_GAP_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_GAP_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_GAP_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_GAP_TRACE_LEVEL=6 +# CONFIG_BT_LOG_BNEP_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_BNEP_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_BNEP_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_BNEP_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_BNEP_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_BNEP_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_BNEP_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_BNEP_TRACE_LEVEL=6 +# CONFIG_BT_LOG_PAN_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_PAN_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_PAN_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_PAN_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_PAN_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_PAN_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_PAN_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_PAN_TRACE_LEVEL=6 +# CONFIG_BT_LOG_A2D_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_A2D_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_A2D_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_A2D_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_A2D_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_A2D_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_A2D_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_A2D_TRACE_LEVEL=6 +# CONFIG_BT_LOG_AVDT_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_AVDT_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_AVDT_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_AVDT_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_AVDT_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_AVDT_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_AVDT_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_AVDT_TRACE_LEVEL=6 +# CONFIG_BT_LOG_AVCT_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_AVCT_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_AVCT_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_AVCT_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_AVCT_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_AVCT_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_AVCT_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_AVCT_TRACE_LEVEL=6 +# CONFIG_BT_LOG_AVRC_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_AVRC_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_AVRC_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_AVRC_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_AVRC_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_AVRC_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_AVRC_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_AVRC_TRACE_LEVEL=6 +# CONFIG_BT_LOG_MCA_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_MCA_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_MCA_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_MCA_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_MCA_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_MCA_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_MCA_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_MCA_TRACE_LEVEL=6 +# CONFIG_BT_LOG_HID_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_HID_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_HID_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_HID_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_HID_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_HID_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_HID_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_HID_TRACE_LEVEL=6 +# CONFIG_BT_LOG_APPL_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_APPL_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_APPL_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_APPL_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_APPL_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_APPL_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_APPL_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_APPL_TRACE_LEVEL=6 +# CONFIG_BT_LOG_GATT_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_GATT_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_GATT_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_GATT_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_GATT_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_GATT_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_GATT_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_GATT_TRACE_LEVEL=6 +# CONFIG_BT_LOG_SMP_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_SMP_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_SMP_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_SMP_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_SMP_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_SMP_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_SMP_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_SMP_TRACE_LEVEL=6 +# CONFIG_BT_LOG_BTIF_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_BTIF_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_BTIF_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_BTIF_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_BTIF_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_BTIF_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_BTIF_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_BTIF_TRACE_LEVEL=6 +# CONFIG_BT_LOG_BTC_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_BTC_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_BTC_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_BTC_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_BTC_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_BTC_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_BTC_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_BTC_TRACE_LEVEL=6 +# CONFIG_BT_LOG_OSI_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_OSI_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_OSI_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_OSI_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_OSI_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_OSI_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_OSI_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_OSI_TRACE_LEVEL=6 +# CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_NONE is not set +# CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_ERROR is not set +# CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_WARNING is not set +# CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_API is not set +# CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_EVENT is not set +# CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_DEBUG is not set +CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_VERBOSE=y +CONFIG_BT_LOG_BLUFI_TRACE_LEVEL=6 +# end of BT DEBUG LOG LEVEL + +CONFIG_BT_ACL_CONNECTIONS=4 +CONFIG_BT_MULTI_CONNECTION_ENBALE=y +# CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST is not set +# CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY is not set +# CONFIG_BT_BLE_HOST_QUEUE_CONG_CHECK is not set +CONFIG_BT_SMP_ENABLE=y +CONFIG_BT_SMP_MAX_BONDS=15 +# CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set +CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30 +CONFIG_BT_MAX_DEVICE_NAME_LEN=32 +# CONFIG_BT_BLE_RPA_SUPPORTED is not set +CONFIG_BT_BLE_RPA_TIMEOUT=900 +# CONFIG_BT_BLE_HIGH_DUTY_ADV_INTERVAL is not set +# end of Bluedroid Options # end of Bluetooth +# CONFIG_BLE_MESH is not set + # # CoAP Configuration # @@ -340,7 +611,7 @@ CONFIG_ESP_TLS_USING_MBEDTLS=y # CONFIG_ESP_TLS_SERVER is not set # CONFIG_ESP_TLS_PSK_VERIFICATION is not set CONFIG_ESP_TLS_INSECURE=y -CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY=y +# CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY is not set # end of ESP-TLS # @@ -394,7 +665,6 @@ CONFIG_ESP32_XTAL_FREQ_40=y # CONFIG_ESP32_XTAL_FREQ_AUTO is not set CONFIG_ESP32_XTAL_FREQ=40 # CONFIG_ESP32_DISABLE_BASIC_ROM_CONSOLE is not set -# CONFIG_ESP32_NO_BLOBS is not set # CONFIG_ESP32_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set # CONFIG_ESP32_COMPATIBLE_PRE_V3_1_BOOTLOADERS is not set # CONFIG_ESP32_USE_FIXED_STATIC_RAM_SIZE is not set @@ -615,7 +885,6 @@ CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=y # CONFIG_ESP_PANIC_HANDLER_IRAM is not set # CONFIG_ESP_DEBUG_STUBS_ENABLE is not set CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5=y -# CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_4 is not set # end of ESP System Settings # @@ -635,6 +904,7 @@ CONFIG_ESP_TIMER_IMPL_TG0_LAC=y # Wi-Fi # CONFIG_ESP32_WIFI_ENABLED=y +CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32 # CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set @@ -1347,7 +1617,9 @@ CONFIG_WL_SECTOR_SIZE=4096 # CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30 +# CONFIG_WIFI_PROV_BLE_BONDING is not set # CONFIG_WIFI_PROV_BLE_FORCE_ENCRYPTION is not set +# CONFIG_WIFI_PROV_KEEP_BLE_ON_AFTER_PROV is not set # end of Wi-Fi Provisioning Manager # diff --git a/wellhub.code-workspace b/wellhub.code-workspace new file mode 100644 index 0000000..3552197 --- /dev/null +++ b/wellhub.code-workspace @@ -0,0 +1,80 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": { + "files.associations": { + "array": "cpp", + "atomic": "cpp", + "strstream": "cpp", + "*.tcc": "cpp", + "bitset": "cpp", + "cctype": "cpp", + "chrono": "cpp", + "clocale": "cpp", + "cmath": "cpp", + "codecvt": "cpp", + "condition_variable": "cpp", + "csignal": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstdint": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "deque": "cpp", + "list": "cpp", + "unordered_map": "cpp", + "unordered_set": "cpp", + "vector": "cpp", + "exception": "cpp", + "algorithm": "cpp", + "functional": "cpp", + "iterator": "cpp", + "map": "cpp", + "memory": "cpp", + "memory_resource": "cpp", + "numeric": "cpp", + "optional": "cpp", + "random": "cpp", + "ratio": "cpp", + "regex": "cpp", + "set": "cpp", + "string": "cpp", + "string_view": "cpp", + "system_error": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "utility": "cpp", + "fstream": "cpp", + "future": "cpp", + "initializer_list": "cpp", + "iomanip": "cpp", + "iosfwd": "cpp", + "iostream": "cpp", + "istream": "cpp", + "limits": "cpp", + "mutex": "cpp", + "new": "cpp", + "ostream": "cpp", + "sstream": "cpp", + "stdexcept": "cpp", + "streambuf": "cpp", + "thread": "cpp", + "cinttypes": "cpp", + "typeinfo": "cpp", + "bit": "cpp", + "compare": "cpp", + "concepts": "cpp", + "netfwd": "cpp", + "numbers": "cpp", + "semaphore": "cpp", + "stop_token": "cpp" + } + } +} \ No newline at end of file