From c85e84e9a1f9101d78b1019ca8bcd6dad5eacf1d Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Fri, 23 Dec 2022 00:02:52 +0100 Subject: [PATCH 1/4] Updated submodules --- components/arduino-esp32 | 2 +- components/espasyncota | 2 +- components/espwifistack | 2 +- configs/sdkconfig_comred_new | 94 +++++++++++++++++++++++------------- dependencies.lock | 2 +- esp-idf | 2 +- main/espnowfunctions.cpp | 2 +- main/utils.cpp | 6 ++- 8 files changed, 70 insertions(+), 42 deletions(-) diff --git a/components/arduino-esp32 b/components/arduino-esp32 index 1acd16f..745ccde 160000 --- a/components/arduino-esp32 +++ b/components/arduino-esp32 @@ -1 +1 @@ -Subproject commit 1acd16f991f4e7ced82ee794a1a31899daf99c0b +Subproject commit 745ccdeae8742957fb3adf05c00f0815d100db01 diff --git a/components/espasyncota b/components/espasyncota index ac54031..88048e8 160000 --- a/components/espasyncota +++ b/components/espasyncota @@ -1 +1 @@ -Subproject commit ac540310a4838f6f6e1ba15832635941a3b3f856 +Subproject commit 88048e86e3a5119fa2647d7ea81f8b69c122b795 diff --git a/components/espwifistack b/components/espwifistack index 980a4ac..a102f12 160000 --- a/components/espwifistack +++ b/components/espwifistack @@ -1 +1 @@ -Subproject commit 980a4acd11c2cafeb4f037fb41ae5501008452a3 +Subproject commit a102f12acd63014135d435700d2c91e312f18338 diff --git a/configs/sdkconfig_comred_new b/configs/sdkconfig_comred_new index c8eb7d1..ed10c76 100644 --- a/configs/sdkconfig_comred_new +++ b/configs/sdkconfig_comred_new @@ -5,7 +5,7 @@ CONFIG_SOC_BROWNOUT_RESET_SUPPORTED="Not determined" CONFIG_SOC_TWAI_BRP_DIV_SUPPORTED="Not determined" CONFIG_SOC_DPORT_WORKAROUND="Not determined" -CONFIG_SOC_CAPS_ECO_VER_MAX=3 +CONFIG_SOC_CAPS_ECO_VER_MAX=301 CONFIG_SOC_ADC_SUPPORTED=y CONFIG_SOC_DAC_SUPPORTED=y CONFIG_SOC_MCPWM_SUPPORTED=y @@ -53,7 +53,6 @@ CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_HIGH=2 CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=20 CONFIG_SOC_ADC_RTC_MIN_BITWIDTH=9 CONFIG_SOC_ADC_RTC_MAX_BITWIDTH=12 -CONFIG_SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256=y CONFIG_SOC_SHARED_IDCACHE_SUPPORTED=y CONFIG_SOC_MMU_LINEAR_ADDRESS_REGION_NUM=5 CONFIG_SOC_CPU_CORES_NUM=2 @@ -62,27 +61,26 @@ CONFIG_SOC_CPU_HAS_FPU=y CONFIG_SOC_CPU_BREAKPOINTS_NUM=2 CONFIG_SOC_CPU_WATCHPOINTS_NUM=2 CONFIG_SOC_CPU_WATCHPOINT_SIZE=64 -CONFIG_SOC_DAC_PERIPH_NUM=2 +CONFIG_SOC_DAC_CHAN_NUM=2 CONFIG_SOC_DAC_RESOLUTION=8 +CONFIG_SOC_DAC_DMA_16BIT_ALIGN=y CONFIG_SOC_GPIO_PORT=1 CONFIG_SOC_GPIO_PIN_COUNT=40 CONFIG_SOC_GPIO_VALID_GPIO_MASK=0xFFFFFFFFFF +CONFIG_SOC_GPIO_VALID_DIGITAL_IO_PAD_MASK=0xEF0FEA CONFIG_SOC_GPIO_SUPPORT_SLP_SWITCH=y CONFIG_SOC_I2C_NUM=2 CONFIG_SOC_I2C_FIFO_LEN=32 CONFIG_SOC_I2C_SUPPORT_SLAVE=y CONFIG_SOC_I2C_SUPPORT_APB=y -CONFIG_SOC_CLK_APLL_SUPPORTED=y -CONFIG_SOC_APLL_MULTIPLIER_OUT_MIN_HZ=350000000 -CONFIG_SOC_APLL_MULTIPLIER_OUT_MAX_HZ=500000000 -CONFIG_SOC_APLL_MIN_HZ=5303031 -CONFIG_SOC_APLL_MAX_HZ=125000000 CONFIG_SOC_I2S_NUM=2 CONFIG_SOC_I2S_HW_VERSION_1=y CONFIG_SOC_I2S_SUPPORTS_APLL=y CONFIG_SOC_I2S_SUPPORTS_PDM=y CONFIG_SOC_I2S_SUPPORTS_PDM_TX=y +CONFIG_SOC_I2S_PDM_MAX_TX_LINES=1 CONFIG_SOC_I2S_SUPPORTS_PDM_RX=y +CONFIG_SOC_I2S_PDM_MAX_RX_LINES=1 CONFIG_SOC_I2S_SUPPORTS_ADC_DAC=y CONFIG_SOC_I2S_SUPPORTS_ADC=y CONFIG_SOC_I2S_SUPPORTS_DAC=y @@ -97,7 +95,8 @@ CONFIG_SOC_LEDC_SUPPORT_APB_CLOCK=y CONFIG_SOC_LEDC_SUPPORT_REF_TICK=y CONFIG_SOC_LEDC_SUPPORT_HS_MODE=y CONFIG_SOC_LEDC_CHANNEL_NUM=8 -CONFIG_SOC_LEDC_TIMER_BIT_WIDE_NUM=20 +CONFIG_SOC_LEDC_TIMER_BIT_WIDTH=20 +CONFIG_SOC_LEDC_GAMMA_FADE_RANGE_MAX=1 CONFIG_SOC_MCPWM_GROUPS=2 CONFIG_SOC_MCPWM_TIMERS_PER_GROUP=3 CONFIG_SOC_MCPWM_OPERATORS_PER_GROUP=3 @@ -108,6 +107,7 @@ CONFIG_SOC_MCPWM_GPIO_FAULTS_PER_GROUP=3 CONFIG_SOC_MCPWM_CAPTURE_TIMERS_PER_GROUP=y CONFIG_SOC_MCPWM_CAPTURE_CHANNELS_PER_TIMER=3 CONFIG_SOC_MCPWM_GPIO_SYNCHROS_PER_GROUP=3 +CONFIG_SOC_MCPWM_CLK_SUPPORT_PLL160M=y CONFIG_SOC_MPU_MIN_REGION_SIZE=0x20000000 CONFIG_SOC_MPU_REGIONS_MAX_NUM=8 CONFIG_SOC_PCNT_GROUPS=1 @@ -147,7 +147,9 @@ CONFIG_SOC_TIMER_GROUP_SUPPORT_APB=y CONFIG_SOC_TOUCH_VERSION_1=y CONFIG_SOC_TOUCH_SENSOR_NUM=10 CONFIG_SOC_TOUCH_PAD_MEASURE_WAIT_MAX=0xFF +CONFIG_SOC_TWAI_CONTROLLER_NUM=1 CONFIG_SOC_TWAI_BRP_MIN=2 +CONFIG_SOC_TWAI_CLK_SUPPORT_APB=y CONFIG_SOC_TWAI_SUPPORT_MULTI_ADDRESS_LAYOUT=y CONFIG_SOC_UART_NUM=3 CONFIG_SOC_UART_SUPPORT_APB_CLK=y @@ -174,6 +176,14 @@ CONFIG_SOC_PM_SUPPORT_TOUCH_SENSOR_WAKEUP=y CONFIG_SOC_PM_SUPPORT_RTC_PERIPH_PD=y CONFIG_SOC_PM_SUPPORT_RTC_FAST_MEM_PD=y CONFIG_SOC_PM_SUPPORT_RTC_SLOW_MEM_PD=y +CONFIG_SOC_CLK_APLL_SUPPORTED=y +CONFIG_SOC_APLL_MULTIPLIER_OUT_MIN_HZ=350000000 +CONFIG_SOC_APLL_MULTIPLIER_OUT_MAX_HZ=500000000 +CONFIG_SOC_APLL_MIN_HZ=5303031 +CONFIG_SOC_APLL_MAX_HZ=125000000 +CONFIG_SOC_CLK_RC_FAST_D256_SUPPORTED=y +CONFIG_SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256=y +CONFIG_SOC_CLK_RC_FAST_SUPPORT_CALIBRATION=y CONFIG_SOC_SDMMC_USE_IOMUX=y CONFIG_SOC_SDMMC_NUM_SLOTS=2 CONFIG_SOC_WIFI_WAPI_SUPPORT=y @@ -256,8 +266,8 @@ CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16 CONFIG_ESP_ROM_HAS_CRC_LE=y CONFIG_ESP_ROM_HAS_CRC_BE=y +CONFIG_ESP_ROM_HAS_MZ_CRC32=y CONFIG_ESP_ROM_HAS_JPEG_DECODE=y -CONFIG_ESP_ROM_SUPPORT_MULTIPLE_UART=y CONFIG_ESP_ROM_NEEDS_SWSETUP_WORKAROUND=y # @@ -520,6 +530,7 @@ CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY=y CONFIG_BT_NIMBLE_MAX_PERIODIC_SYNCS=0 # CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EN is not set CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_DIS=y +# CONFIG_BT_NIMBLE_52_FEATURE_SUPPORT is not set CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EFF=0 CONFIG_BT_NIMBLE_WHITELIST_SIZE=12 # CONFIG_BT_NIMBLE_TEST_THROUGHPUT_TEST is not set @@ -678,6 +689,16 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_I2S_SUPPRESS_DEPRECATE_WARN is not set # CONFIG_I2S_ENABLE_DEBUG_LOG is not set # end of I2S Configuration + +# +# DAC Configuration +# +# CONFIG_DAC_CTRL_FUNC_IN_IRAM is not set +# CONFIG_DAC_ISR_IRAM_SAFE is not set +# CONFIG_DAC_SUPPRESS_DEPRECATE_WARN is not set +# CONFIG_DAC_ENABLE_DEBUG_LOG is not set +CONFIG_DAC_DMA_AUTO_16BIT_ALIGN=y +# end of DAC Configuration # end of Driver Configurations # @@ -783,6 +804,26 @@ CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP=y # Hardware Settings # +# +# Chip revision +# +CONFIG_ESP32_REV_MIN_0=y +# CONFIG_ESP32_REV_MIN_1 is not set +# CONFIG_ESP32_REV_MIN_1_1 is not set +# CONFIG_ESP32_REV_MIN_2 is not set +# CONFIG_ESP32_REV_MIN_3 is not set +# CONFIG_ESP32_REV_MIN_3_1 is not set +CONFIG_ESP32_REV_MIN=0 +CONFIG_ESP32_REV_MIN_FULL=0 +CONFIG_ESP_REV_MIN_FULL=0 + +# +# Maximum Supported ESP32 Revision (Rev v3.99) +# +CONFIG_ESP32_REV_MAX_FULL=399 +CONFIG_ESP_REV_MAX_FULL=399 +# end of Chip revision + # # MAC Config # @@ -790,6 +831,7 @@ CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_STA=y CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y CONFIG_ESP_MAC_ADDR_UNIVERSE_BT=y CONFIG_ESP_MAC_ADDR_UNIVERSE_ETH=y +CONFIG_ESP_MAC_UNIVERSAL_MAC_ADDRESSES_FOUR=y # CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_TWO is not set CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4 @@ -829,12 +871,6 @@ CONFIG_MMU_PAGE_MODE="64KB" CONFIG_MMU_PAGE_SIZE=0x10000 # end of MMU Config -CONFIG_ESP32_REV_MIN_0=y -# CONFIG_ESP32_REV_MIN_1 is not set -# CONFIG_ESP32_REV_MIN_2 is not set -# CONFIG_ESP32_REV_MIN_3 is not set -CONFIG_ESP32_REV_MIN=0 - # # Main XTAL Config # @@ -1028,10 +1064,11 @@ CONFIG_ESP32_WIFI_RX_IRAM_OPT=y CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y CONFIG_ESP32_WIFI_ENABLE_WPA3_OWE_STA=y # CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set -# CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set +CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE=y # CONFIG_ESP_WIFI_GMAC_SUPPORT is not set CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y # CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT is not set +CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=6 # end of Wi-Fi # @@ -1046,18 +1083,11 @@ CONFIG_ESP_COREDUMP_ENABLE_TO_NONE=y # FAT Filesystem support # CONFIG_FATFS_VOLUME_COUNT=2 +CONFIG_FATFS_LFN_NONE=y +# CONFIG_FATFS_LFN_HEAP is not set +# CONFIG_FATFS_LFN_STACK is not set # CONFIG_FATFS_SECTOR_512 is not set -# CONFIG_FATFS_SECTOR_1024 is not set -# CONFIG_FATFS_SECTOR_2048 is not set CONFIG_FATFS_SECTOR_4096=y -CONFIG_FATFS_SECTORS_PER_CLUSTER_1=y -# CONFIG_FATFS_SECTORS_PER_CLUSTER_2 is not set -# CONFIG_FATFS_SECTORS_PER_CLUSTER_4 is not set -# CONFIG_FATFS_SECTORS_PER_CLUSTER_8 is not set -# CONFIG_FATFS_SECTORS_PER_CLUSTER_16 is not set -# CONFIG_FATFS_SECTORS_PER_CLUSTER_32 is not set -# CONFIG_FATFS_SECTORS_PER_CLUSTER_64 is not set -# CONFIG_FATFS_SECTORS_PER_CLUSTER_128 is not set # CONFIG_FATFS_CODEPAGE_DYNAMIC is not set CONFIG_FATFS_CODEPAGE_437=y # CONFIG_FATFS_CODEPAGE_720 is not set @@ -1080,13 +1110,7 @@ CONFIG_FATFS_CODEPAGE_437=y # CONFIG_FATFS_CODEPAGE_936 is not set # CONFIG_FATFS_CODEPAGE_949 is not set # CONFIG_FATFS_CODEPAGE_950 is not set -CONFIG_FATFS_AUTO_TYPE=y -# CONFIG_FATFS_FAT12 is not set -# CONFIG_FATFS_FAT16 is not set CONFIG_FATFS_CODEPAGE=437 -CONFIG_FATFS_LFN_NONE=y -# CONFIG_FATFS_LFN_HEAP is not set -# CONFIG_FATFS_LFN_STACK is not set CONFIG_FATFS_FS_LOCK=0 CONFIG_FATFS_TIMEOUT_MS=10000 CONFIG_FATFS_PER_FILE_CACHE=y @@ -1116,6 +1140,7 @@ CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0 +CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=1 # CONFIG_FREERTOS_USE_TRACE_FACILITY is not set # CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS is not set # end of Kernel @@ -1124,6 +1149,7 @@ CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0 # Port # # CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set +CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS=y # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y CONFIG_FREERTOS_ISR_STACKSIZE=2048 @@ -1136,7 +1162,6 @@ CONFIG_FREERTOS_SYSTICK_USES_CCOUNT=y # CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH is not set # CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH is not set # CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set -CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y # end of Port @@ -1249,6 +1274,7 @@ CONFIG_LWIP_TCP_SYNMAXRTX=12 CONFIG_LWIP_TCP_MSS=1440 CONFIG_LWIP_TCP_TMR_INTERVAL=250 CONFIG_LWIP_TCP_MSL=60000 +CONFIG_LWIP_TCP_FIN_WAIT_TIMEOUT=20000 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744 CONFIG_LWIP_TCP_WND_DEFAULT=5744 CONFIG_LWIP_TCP_RECVMBOX_SIZE=6 diff --git a/dependencies.lock b/dependencies.lock index 4fe39c7..402a16c 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -4,6 +4,6 @@ dependencies: source: type: idf version: 5.1.0 -manifest_hash: 9a4f2dfb2ab76ca07dad44e92970eea272a02162afa87b1dc511d285966e0252 +manifest_hash: 45094f33b6a257bfcaa02efb329b001e383adbe7dc60bd5066b99a5e9f5ebc91 target: esp32 version: 1.0.0 diff --git a/esp-idf b/esp-idf index 036e4cc..7634cbd 160000 --- a/esp-idf +++ b/esp-idf @@ -1 +1 @@ -Subproject commit 036e4cc64b442660c916542c5ee78971ba27c2e0 +Subproject commit 7634cbdf3524eb98ea7ef90131f4a5f912a3ded7 diff --git a/main/espnowfunctions.cpp b/main/espnowfunctions.cpp index 3e625d7..b9624f7 100644 --- a/main/espnowfunctions.cpp +++ b/main/espnowfunctions.cpp @@ -53,7 +53,7 @@ bool espnow_init_allowed() } namespace { -extern "C" void onReceive(const uint8_t *mac_addr, const uint8_t *data, int data_len) +extern "C" void onReceive(const esp_now_recv_info* info, const uint8_t *data, int data_len) { ESP_LOGD(TAG, "Received data"); const std::string_view data_str{(const char *)data, size_t(data_len)}; diff --git a/main/utils.cpp b/main/utils.cpp index b6e00fb..cd47e76 100644 --- a/main/utils.cpp +++ b/main/utils.cpp @@ -397,10 +397,12 @@ std::string toString(esp_chip_model_t esp_chip_model) return "ESP32S3"; case CHIP_ESP32C3: return "ESP32C3"; - case CHIP_ESP32H2: - return "ESP32H2"; + case CHIP_ESP32H4: + return "ESP32H4"; case CHIP_ESP32C2: return "ESP32C2"; + case CHIP_ESP32C6: + return "ESP32C6"; default: return "invalid"; } From 1b7a523acdd924a472e3eaf677f522e07f75e718 Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Sat, 24 Dec 2022 15:29:45 +0100 Subject: [PATCH 2/4] Made some modifications --- configs/sdkconfig_comred_new | 6 +++--- main/ble_bobby.cpp | 20 +++++++++++++++----- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/configs/sdkconfig_comred_new b/configs/sdkconfig_comred_new index ed10c76..a3bfb71 100644 --- a/configs/sdkconfig_comred_new +++ b/configs/sdkconfig_comred_new @@ -472,9 +472,9 @@ CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y # CONFIG_BT_NIMBLE_LOG_LEVEL_NONE is not set # CONFIG_BT_NIMBLE_LOG_LEVEL_ERROR is not set # CONFIG_BT_NIMBLE_LOG_LEVEL_WARNING is not set -CONFIG_BT_NIMBLE_LOG_LEVEL_INFO=y -# CONFIG_BT_NIMBLE_LOG_LEVEL_DEBUG is not set -CONFIG_BT_NIMBLE_LOG_LEVEL=1 +# CONFIG_BT_NIMBLE_LOG_LEVEL_INFO is not set +CONFIG_BT_NIMBLE_LOG_LEVEL_DEBUG=y +CONFIG_BT_NIMBLE_LOG_LEVEL=0 CONFIG_BT_NIMBLE_MAX_CONNECTIONS=3 CONFIG_BT_NIMBLE_MAX_BONDS=3 CONFIG_BT_NIMBLE_MAX_CCCDS=8 diff --git a/main/ble_bobby.cpp b/main/ble_bobby.cpp index 8c75cd8..75af429 100644 --- a/main/ble_bobby.cpp +++ b/main/ble_bobby.cpp @@ -55,14 +55,20 @@ void createBle() { ESP_LOGI("BOBBY", "called"); - BLEDevice::init(configs.bluetoothName.value()); + NimBLEDevice::init("foo");//configs.bluetoothName.value()); const auto serviceUuid{"0335e46c-f355-4ce6-8076-017de08cee98"}; - pServer = BLEDevice::createServer(); + ESP_LOGI(TAG, "Creating BLE server"); + + pServer = NimBLEDevice::createServer(); + + ESP_LOGI(TAG, "Creating BLE service"); pService = pServer->createService(serviceUuid); + ESP_LOGI(TAG, "Creating BLE characteristics"); + livestatsCharacteristic = pService->createCharacteristic("a48321ea-329f-4eab-a401-30e247211524", NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY); remotecontrolCharacteristic = pService->createCharacteristic("4201def0-a264-43e6-946b-6b2d9612dfed", NIMBLE_PROPERTY::WRITE); remotecontrolCharacteristic->setCallbacks(&bleRemoteCallbacks); @@ -72,19 +78,23 @@ void createBle() getwifilist = pService->createCharacteristic("4201def2-a264-43e6-946b-6b2d9612dfed", NIMBLE_PROPERTY::READ); getwifilist->setCallbacks(&bleWiFiListCallbacks); + ESP_LOGI(TAG, "Starting BLE service"); + pService->start(); - BLEAdvertising *pAdvertising = BLEDevice::getAdvertising(); + ESP_LOGI(TAG, "Starting BLE advertising"); + + NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising(); pAdvertising->addServiceUUID(serviceUuid); pAdvertising->setScanResponse(true); - BLEDevice::startAdvertising(); + NimBLEDevice::startAdvertising(); } void destroyBle() { ESP_LOGI("BOBBY", "called"); - BLEDevice::deinit(true); + NimBLEDevice::deinit(true); pServer = {}; pService = {}; From 46883263238b81675168ac7b2bdda8ca99558dad Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Sat, 24 Dec 2022 15:30:05 +0100 Subject: [PATCH 3/4] Revert init change --- main/ble_bobby.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/ble_bobby.cpp b/main/ble_bobby.cpp index 75af429..1dc7c44 100644 --- a/main/ble_bobby.cpp +++ b/main/ble_bobby.cpp @@ -55,7 +55,7 @@ void createBle() { ESP_LOGI("BOBBY", "called"); - NimBLEDevice::init("foo");//configs.bluetoothName.value()); + NimBLEDevice::init(configs.bluetoothName.value()); const auto serviceUuid{"0335e46c-f355-4ce6-8076-017de08cee98"}; From 6bc85875ee852656fa2f9c284d1c5cc5b83f5406 Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Sat, 24 Dec 2022 15:55:35 +0100 Subject: [PATCH 4/4] Fixed ble --- .gitmodules | 2 +- components/esp-nimble-cpp | 2 +- configs/sdkconfig_comred_new | 10 +++++++++- main/ble_bobby.cpp | 16 ++++++++-------- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.gitmodules b/.gitmodules index a9fff2f..6461064 100644 --- a/.gitmodules +++ b/.gitmodules @@ -36,7 +36,7 @@ url = ../../0xFEEDC0DE64/espwifistack.git [submodule "components/esp-nimble-cpp"] path = components/esp-nimble-cpp - url = ../../0xFEEDC0DE64/esp-nimble-cpp.git + url = ../../bobbycar-graz/esp-nimble-cpp.git [submodule "components/espasyncota"] path = components/espasyncota url = ../../0xFEEDC0DE64/espasyncota.git diff --git a/components/esp-nimble-cpp b/components/esp-nimble-cpp index c218a27..29f9273 160000 --- a/components/esp-nimble-cpp +++ b/components/esp-nimble-cpp @@ -1 +1 @@ -Subproject commit c218a27dd8b8089e78f9190fbb4b88dd361471bc +Subproject commit 29f9273c65a03b0f3b1e8465cb5dd94863f5a2db diff --git a/configs/sdkconfig_comred_new b/configs/sdkconfig_comred_new index a3bfb71..925bb8d 100644 --- a/configs/sdkconfig_comred_new +++ b/configs/sdkconfig_comred_new @@ -1813,9 +1813,17 @@ CONFIG_TFT_SMOOTH_FONT=y # # ESP-NimBLE-CPP configuration # +# CONFIG_NIMBLE_CPP_LOG_LEVEL_NONE is not set +# CONFIG_NIMBLE_CPP_LOG_LEVEL_ERROR is not set +# CONFIG_NIMBLE_CPP_LOG_LEVEL_WARNING is not set +CONFIG_NIMBLE_CPP_LOG_LEVEL_INFO=y +# CONFIG_NIMBLE_CPP_LOG_LEVEL_DEBUG is not set +CONFIG_NIMBLE_CPP_LOG_LEVEL=3 # CONFIG_NIMBLE_CPP_ENABLE_RETURN_CODE_TEXT is not set # CONFIG_NIMBLE_CPP_ENABLE_GAP_EVENT_CODE_TEXT is not set -# CONFIG_NIMBLE_CPP_ENABLE_ADVERTISMENT_TYPE_TEXT is not set +# CONFIG_NIMBLE_CPP_ENABLE_ADVERTISEMENT_TYPE_TEXT is not set +# CONFIG_NIMBLE_CPP_ATT_VALUE_TIMESTAMP_ENABLED is not set +CONFIG_NIMBLE_CPP_ATT_VALUE_INIT_LENGTH=20 # end of ESP-NimBLE-CPP configuration # end of Component config diff --git a/main/ble_bobby.cpp b/main/ble_bobby.cpp index 1dc7c44..74c7ef9 100644 --- a/main/ble_bobby.cpp +++ b/main/ble_bobby.cpp @@ -21,19 +21,19 @@ constexpr const char * const TAG = "BOBBYBLE"; class RemoteControlCallbacks : public NimBLECharacteristicCallbacks { public: - void onWrite(NimBLECharacteristic* pCharacteristic) override; + void onWrite(NimBLECharacteristic* pCharacteristic, NimBLEConnInfo& connInfo) override; }; class WirelessSettingsCallbacks : public NimBLECharacteristicCallbacks { public: - void onWrite(NimBLECharacteristic* pCharacteristic) override; + void onWrite(NimBLECharacteristic* pCharacteristic, NimBLEConnInfo& connInfo) override; }; class WiFiListCallbacks : public NimBLECharacteristicCallbacks { public: - void onRead(NimBLECharacteristic* pCharacteristic) override; + void onRead(NimBLECharacteristic* pCharacteristic, NimBLEConnInfo& connInfo) override; }; } // namespace @@ -236,9 +236,9 @@ void handleBle() namespace { -void RemoteControlCallbacks::onWrite(NimBLECharacteristic* pCharacteristic) +void RemoteControlCallbacks::onWrite(NimBLECharacteristic* pCharacteristic, NimBLEConnInfo& connInfo) { - const auto &val = pCharacteristic->getValue(); + const std::string& val = pCharacteristic->getValue(); StaticJsonDocument<256> doc; if (const auto error = deserializeJson(doc, val)) @@ -268,9 +268,9 @@ void RemoteControlCallbacks::onWrite(NimBLECharacteristic* pCharacteristic) } } -void WirelessSettingsCallbacks::onWrite(NimBLECharacteristic* pCharacteristic) +void WirelessSettingsCallbacks::onWrite(NimBLECharacteristic* pCharacteristic, NimBLEConnInfo& connInfo) { - const auto &val = pCharacteristic->getValue(); + const std::string& val = pCharacteristic->getValue(); StaticJsonDocument<256> doc; if (const auto error = deserializeJson(doc, val)) @@ -292,7 +292,7 @@ void WirelessSettingsCallbacks::onWrite(NimBLECharacteristic* pCharacteristic) } } -void WiFiListCallbacks::onRead(NimBLECharacteristic *pCharacteristic) +void WiFiListCallbacks::onRead(NimBLECharacteristic* pCharacteristic, NimBLEConnInfo& connInfo) { StaticJsonDocument<768> responseDoc; auto wifiArray = responseDoc.createNestedArray("wifis");