Skip to content

Commit e2f8a4e

Browse files
authored
Merge branch 'espressif:master' into main
2 parents 0c40e3a + 6d9ebea commit e2f8a4e

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

cores/esp32/esp32-hal-rmt.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,7 @@ bool rmtInit(int pin, rmt_ch_dir_t channel_direction, rmt_reserve_memsize_t mem_
513513
tx_cfg.flags.with_dma = 0;
514514
tx_cfg.flags.io_loop_back = 0;
515515
tx_cfg.flags.io_od_mode = 0;
516+
tx_cfg.intr_priority = 0;
516517

517518
if (rmt_new_tx_channel(&tx_cfg, &bus->rmt_channel_h) != ESP_OK) {
518519
log_e("GPIO %d - RMT TX Initialization error.", pin);

libraries/BluetoothSerial/src/BTAdvertisedDevice.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ class BTAdvertisedDevice {
1515
public:
1616
virtual ~BTAdvertisedDevice() = default;
1717

18-
virtual BTAddress getAddress();
19-
virtual uint32_t getCOD() const;
20-
virtual std::string getName() const;
21-
virtual int8_t getRSSI() const;
18+
virtual BTAddress getAddress() = 0;
19+
virtual uint32_t getCOD() const = 0;
20+
virtual std::string getName() const = 0;
21+
virtual int8_t getRSSI() const = 0;
2222

2323

24-
virtual bool haveCOD() const;
25-
virtual bool haveName() const;
26-
virtual bool haveRSSI() const;
24+
virtual bool haveCOD() const = 0;
25+
virtual bool haveName() const = 0;
26+
virtual bool haveRSSI() const = 0;
2727

28-
virtual std::string toString();
28+
virtual std::string toString() = 0;
2929
};
3030

3131
class BTAdvertisedDeviceSet : public virtual BTAdvertisedDevice {

libraries/BluetoothSerial/src/BTScan.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class BTScanResults {
2222
public:
2323
virtual ~BTScanResults() = default;
2424

25-
virtual void dump(Print *print = nullptr);
26-
virtual int getCount();
27-
virtual BTAdvertisedDevice* getDevice(int i);
25+
virtual void dump(Print *print = nullptr) = 0;
26+
virtual int getCount() = 0;
27+
virtual BTAdvertisedDevice* getDevice(int i) = 0;
2828
};
2929

3030
class BTScanResultsSet : public BTScanResults {

0 commit comments

Comments
 (0)