8000 Merge branch 'espressif:master' into master · cezer-io/cezerio-devkits-arduino@bd77726 · GitHub
[go: up one dir, main page]
Skip to content

Commit bd77726

Browse files
DogushCDogushC
authored
Merge branch 'espressif:master' into master
2 parents c40d8a0 + f122366 commit bd77726

File tree

6 files changed

+10
-17
lines changed

6 files changed

+10
-17
lines changed

‎cores/esp32/HWCDC.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,7 @@ void HWCDC::setDebugOutput(bool en) {
603603
} else {
604604
ets_install_putc2(NULL);
605605
}
606+
ets_install_putc1(NULL); // closes UART log output
606607
}
607608

608609
#if ARDUINO_USB_MODE && ARDUINO_USB_CDC_ON_BOOT // Hardware JTAG CDC selected

‎cores/esp32/USBCDC.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,7 @@ void USBCDC::setDebugOutput(bool en) {
455455
} else {
456456
ets_install_putc2(NULL);
457457
}
458+
ets_install_putc1(NULL); // closes UART log output
458459
}
459460

460461
USBCDC::operator bool() const {

‎cores/esp32/esp32-hal-misc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
#include "esp_ota_ops.h"
2626
#endif //CONFIG_APP_ROLLBACK_ENABLE
2727
#include "esp_private/startup_internal.h"
28-
#if defined(CONFIG_BT_ENABLED) && SOC_BT_SUPPORTED
28+
#if defined(CONFIG_BT_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
2929
#include "esp_bt.h"
30-
#endif //CONFIG_BT_ENABLED
30+
#endif //CONFIG_BT_BLUEDROID_ENABLED
3131
#include <sys/time.h>
3232
#include "soc/rtc.h"
3333
#if !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(CONFIG_IDF_TARGET_ESP32H2) && !defined(CONFIG_IDF_TARGET_ESP32P4)
@@ -243,7 +243,7 @@ bool verifyRollbackLater() {
243243
}
244244
#endif
245245

246-
#ifdef CONFIG_BT_ENABLED
246+
#ifdef CONFIG_BT_BLUEDROID_ENABLED
247247
#if CONFIG_IDF_TARGET_ESP32
248248
//overwritten in esp32-hal-bt.c
249249
bool btInUse() __attribute__((weak));
@@ -305,7 +305,7 @@ void initArduino() {
305305
if (err) {
306306
log_e("Failed to initialize NVS! Error: %u", err);
307307
}
308-
#if defined(CONFIG_BT_ENABLED) && SOC_BT_SUPPORTED
308+
#if defined(CONFIG_BT_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
309309
if (!btInUse()) {
310310
esp_bt_controller_mem_release(ESP_BT_MODE_BTDM);
311311
}

‎cores/esp32/esp32-hal-uart.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,24 +1186,16 @@ int log_printfv(const char *format, va_list arg) {
11861186
return 0;
11871187
}
11881188
}
1189-
/*
1189+
/*
11901190
// This causes dead locks with logging in specific cases and also with C++ constructors that may send logs
11911191
#if !CONFIG_DISABLE_HAL_LOCKS
11921192
if(s_uart_debug_nr != -1 && _uart_bus_array[s_uart_debug_nr].lock){
11931193
xSemaphoreTake(_uart_bus_array[s_uart_debug_nr].lock, portMAX_DELAY);
11941194
}
11951195
#endif
11961196
*/
1197-
#if (ARDUINO_USB_CDC_ON_BOOT == 1 && ARDUINO_USB_MODE == 0) || CONFIG_IDF_TARGET_ESP32C3 \
1198-
|| ((CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32P4) && ARDUINO_USB_CDC_ON_BOOT == 1)
11991197
vsnprintf(temp, len + 1, format, arg);
12001198
ets_printf("%s", temp);
1201-
#else
1202-
int wlen = vsnprintf(temp, len + 1, format, arg);
1203-
for (int i = 0; i < wlen; i++) {
1204-
ets_write_char_uart(temp[i]);
1205-
}
1206-
#endif
12071199
/*
12081200
// This causes dead locks with logging and also with constructors that may send logs
12091201
#if !CONFIG_DISABLE_HAL_LOCKS

‎libraries/USB/src/USBHIDConsumerControl.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#define CONSUMER_CONTROL_WIRELESS_RADIO_SLIDER_SWITCH 0x00C8
3838

3939
// Media Control
40-
#define CONSUMER_CONTROL_PLAY_PAUSE 0x00CD
4140
#define CONSUMER_CONTROL_RECORD 0x00B2
4241
#define CONSUMER_CONTROL_FAST_FORWARD 0x00B3
4342
#define CONSUMER_CONTROL_REWIND 0x00B4

‎libraries/WiFi/src/WiFiGeneric.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -602,9 +602,9 @@ bool WiFiGenericClass::mode(wifi_mode_t m) {
602602
#else
603603
#define WIFI_PROTOCOL_DEFAULT (WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N)
604604
#endif
605-
uint8_t current_protocol = 0;
605+
uint32_t current_protocol = 0;
606606
if (m & WIFI_MODE_STA) {
607-
err = esp_wifi_get_protocol(WIFI_IF_STA, &current_protocol);
607+
err = esp_wifi_get_protocol(WIFI_IF_STA, (uint8_t *)&current_protocol);
608608
if (err == ESP_OK && current_protocol == WIFI_PROTOCOL_LR) {
609609
log_v("Disabling long range on STA");
610610
err = esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_DEFAULT);
@@ -614,7 +614,7 @@ bool WiFiGenericClass::mode(wifi_mode_t m) {
614614
}
615615
}
616616
if (m & WIFI_MODE_AP) {
617-
err = esp_wifi_get_protocol(WIFI_IF_AP, &current_protocol);
617+
err = esp_wifi_get_protocol(WIFI_IF_AP, (uint8_t *)&current_protocol);
618618
if (err == ESP_OK && current_protocol == WIFI_PROTOCOL_LR) {
619619
log_v("Disabling long range on AP");
620620
err = esp_wifi_set_protocol(WIFI_IF_AP, WIFI_PROTOCOL_DEFAULT);

0 commit comments

Comments
 (0)
0