Skip to content

Commit

Permalink
Fix duplicate APIs due to merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
facchinm committed Oct 29, 2020
1 parent c153186 commit 3ea8a09
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions src/local/BLELocalDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,6 @@ class BLELocalDevice {

virtual void setEventHandler(BLEDeviceEvent event, BLEDeviceEventHandler eventHandler);

virtual void setAdvertisingInterval(uint16_t advertisingInterval);
virtual void setConnectionInterval(uint16_t minimumConnectionInterval, uint16_t maximumConnectionInterval);
virtual void setConnectable(bool connectable);

virtual void setTimeout(unsigned long timeout);

virtual void debug(Stream& stream);
Expand Down

0 comments on commit 3ea8a09

Please sign in to comment.