Skip to content

Commit 27fb23a

Browse files
me-no-devme-no-dev
committed
Warnings fixes
1 parent aa2cf45 commit 27fb23a

File tree

27 files changed

+91
-36
lines changed

27 files changed

+91
-36
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@ _build/
4040
debug.cfg
4141
debug.svd
4242
debug_custom.json
43+
libraries/Insights/examples/*/*.ino.zip

‎cores/esp32/HWCDC.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
#include "freertos/ringbuf.h"
2323
#include "esp_intr_alloc.h"
2424
#include "soc/periph_defs.h"
25+
#pragma GCC diagnostic ignored "-Wvolatile"
2526
#include "hal/usb_serial_jtag_ll.h"
27+
#pragma GCC diagnostic warning "-Wvolatile"
2628
#include "rom/ets_sys.h"
2729

2830
ESP_EVENT_DEFINE_BASE(ARDUINO_HW_CDC_EVENTS);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ extern void ARDUINO_ISR_ATTR __pinMode(uint8_t pin, uint8_t mode)
9898
}
9999
#endif
100100

101-
if (!GPIO_IS_VALID_GPIO(pin)) {
101+
if (pin >= SOC_GPIO_PIN_COUNT) {
102102
log_e("Invalid pin selected");
103103
return;
104104
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1515,11 +1515,11 @@ uint32_t spiFrequencyToClockDiv(uint32_t freq)
15151515

15161516
uint8_t calN = 1;
15171517
spiClk_t bestReg = { 0 };
1518-
int32_t bestFreq = 0;
1518+
uint32_t bestFreq = 0;
15191519

15201520
while(calN <= 0x3F) {
15211521
spiClk_t reg = { 0 };
1522-
int32_t calFreq;
1522+
uint32_t calFreq;
15231523
int32_t calPre;
15241524
int8_t calPreVari = -2;
15251525

@@ -1541,11 +1541,11 @@ uint32_t spiFrequencyToClockDiv(uint32_t freq)
15411541
}
15421542
reg.clkcnt_l = ((reg.clkcnt_n + 1) / 2);
15431543
calFreq = ClkRegToFreq(&reg);
1544-
if(calFreq == (int32_t) freq) {
1544+
if(calFreq == freq) {
15451545
memcpy(&bestReg, &reg, sizeof(bestReg));
15461546
break;
1547-
} else if(calFreq < (int32_t) freq) {
1548-
if(abs(freq - calFreq) < abs(freq - bestFreq)) {
1547+
} else if(calFreq < freq) {
1548+
if((freq - calFreq) < (freq - bestFreq)) {
15491549
bestFreq = calFreq;
15501550
memcpy(&bestReg, &reg, sizeof(bestReg));
15511551
}

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,12 @@ static void __touchSetCycles(uint16_t measure, uint16_t sleep)
9191
{
9292
__touchSleepCycles = sleep;
9393
__touchMeasureCycles = measure;
94-
touch_pad_set_meas_time(sleep, measure);
94+
#if SOC_TOUCH_VERSION_1 // ESP32
95+
touch_pad_set_measurement_clock_cycles(measure);
96+
#elif SOC_TOUCH_VERSION_2 // ESP32S2, ESP32S3
97+
touch_pad_set_charge_discharge_times(measure);
98+
#endif
99+
touch_pad_set_measurement_interval(sleep);
95100
}
96101

97102

@@ -112,7 +117,8 @@ static void __touchInit()
112117
}
113118
// the next two lines will drive the touch reading values -- both will return ESP_OK
114119
touch_pad_set_voltage(TOUCH_HVOLT_2V7, TOUCH_LVOLT_0V5, TOUCH_HVOLT_ATTEN_0V);
115-
touch_pad_set_meas_time(__touchMeasureCycles, __touchSleepCycles);
120+
touch_pad_set_measurement_clock_cycles(__touchMeasureCycles);
121+
touch_pad_set_measurement_interval(__touchSleepCycles);
116122
// Touch Sensor Timer initiated
117123
touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER); // returns ESP_OK
118124
err = touch_pad_filter_start(10);
@@ -131,7 +137,8 @@ static void __touchInit()
131137
goto err;
132138
}
133139
// the next lines will drive the touch reading values -- all os them return ESP_OK
134-
touch_pad_set_meas_time(__touchSleepCycles, __touchMeasureCycles);
140+
touch_pad_set_charge_discharge_times(__touchMeasureCycles);
141+
touch_pad_set_measurement_interval(__touchSleepCycles);
135142
touch_pad_set_voltage(TOUCH_PAD_HIGH_VOLTAGE_THRESHOLD, TOUCH_PAD_LOW_VOLTAGE_THRESHOLD, TOUCH_PAD_ATTEN_VOLTAGE_THRESHOLD);
136143
touch_pad_set_idle_channel_connect(TOUCH_PAD_IDLE_CH_CONNECT_DEFAULT);
137144
touch_pad_denoise_t denoise = {

‎cores/esp32/wiring_pulse.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
//#include <limits.h>
1818
#include "wiring_private.h"
1919
#include "pins_arduino.h"
20-
#include <hal/cpu_hal.h>
20+
#include "esp_cpu.h"
2121

2222
#define WAIT_FOR_PIN_STATE(state) \
2323
while (digitalRead(pin) != (state)) { \
24-
if (cpu_hal_get_cycle_count() - start_cycle_count > timeout_cycles) { \
24+
if (esp_cpu_get_cycle_count() - start_cycle_count > timeout_cycles) { \
2525
return 0; \
2626
} \
2727
}
@@ -34,12 +34,12 @@ unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout)
3434
timeout = max_timeout_us;
3535
}
3636
const uint32_t timeout_cycles = microsecondsToClockCycles(timeout);
37-
const uint32_t start_cycle_count = cpu_hal_get_cycle_count();
37+
const uint32_t start_cycle_count = esp_cpu_get_cycle_count();
3838
WAIT_FOR_PIN_STATE(!state);
3939
WAIT_FOR_PIN_STATE(state);
40-
const uint32_t pulse_start_cycle_count = cpu_hal_get_cycle_count();
40+
const uint32_t pulse_start_cycle_count = esp_cpu_get_cycle_count();
4141
WAIT_FOR_PIN_STATE(!state);
42-
return clockCyclesToMicroseconds(cpu_hal_get_cycle_count() - pulse_start_cycle_count);
42+
return clockCyclesToMicroseconds(esp_cpu_get_cycle_count() - pulse_start_cycle_count);
4343
}
4444

4545
unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout)

‎libraries/BLE/examples/BLE5_multi_advertising/BLE5_multi_advertising.ino‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ esp_ble_gap_ext_adv_params_t ext_adv_params_1M = {
1515
.interval_max = 0x30,
1616
.channel_map = ADV_CHNL_ALL,
1717
.own_addr_type = BLE_ADDR_TYPE_RANDOM,
18+
.peer_addr_type = BLE_ADDR_TYPE_RANDOM,
19+
.peer_addr = {0,0,0,0,0,0},
1820
.filter_policy = ADV_FILTER_ALLOW_SCAN_ANY_CON_ANY,
21+
.tx_power = EXT_ADV_TX_PWR_NO_PREFERENCE,
1922
.primary_phy = ESP_BLE_GAP_PHY_CODED,
2023
.max_skip = 0,
2124
.secondary_phy = ESP_BLE_GAP_PHY_1M,
@@ -29,7 +32,10 @@ esp_ble_gap_ext_adv_params_t ext_adv_params_2M = {
2932
.interval_max = 0x40,
3033
.channel_map = ADV_CHNL_ALL,
3134
.own_addr_type = BLE_ADDR_TYPE_RANDOM,
35+
.peer_addr_type = BLE_ADDR_TYPE_RANDOM,
36+
.peer_addr = {0,0,0,0,0,0},
3237
.filter_policy = ADV_FILTER_ALLOW_SCAN_ANY_CON_ANY,
38+
.tx_power = EXT_ADV_TX_PWR_NO_PREFERENCE,
3339
.primary_phy = ESP_BLE_GAP_PHY_1M,
3440
.max_skip = 0,
3541
.secondary_phy = ESP_BLE_GAP_PHY_2M,
@@ -43,7 +49,10 @@ esp_ble_gap_ext_adv_params_t legacy_adv_params = {
4349
.interval_max = 0x45,
4450
.channel_map = ADV_CHNL_ALL,
4551
.own_addr_type = BLE_ADDR_TYPE_RANDOM,
52+
.peer_addr_type = BLE_ADDR_TYPE_RANDOM,
53+
.peer_addr = {0,0,0,0,0,0},
4654
.filter_policy = ADV_FILTER_ALLOW_SCAN_ANY_CON_ANY,
55+
.tx_power = EXT_ADV_TX_PWR_NO_PREFERENCE,
4756
.primary_phy = ESP_BLE_GAP_PHY_1M,
4857
.max_skip = 0,
4958
.secondary_phy = ESP_BLE_GAP_PHY_1M,
@@ -57,7 +66,10 @@ esp_ble_gap_ext_adv_params_t ext_adv_params_coded = {
5766
.interval_max = 0x50,
5867
.channel_map = ADV_CHNL_ALL,
5968
.own_addr_type = BLE_ADDR_TYPE_RANDOM,
69+
.peer_addr_type = BLE_ADDR_TYPE_RANDOM,
70+
.peer_addr = {0,0,0,0,0,0},
6071
.filter_policy = ADV_FILTER_ALLOW_SCAN_ANY_CON_ANY,
72+
.tx_power = EXT_ADV_TX_PWR_NO_PREFERENCE,
6173
.primary_phy = ESP_BLE_GAP_PHY_1M,
6274
.max_skip = 0,
6375
.secondary_phy = ESP_BLE_GAP_PHY_CODED,

‎libraries/BLE/examples/BLE5_periodic_advertising/BLE5_periodic_advertising.ino‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ esp_ble_gap_ext_adv_params_t ext_adv_params_2M = {
1515
.interval_max = 0x40,
1616
.channel_map = ADV_CHNL_ALL,
1717
.own_addr_type = BLE_ADDR_TYPE_RANDOM,
18+
.peer_addr_type = BLE_ADDR_TYPE_RANDOM,
19+
.peer_addr = {0,0,0,0,0,0},
1820
.filter_policy = ADV_FILTER_ALLOW_SCAN_ANY_CON_ANY,
21+
.tx_power = EXT_ADV_TX_PWR_NO_PREFERENCE,
1922
.primary_phy = ESP_BLE_GAP_PHY_1M,
2023
.max_skip = 0,
2124
.secondary_phy = ESP_BLE_GAP_PHY_2M,

‎libraries/BLE/examples/BLE5_periodic_sync/BLE5_periodic_sync.ino‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ static esp_ble_gap_periodic_adv_sync_params_t periodic_adv_sync_params = {
2121
.filter_policy = 0,
2222
.sid = 0,
2323
.addr_type = BLE_ADDR_TYPE_RANDOM,
24+
.addr = {0,0,0,0,0,0},
2425
.skip = 10,
2526
.sync_timeout = 1000, // timeout: 1000 * 10ms
2627
};

‎libraries/BluetoothSerial/src/BluetoothSerial.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,9 @@ static bool _init_bt(const char *deviceName)
673673
return false;
674674
}
675675

676-
if (esp_spp_init(ESP_SPP_MODE_CB) != ESP_OK){
676+
esp_spp_cfg_t cfg = BT_SPP_DEFAULT_CONFIG();
677+
cfg.mode = ESP_SPP_MODE_CB;
678+
if (esp_spp_enhanced_init(&cfg) != ESP_OK){
677679
log_e("spp init failed");
678680
return false;
679681
}

0 commit comments

Comments
 (0)